October 2021 - openSUSE Commits - openSUSE Mailing Lists

commit nextcloud for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nextcloud for openSUSE:Factory checked in at 2021-10-01 22:29:01 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nextcloud (Old) and /work/SRC/openSUSE:Factory/.nextcloud.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nextcloud" Fri Oct 1 22:29:01 2021 rev:63 rq:922452 version:22.2.0 Changes: -------- --- /work/SRC/openSUSE:Factory/nextcloud/nextcloud.changes 2021-08-27 21:45:11.614061003 +0200 +++ /work/SRC/openSUSE:Factory/.nextcloud.new.2443/nextcloud.changes 2021-10-01 22:29:10.633387772 +0200 @@ -1,0 +2,72 @@ +Thu Sep 30 20:00:12 UTC 2021 - ecsos <ecsos(a)opensuse.org> + +- Update to 22.2.0 + - Fix SQL type error (server#28531) + - Allow to open any app in a standalone window (server#28594) + - Fix encrypted version to 0 when finding unencrypted file (server#28603) + - Only recommand for php-sodium on >= PHP 7.4 (server#28658) + - Fix position of search bar (server#28670) + - Fix S3 ObjectStore proxy option (server#28683) + - NMC-464 Highlight the search term on no results (server#28685) + - NMC-552 Move filename/size out of the download button (server#28697) + - Fix user list infinite loading state in user settings (server#28701) + - Pin Psalm version for security analysis (server#28705) + - Bump css-vars-ponyfill from 2.4.6 to 2.4.7 (server#28712) + - Check if SVG path is valid (server#28734) + - Remove 2FA exemption from PublicPage annotation (server#28740) + - Bump 3rdparty ref (server#28744) + - Send attendence links to required and optinal attendees of an event without an RSVP (server#28748) + - Bump 3rdparty ref (server#28752) + - Fix trashbin files view sticky action bar (server#28769) + - Make it possible to override the default collation on mysql (server#28777) + - Allow users to choose a different email for notifications (server#28780) + - Dashboard - fix touch layout (server#28781) + - Scan the shared external storage source on access (server#28785) + - Bump vue-clipboard2 from 0.3.1 to 0.3.2 (server#28801) + - Add database ratelimiting backend (server#28814) + - Fixes missing prefix to validate password reset token (server#28824) + - Update .htaccess (php8+ and mod_lsapi) (server#28827) + - Do not cache file ids in FileSystemTags inside group folders (server#28830) + - Allow using of disabled password reset mechanism for special cases (server#28841) + - The user always may modify their additional emails (server#28843) + - Added support for transferring incoming file shares. (server#28844) + - L10n: ignore packed js files from TX sync (server#28850) + - Add config.php option for transfer ownership (server#28851) + - L10n: Remove a text string from translation (server#28852) + - Let user choose notification email in user settings (server#28855) + - Add email addresses to contacts menu (server#28860) + - Add new ExternalShareActions API (server#28865) + - Fix files view change and undefined currentFileList (server#28878) + - Fix file creation from template without ext (server#28881) + - Bump vue-clipboard2 from 0.3.2 to 0.3.3 (server#28888) + - Fall back to full file for video previews (server#28895) + - Update CRL due to revoked twofactor_email.crt (server#28900) + - Support seeking also from the end of file on S3 storage (server#28910) + - Use IRoomMetadata as source of truth for supported room types (server#28919) + - Bump 3rdparty ref (server#28928) + - Allow upgrade from 22.2.0.0 to 22.2.0.1 (server#28945) + - Fix caching of objectsid searches (server#28949) + - Allow casting query functions (server#28953) + - Fix check for redis minimal version (server#28954) + - Don't allow to change activity settings that don't work (server#28962) + - Bump app versions (server#28984) + - Fix redirect during initial setup (server#28998) + - Fix CI (3rdparty#758) + - Bump Webauthn Lib to 3.3.9 (3rdparty#780) + - Bump Archive_Tar to latest release (3rdparty#781) + - Composer install (3rdparty#812) + - Read the email from IUser (API) not guess from the DB (activity#637) + - Increase activity email speed in instances with more than 500 users (activity#641) + - Bump pdfjs-dist from 2.8.335 to 2.9.359 (files_pdfviewer#478) + - Bump @nextcloud/babel-config from 1.0.0-beta.1 to 1.0.0 (files_pdfviewer#479) + - Fix phpunit (files_pdfviewer#487) + - Update workflows (files_pdfviewer#492) + - Use setup-php v2 (files_pdfviewer#495) + - Bump cli-progress from 3.9.0 to 3.9.1 (files_pdfviewer#504) + - Fix illustrations (photos#876) + - Bump @nextcloud/vue from 3.10.0 to 3.10.2 (photos#889) + - Dependency updates (text#1835) + - Bump prosemirror-markdown from 1.5.1 to 1.5.2 (text#1851) + - Update dependabot (viewer#1013) + +------------------------------------------------------------------- Old: ---- nextcloud-22.1.1.tar.bz2 New: ---- nextcloud-22.2.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nextcloud.spec ++++++ --- /var/tmp/diff_new_pack.lwdNRQ/_old 2021-10-01 22:29:12.845391858 +0200 +++ /var/tmp/diff_new_pack.lwdNRQ/_new 2021-10-01 22:29:12.849391865 +0200 @@ -47,7 +47,7 @@ %endif Name: nextcloud -Version: 22.1.1 +Version: 22.2.0 Release: 0 Summary: File hosting service License: AGPL-3.0-only ++++++ nextcloud-22.1.1.tar.bz2 -> nextcloud-22.2.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/nextcloud/nextcloud-22.1.1.tar.bz2 /work/SRC/openSUSE:Factory/.nextcloud.new.2443/nextcloud-22.2.0.tar.bz2 differ: char 11, line 1

1 0

commit nextcloud-desktop for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package nextcloud-desktop for openSUSE:Factory checked in at 2021-10-01 22:29:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/nextcloud-desktop (Old) and /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "nextcloud-desktop" Fri Oct 1 22:29:00 2021 rev:25 rq:922449 version:3.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/nextcloud-desktop/nextcloud-desktop.changes 2021-09-22 22:13:24.188345268 +0200 +++ /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2443/nextcloud-desktop.changes 2021-10-01 22:29:07.557382089 +0200 @@ -1,0 +2,7 @@ +Thu Sep 30 21:33:04 UTC 2021 - ecsos <ecsos(a)opensuse.org> + +- Update to 3.3.5 + - desktop#3850 [stable-3.3] Fix incorrect db name for nextcloud command line client. + - desktop#3851 [stable-3.3] Don't log encryption data in release mode + +------------------------------------------------------------------- Old: ---- nextcloud-desktop-3.3.4.tar.gz New: ---- nextcloud-desktop-3.3.5.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ nextcloud-desktop.spec ++++++ --- /var/tmp/diff_new_pack.psL3Cx/_old 2021-10-01 22:29:08.197383271 +0200 +++ /var/tmp/diff_new_pack.psL3Cx/_new 2021-10-01 22:29:08.201383279 +0200 @@ -19,7 +19,7 @@ %define soname libnextcloudsync %define sover 0 Name: nextcloud-desktop -Version: 3.3.4 +Version: 3.3.5 Release: 0 Summary: Nextcloud desktop synchronisation client License: GPL-2.0-or-later AND LGPL-3.0-or-later ++++++ nextcloud-desktop-3.3.4.tar.gz -> nextcloud-desktop-3.3.5.tar.gz ++++++ /work/SRC/openSUSE:Factory/nextcloud-desktop/nextcloud-desktop-3.3.4.tar.gz /work/SRC/openSUSE:Factory/.nextcloud-desktop.new.2443/nextcloud-desktop-3.3.5.tar.gz differ: char 13, line 1

1 0

commit python-mpi4py for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-mpi4py for openSUSE:Factory checked in at 2021-10-01 22:28:59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-mpi4py (Old) and /work/SRC/openSUSE:Factory/.python-mpi4py.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-mpi4py" Fri Oct 1 22:28:59 2021 rev:14 rq:922440 version:3.1.1 Changes: -------- --- /work/SRC/openSUSE:Factory/python-mpi4py/python-mpi4py.changes 2021-09-27 20:09:03.882472451 +0200 +++ /work/SRC/openSUSE:Factory/.python-mpi4py.new.2443/python-mpi4py.changes 2021-10-01 22:29:06.393379939 +0200 @@ -1,0 +2,5 @@ +Thu Sep 30 12:04:19 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin(a)suse.com> + +- Use openmpi macros to always build with the default openmpi version (bsc#1190810) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-mpi4py.spec ++++++ --- /var/tmp/diff_new_pack.zCTqC4/_old 2021-10-01 22:29:06.889380855 +0200 +++ /var/tmp/diff_new_pack.zCTqC4/_new 2021-10-01 22:29:06.893380862 +0200 @@ -19,11 +19,7 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} %define skip_python2 1 %define skip_python36 1 -%if 0%{?sle_version} && 0%{?sle_version} < 150300 - %define mpiver openmpi -%else - %define mpiver openmpi4 -%endif + Name: python-mpi4py Version: 3.1.1 Release: 0 @@ -31,17 +27,15 @@ License: BSD-2-Clause URL: https://bitbucket.org/mpi4py/mpi4py Source: https://files.pythonhosted.org/packages/source/m/mpi4py/mpi4py-%{version}.t… -BuildRequires: %{mpiver} -BuildRequires: %{mpiver}-config -BuildRequires: %{mpiver}-devel BuildRequires: %{python_module Cython} BuildRequires: %{python_module devel} BuildRequires: %{python_module numpy} BuildRequires: %{python_module setuptools} BuildRequires: fdupes +BuildRequires: openmpi-macros-devel BuildRequires: python-rpm-macros -Requires: %{mpiver} -Requires: %{mpiver}-config +%openmpi_requires + %python_subpackages %description @@ -85,7 +79,7 @@ %package -n %{name}-common-devel Summary: Shared development files for %{name} -Requires: %{mpiver}-devel +%openmpi_devel_requires Provides: %{python_module mpi4py-common-devel = %{version}} %description -n %{name}-common-devel @@ -109,7 +103,7 @@ sed -i '1!b;/^#!\/usr\/bin\/python/d' demo/python-config %build -source %{_libdir}/mpi/gcc/%{mpiver}/bin/mpivars.sh +%setup_openmpi export CFLAGS="%{optflags} -fno-strict-aliasing" export LANG=en_US.UTF-8 @@ -134,7 +128,7 @@ mkdir -p %{buildroot}%{_rpmmacrodir} cat >> %{buildroot}%{_rpmmacrodir}/macros.mpi4py <<EOL -mpi4py_mpi_ver %{mpiver} +mpi4py_mpi_ver openmpi EOL %check @@ -144,7 +138,8 @@ rm -rf build _build.* %{python_expand export PYTHONPATH=%{buildroot}%{$python_sitearch} rm -rf build _build.* -%{_libdir}/mpi/gcc/%{mpiver}/bin/mpiexec --use-hwthread-cpus --mca btl tcp,self -n 1 $python -B test/runtests.py -v --exclude="test_spawn" +%setup_openmpi +%{openmpi_prefix}/bin/mpiexec --use-hwthread-cpus --mca btl tcp,self -n 1 $python -B test/runtests.py -v --exclude="test_spawn" } %files %{python_files}

1 0

commit meson for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package meson for openSUSE:Factory checked in at 2021-10-01 22:28:57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/meson (Old) and /work/SRC/openSUSE:Factory/.meson.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "meson" Fri Oct 1 22:28:57 2021 rev:75 rq:922180 version:0.59.2 Changes: -------- --- /work/SRC/openSUSE:Factory/meson/meson.changes 2021-08-27 21:43:20.069930960 +0200 +++ /work/SRC/openSUSE:Factory/.meson.new.2443/meson.changes 2021-10-01 22:29:02.381372527 +0200 @@ -1,0 +2,11 @@ +Wed Sep 29 12:23:31 UTC 2021 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Add meson-rust-1.55.patch: Fix test suite run with rust 1.55. + +------------------------------------------------------------------- +Wed Sep 29 06:27:10 UTC 2021 - Dominique Leuenberger <dimstar(a)opensuse.org> + +- Update to version 0.59.2: + + No upstream changes provided. + +------------------------------------------------------------------- Old: ---- meson-0.59.1.tar.gz meson-0.59.1.tar.gz.asc New: ---- meson-0.59.2.tar.gz meson-0.59.2.tar.gz.asc meson-rust-1.55.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ meson.spec ++++++ --- /var/tmp/diff_new_pack.ttaGZi/_old 2021-10-01 22:29:02.817373333 +0200 +++ /var/tmp/diff_new_pack.ttaGZi/_new 2021-10-01 22:29:02.817373333 +0200 @@ -28,7 +28,7 @@ %{!?vim_data_dir:%global vim_data_dir %{_datadir}/vim} %bcond_with setuptools Name: meson%{name_ext} -Version: 0.59.1 +Version: 0.59.2 Release: 0 Summary: Python-based build system License: Apache-2.0 @@ -41,6 +41,8 @@ Patch1: meson-test-installed-bin.patch # PATCH-FEATURE-OPENSUSE meson-distutils.patch tchvatal(a)suse.com -- build and install using distutils instead of full setuptools Patch2: meson-distutils.patch +# PATCH-FIX-UPSTREAM meson-rust-1.55.patch gh#mesonbuikd/meson#9310 dimstar(a)opensuse.org -- Fix test suite with rust 1.55 +Patch3: meson-rust-1.55.patch BuildRequires: fdupes BuildRequires: python-rpm-macros BuildRequires: python3-base @@ -163,6 +165,9 @@ %if !%{with setuptools} %patch2 -p1 %endif +pushd "test cases/rust/5 polyglot static" +%patch3 -p4 +popd # We do not have gmock available at this moment - can't run the test suite for it rm -r "test cases/frameworks/3 gmock" \ ++++++ meson-0.59.1.tar.gz -> meson-0.59.2.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/PKG-INFO new/meson-0.59.2/PKG-INFO --- old/meson-0.59.1/PKG-INFO 2021-08-18 13:26:21.929528700 +0200 +++ new/meson-0.59.2/PKG-INFO 2021-09-28 19:15:11.939847000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: meson -Version: 0.59.1 +Version: 0.59.2 Summary: A high performance build system Home-page: https://mesonbuild.com Author: Jussi Pakkanen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/data/test.schema.json new/meson-0.59.2/data/test.schema.json --- old/meson-0.59.1/data/test.schema.json 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/data/test.schema.json 2021-09-28 19:04:57.000000000 +0200 @@ -21,11 +21,14 @@ "type": "string", "enum": [ "file", + "python_file", "dir", "exe", "shared_lib", + "python_lib", "pdb", "implib", + "py_implib", "implibempty", "expr" ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/man/meson.1 new/meson-0.59.2/man/meson.1 --- old/meson-0.59.1/man/meson.1 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/man/meson.1 2021-09-28 19:04:57.000000000 +0200 @@ -1,4 +1,4 @@ -.TH MESON "1" "August 2021" "meson 0.59.1" "User Commands" +.TH MESON "1" "September 2021" "meson 0.59.2" "User Commands" .SH NAME meson - a high productivity build system .SH DESCRIPTION diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/meson.egg-info/PKG-INFO new/meson-0.59.2/meson.egg-info/PKG-INFO --- old/meson-0.59.1/meson.egg-info/PKG-INFO 2021-08-18 13:26:15.000000000 +0200 +++ new/meson-0.59.2/meson.egg-info/PKG-INFO 2021-09-28 19:15:06.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 2.1 Name: meson -Version: 0.59.1 +Version: 0.59.2 Summary: A high performance build system Home-page: https://mesonbuild.com Author: Jussi Pakkanen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/meson.egg-info/SOURCES.txt new/meson-0.59.2/meson.egg-info/SOURCES.txt --- old/meson-0.59.1/meson.egg-info/SOURCES.txt 2021-08-18 13:26:15.000000000 +0200 +++ new/meson-0.59.2/meson.egg-info/SOURCES.txt 2021-09-28 19:15:06.000000000 +0200 @@ -892,6 +892,12 @@ test cases/common/153 wrap file should not failed/subprojects/foo.wrap test cases/common/153 wrap file should not failed/subprojects/patchdir.wrap test cases/common/153 wrap file should not failed/subprojects/zlib.wrap +test cases/common/153 wrap file should not failed/subprojects/bar-1.0/bar.c +test cases/common/153 wrap file should not failed/subprojects/bar-1.0/meson.build +test cases/common/153 wrap file should not failed/subprojects/foo-1.0/foo.c +test cases/common/153 wrap file should not failed/subprojects/foo-1.0/meson.build +test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/foo.c +test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/meson.build test cases/common/153 wrap file should not failed/subprojects/packagecache/foo-1.0-patch.tar.xz test cases/common/153 wrap file should not failed/subprojects/packagecache/foo-1.0.tar.xz test cases/common/153 wrap file should not failed/subprojects/packagecache/zlib-1.2.8-8-wrap.zip @@ -1697,6 +1703,7 @@ test cases/common/98 subproject subdir/subprojects/sub/lib/sub.c test cases/common/98 subproject subdir/subprojects/sub/lib/sub.h test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build +test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt test cases/common/98 subproject subdir/subprojects/sub_implicit/subprojects/subsub/foo.h test cases/common/98 subproject subdir/subprojects/sub_implicit/subprojects/subsub/meson.build test cases/common/98 subproject subdir/subprojects/sub_implicit/subprojects/subsub/subprojects/subsubsub.wrap @@ -1917,6 +1924,8 @@ test cases/failing/113 cmake executable dependency/test.json test cases/failing/113 cmake executable dependency/subprojects/cmlib/CMakeLists.txt test cases/failing/113 cmake executable dependency/subprojects/cmlib/main.c +test cases/failing/114 allow_fallback with fallback/meson.build +test cases/failing/114 allow_fallback with fallback/test.json test cases/failing/12 string arithmetic/meson.build test cases/failing/12 string arithmetic/test.json test cases/failing/13 array arithmetic/meson.build @@ -2450,8 +2459,12 @@ test cases/frameworks/4 qt/meson.build test cases/frameworks/4 qt/meson_options.txt test cases/frameworks/4 qt/q5core.cpp +test cases/frameworks/4 qt/qt4_lang.qrc test cases/frameworks/4 qt/qt4core_fr.ts +test cases/frameworks/4 qt/qt4embedded_fr.ts +test cases/frameworks/4 qt/qt5_lang.qrc test cases/frameworks/4 qt/qt5core_fr.ts +test cases/frameworks/4 qt/qt5embedded_fr.ts test cases/frameworks/4 qt/qtinterface.cpp test cases/frameworks/4 qt/stuff.qrc test cases/frameworks/4 qt/stuff2.qrc @@ -2778,10 +2791,13 @@ test cases/python/1 basic/gluon/gluonator.py test cases/python/1 basic/subdir/meson.build test cases/python/1 basic/subdir/subprog.py -test cases/python/2 extmodule/blaster.py +test cases/python/2 extmodule/blaster.py.in test cases/python/2 extmodule/meson.build +test cases/python/2 extmodule/test.json test cases/python/2 extmodule/ext/meson.build test cases/python/2 extmodule/ext/tachyon_module.c +test cases/python/2 extmodule/ext/nested/meson.build +test cases/python/2 extmodule/ext/wrongdir/meson.build test cases/python/3 cython/cytest.py test cases/python/3 cython/meson.build test cases/python/3 cython/libdir/cstorer.pxd @@ -3303,6 +3319,8 @@ test cases/unit/79 user options for subproject/.gitignore test cases/unit/79 user options for subproject/75 user options for subproject/.gitignore test cases/unit/79 user options for subproject/75 user options for subproject/meson.build +test cases/unit/79 user options for subproject/subprojects/sub/meson.build +test cases/unit/79 user options for subproject/subprojects/sub/meson_options.txt test cases/unit/8 -L -l order/first.pc test cases/unit/8 -L -l order/meson.build test cases/unit/8 -L -l order/prog.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/_typing.py new/meson-0.59.2/mesonbuild/_typing.py --- old/meson-0.59.1/mesonbuild/_typing.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/_typing.py 2021-09-28 19:04:57.000000000 +0200 @@ -36,6 +36,9 @@ class StringProtocol(Protocol): def __str__(self) -> str: ... +class SizedStringProtocol(Protocol, StringProtocol, typing.Sized): + pass + class ImmutableListProtocol(Protocol[T]): """A protocol used in cases where a list is returned, but should not be diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/compilers/compilers.py new/meson-0.59.2/mesonbuild/compilers/compilers.py --- old/meson-0.59.1/mesonbuild/compilers/compilers.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/compilers/compilers.py 2021-09-28 19:04:57.000000000 +0200 @@ -1150,11 +1150,12 @@ def get_compiler_check_args(self, mode: CompileCheckMode) -> T.List[str]: """Arguments to pass the compiler and/or linker for checks. - The default implementation turns off optimizations. mode should be - one of: + The default implementation turns off optimizations. Examples of things that go here: - extra arguments for error checking + - Arguments required to make the compiler exit with a non-zero status + when something is wrong. """ return self.get_no_optimization_args() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/compilers/mixins/clang.py new/meson-0.59.2/mesonbuild/compilers/mixins/clang.py --- old/meson-0.59.1/mesonbuild/compilers/mixins/clang.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/compilers/mixins/clang.py 2021-09-28 19:04:57.000000000 +0200 @@ -81,7 +81,11 @@ return ['-include-pch', os.path.join(pch_dir, self.get_pch_name(header))] def get_compiler_check_args(self, mode: CompileCheckMode) -> T.List[str]: - myargs = [] # type: T.List[str] + # Clang is different than GCC, it will return True when a symbol isn't + # defined in a header. Specifically this seems ot have something to do + # with functions that may be in a header on some systems, but not all of + # them. `strlcat` specifically with can trigger this. + myargs: T.List[str] = ['-Werror=implicit-function-declaration'] if mode is CompileCheckMode.COMPILE: myargs.extend(['-Werror=unknown-warning-option', '-Werror=unused-command-line-argument']) if mesonlib.version_compare(self.version, '>=3.6.0'): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/compilers/objc.py new/meson-0.59.2/mesonbuild/compilers/objc.py --- old/meson-0.59.1/mesonbuild/compilers/objc.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/compilers/objc.py 2021-09-28 19:04:57.000000000 +0200 @@ -90,7 +90,7 @@ opts.update({ OptionKey('std', machine=self.for_machine, lang='c'): coredata.UserComboOption( 'C language standard to use', - ['none', 'c89', 'c99', 'c11', 'c17', 'gnu99', 'gnu11'], + ['none', 'c89', 'c99', 'c11', 'c17', 'gnu89', 'gnu99', 'gnu11', 'gnu17'], 'none', ) }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/compilers/objcpp.py new/meson-0.59.2/mesonbuild/compilers/objcpp.py --- old/meson-0.59.1/mesonbuild/compilers/objcpp.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/compilers/objcpp.py 2021-09-28 19:04:57.000000000 +0200 @@ -91,7 +91,7 @@ opts.update({ OptionKey('std', machine=self.for_machine, lang='cpp'): coredata.UserComboOption( 'C++ language standard to use', - ['none', 'c++98', 'c++11', 'c++14', 'c++17'], + ['none', 'c++98', 'c++11', 'c++14', 'c++17', 'gnu++98', 'gnu++11', 'gnu++14', 'gnu++17'], 'none', ) }) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/coredata.py new/meson-0.59.2/mesonbuild/coredata.py --- old/meson-0.59.1/mesonbuild/coredata.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/coredata.py 2021-09-28 19:04:57.000000000 +0200 @@ -43,7 +43,7 @@ KeyedOptionDictType = T.Union[T.Dict['OptionKey', 'UserOption[T.Any]'], OptionOverrideProxy] CompilerCheckCacheKey = T.Tuple[T.Tuple[str, ...], str, str, T.Tuple[str, ...], str] -version = '0.59.1' +version = '0.59.2' backendlist = ['ninja', 'vs', 'vs2010', 'vs2012', 'vs2013', 'vs2015', 'vs2017', 'vs2019', 'xcode'] default_yielding = False diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/dependencies/base.py new/meson-0.59.2/mesonbuild/dependencies/base.py --- old/meson-0.59.1/mesonbuild/dependencies/base.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/dependencies/base.py 2021-09-28 19:04:57.000000000 +0200 @@ -104,7 +104,7 @@ return mlog.red('NO') if not self.version: return mlog.green('YES') - return mlog.AnsiText([mlog.green('YES'), ' ', mlog.cyan(self.version)]) + return mlog.AnsiText(mlog.green('YES'), ' ', mlog.cyan(self.version)) def get_compile_args(self) -> T.List[str]: if self.include_type == 'system': diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/environment.py new/meson-0.59.2/mesonbuild/environment.py --- old/meson-0.59.1/mesonbuild/environment.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/environment.py 2021-09-28 19:04:57.000000000 +0200 @@ -313,6 +313,9 @@ trial = 'x86' elif trial == 'arm64': trial = 'aarch64' + elif trial.startswith('aarch64'): + # This can be `aarch64_be` + trial = 'aarch64' elif trial.startswith('arm') or trial.startswith('earm'): trial = 'arm' elif trial.startswith(('powerpc64', 'ppc64')): @@ -358,7 +361,7 @@ return trial -def detect_cpu(compilers: CompilersDict): +def detect_cpu(compilers: CompilersDict) -> str: if mesonlib.is_windows(): trial = detect_windows_arch(compilers) elif mesonlib.is_freebsd() or mesonlib.is_netbsd() or mesonlib.is_openbsd() or mesonlib.is_aix(): @@ -372,10 +375,13 @@ # Same check as above for cpu_family if any_compiler_has_define(compilers, '__i386__'): trial = 'i686' # All 64 bit cpus have at least this level of x86 support. - elif trial == 'aarch64': + elif trial.startswith('aarch64'): # Same check as above for cpu_family if any_compiler_has_define(compilers, '__arm__'): trial = 'arm' + else: + # for aarch64_be + trial = 'aarch64' elif trial.startswith('earm'): trial = 'arm' elif trial == 'e2k': @@ -386,20 +392,22 @@ trial = 'mips' else: trial = 'mips64' + elif trial == 'ppc': + # AIX always returns powerpc, check here for 64-bit + if any_compiler_has_define(compilers, '__64BIT__'): + trial = 'ppc64' # Add more quirks here as bugs are reported. Keep in sync with # detect_cpu_family() above. return trial -def detect_system(): +def detect_system() -> str: if sys.platform == 'cygwin': return 'cygwin' return platform.system().lower() -def detect_msys2_arch(): - if 'MSYSTEM_CARCH' in os.environ: - return os.environ['MSYSTEM_CARCH'] - return None +def detect_msys2_arch() -> T.Optional[str]: + return os.environ.get('MSYSTEM_CARCH', None) def detect_machine_info(compilers: T.Optional[CompilersDict] = None) -> MachineInfo: """Detect the machine we're running on diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/interpreter/dependencyfallbacks.py new/meson-0.59.2/mesonbuild/interpreter/dependencyfallbacks.py --- old/meson-0.59.1/mesonbuild/interpreter/dependencyfallbacks.py 2021-08-18 13:22:25.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/interpreter/dependencyfallbacks.py 2021-09-28 19:04:57.000000000 +0200 @@ -16,7 +16,8 @@ class DependencyFallbacksHolder(MesonInterpreterObject): - def __init__(self, interpreter: 'Interpreter', names: T.List[str], allow_fallback: T.Optional[bool] = None) -> None: + def __init__(self, interpreter: 'Interpreter', names: T.List[str], allow_fallback: T.Optional[bool] = None, + default_options: T.Optional[T.List[str]] = None) -> None: super().__init__(subproject=interpreter.subproject) self.interpreter = interpreter self.subproject = interpreter.subproject @@ -27,7 +28,7 @@ self.allow_fallback = allow_fallback self.subproject_name = None self.subproject_varname = None - self.subproject_kwargs = None + self.subproject_kwargs = {'default_options': default_options or []} self.names: T.List[str] = [] for name in names: if not name: @@ -39,13 +40,12 @@ raise InterpreterException('dependency_fallbacks name {name!r} is duplicated') self.names.append(name) - def set_fallback(self, fbinfo: T.Optional[T.Union[T.List[str], str]], default_options: T.Optional[T.List[str]] = None) -> None: - # Legacy: This converts dependency()'s fallback and default_options kwargs. + def set_fallback(self, fbinfo: T.Optional[T.Union[T.List[str], str]]) -> None: + # Legacy: This converts dependency()'s fallback kwargs. if fbinfo is None: - if default_options is not None: - mlog.warning('The "default_options" keyword argument does nothing without a fallback subproject.', - location=self.interpreter.current_node) return + if self.allow_fallback is not None: + raise InvalidArguments('"fallback" and "allow_fallback" arguments are mutually exclusive') fbinfo = stringlistify(fbinfo) if len(fbinfo) == 0: # dependency('foo', fallback: []) is the same as dependency('foo', allow_fallback: false) @@ -58,10 +58,9 @@ subp_name, varname = fbinfo else: raise InterpreterException('Fallback info must have one or two items.') - kwargs = {'default_options': default_options or []} - self._subproject_impl(subp_name, varname, kwargs) + self._subproject_impl(subp_name, varname) - def _subproject_impl(self, subp_name: str, varname: str, kwargs: TYPE_nkwargs) -> None: + def _subproject_impl(self, subp_name: str, varname: str) -> None: if not varname: # If no variable name is specified, check if the wrap file has one. # If the wrap file has a variable name, better use it because the @@ -73,7 +72,6 @@ assert self.subproject_name is None self.subproject_name = subp_name self.subproject_varname = varname - self.subproject_kwargs = kwargs def _do_dependency_cache(self, kwargs: TYPE_nkwargs, func_args: TYPE_nvar, func_kwargs: TYPE_nkwargs) -> T.Optional[Dependency]: name = func_args[0] @@ -316,7 +314,7 @@ if subp_name: self.forcefallback |= subp_name in force_fallback_for if self.forcefallback or self.allow_fallback is True or required or self._get_subproject(subp_name): - self._subproject_impl(subp_name, varname, {}) + self._subproject_impl(subp_name, varname) break candidates = self._get_candidates() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/interpreter/interpreter.py new/meson-0.59.2/mesonbuild/interpreter/interpreter.py --- old/meson-0.59.1/mesonbuild/interpreter/interpreter.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/interpreter/interpreter.py 2021-09-28 19:04:57.000000000 +0200 @@ -1560,8 +1560,8 @@ raise InvalidArguments('"allow_fallback" argument must be boolean') fallback = kwargs.get('fallback') default_options = kwargs.get('default_options') - df = DependencyFallbacksHolder(self, names, allow_fallback) - df.set_fallback(fallback, default_options) + df = DependencyFallbacksHolder(self, names, allow_fallback, default_options) + df.set_fallback(fallback) not_found_message = kwargs.get('not_found_message', '') if not isinstance(not_found_message, str): raise InvalidArguments('The not_found_message must be a string.') @@ -1582,7 +1582,7 @@ raise InvalidArguments('The `include_type` kwarg must be a string') actual = d.get_include_type() if wanted != actual: - mlog.debug(f'Current include type of {names[0]} is {actual}. Converting to requested {wanted}') + mlog.debug(f'Current include type of {args[0]} is {actual}. Converting to requested {wanted}') d = d.generate_system_dependency(wanted) return d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/mesonlib/universal.py new/meson-0.59.2/mesonbuild/mesonlib/universal.py --- old/meson-0.59.1/mesonbuild/mesonlib/universal.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/mesonlib/universal.py 2021-09-28 19:04:57.000000000 +0200 @@ -644,7 +644,7 @@ return platname == 'windows' def is_wsl() -> bool: - return is_linux() and 'microsoft' in platform.version().lower() + return is_linux() and 'microsoft' in platform.release().lower() def is_cygwin() -> bool: return sys.platform == 'cygwin' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/mesonmain.py new/meson-0.59.2/mesonbuild/mesonmain.py --- old/meson-0.59.1/mesonbuild/mesonmain.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/mesonmain.py 2021-09-28 19:04:57.000000000 +0200 @@ -82,6 +82,7 @@ '-requiresAny', '-requires', 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64', '-products', '*', + '-utf8', '-format', 'json' ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/mlog.py new/meson-0.59.2/mesonbuild/mlog.py --- old/meson-0.59.1/mesonbuild/mlog.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/mlog.py 2021-09-28 19:04:57.000000000 +0200 @@ -22,7 +22,7 @@ from pathlib import Path if T.TYPE_CHECKING: - from ._typing import StringProtocol + from ._typing import StringProtocol, SizedStringProtocol """This is (mostly) a standalone module used to write logging information about Meson runs. Some output goes to screen, @@ -143,7 +143,7 @@ TV_LoggableList = T.List[TV_Loggable] class AnsiText: - def __init__(self, *args: TV_LoggableList): + def __init__(self, *args: 'SizedStringProtocol'): self.args = args def __len__(self) -> int: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/modules/gnome.py new/meson-0.59.2/mesonbuild/modules/gnome.py --- old/meson-0.59.1/mesonbuild/modules/gnome.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/modules/gnome.py 2021-09-28 19:04:57.000000000 +0200 @@ -815,7 +815,9 @@ def _get_scanner_cflags(cflags): 'g-ir-scanner only accepts -I/-D/-U; must ignore all other flags' for f in cflags: - if f.startswith(('-D', '-U', '-I')): + # _FORTIFY_SOURCE depends on / works together with -O, on the other hand this + # just invokes the preprocessor anyway + if f.startswith(('-D', '-U', '-I')) and not f.startswith('-D_FORTIFY_SOURCE'): yield f @staticmethod diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/modules/python.py new/meson-0.59.2/mesonbuild/modules/python.py --- old/meson-0.59.1/mesonbuild/modules/python.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/modules/python.py 2021-09-28 19:04:57.000000000 +0200 @@ -272,6 +272,7 @@ 'variables': sysconfig.get_config_vars(), 'paths': sysconfig.get_paths(), 'install_paths': install_paths, + 'sys_paths': sys.path, 'version': sysconfig.get_python_version(), 'platform': sysconfig.get_platform(), 'is_pypy': '__pypy__' in sys.builtin_module_names, @@ -279,15 +280,82 @@ })) ''' +if T.TYPE_CHECKING: + class PythonIntrospectionDict(TypedDict): + + install_paths: T.Dict[str, str] + is_pypy: bool + link_libpython: bool + paths: T.Dict[str, str] + platform: str + suffix : str + variables: T.Dict[str, str] + version: str + class PythonExternalProgram(ExternalProgram): def __init__(self, name: str, command: T.Optional[T.List[str]] = None, ext_prog: T.Optional[ExternalProgram] = None): if ext_prog is None: super().__init__(name, command=command, silent=True) else: - self.name = ext_prog.name + self.name = name self.command = ext_prog.command self.path = ext_prog.path - self.info: T.Dict[str, str] = {} + self.info: 'PythonIntrospectionDict' = { + 'install_paths': {}, + 'is_pypy': False, + 'link_libpython': False, + 'paths': {}, + 'platform': 'sentinal', + 'variables': {}, + 'version': '0.0', + } + + def _check_version(self, version: str) -> bool: + if self.name == 'python2': + return mesonlib.version_compare(version, '< 3.0') + elif self.name == 'python3': + return mesonlib.version_compare(version, '>= 3.0') + return True + + def sanity(self) -> bool: + # Sanity check, we expect to have something that at least quacks in tune + cmd = self.get_command() + ['-c', INTROSPECT_COMMAND] + p, stdout, stderr = mesonlib.Popen_safe(cmd) + try: + info = json.loads(stdout) + except json.JSONDecodeError: + info = None + mlog.debug('Could not introspect Python (%s): exit code %d' % (str(p.args), p.returncode)) + mlog.debug('Program stdout:\n') + mlog.debug(stdout) + mlog.debug('Program stderr:\n') + mlog.debug(stderr) + + if info is not None and self._check_version(info['version']): + variables = info['variables'] + info['suffix'] = variables.get('EXT_SUFFIX') or variables.get('SO') or variables.get('.so') + self.info = T.cast('PythonIntrospectionDict', info) + self.platlib = self._get_path('platlib') + self.purelib = self._get_path('purelib') + return True + else: + return False + + def _get_path(self, key: str) -> None: + user_dir = str(Path.home()) + sys_paths = self.info['sys_paths'] + rel_path = self.info['install_paths'][key][1:] + if not any(p.endswith(rel_path) for p in sys_paths if not p.startswith(user_dir)): + # On Debian derivatives sysconfig install path is broken and is not + # included in the locations python actually lookup. + # See https://github.com/mesonbuild/meson/issues/8739. + mlog.warning('Broken python installation detected. Python files', + 'installed by Meson might not be found by python interpreter.', + once=True) + if mesonlib.is_debianlike(): + rel_path = 'lib/python3/dist-packages' + return rel_path + class PythonInstallation(ExternalProgramHolder): def __init__(self, python, interpreter): @@ -295,10 +363,10 @@ info = python.info prefix = self.interpreter.environment.coredata.get_option(mesonlib.OptionKey('prefix')) self.variables = info['variables'] + self.suffix = info['suffix'] self.paths = info['paths'] - install_paths = info['install_paths'] - self.platlib_install_path = os.path.join(prefix, install_paths['platlib'][1:]) - self.purelib_install_path = os.path.join(prefix, install_paths['purelib'][1:]) + self.platlib_install_path = os.path.join(prefix, python.platlib) + self.purelib_install_path = os.path.join(prefix, python.purelib) self.version = info['version'] self.platform = info['platform'] self.is_pypy = info['is_pypy'] @@ -319,10 +387,10 @@ @permittedKwargs(mod_kwargs) def extension_module_method(self, args, kwargs): - if 'subdir' in kwargs and 'install_dir' in kwargs: - raise InvalidArguments('"subdir" and "install_dir" are mutually exclusive') - - if 'subdir' in kwargs: + if 'install_dir' in kwargs: + if 'subdir' in kwargs: + raise InvalidArguments('"subdir" and "install_dir" are mutually exclusive') + else: subdir = kwargs.pop('subdir', '') if not isinstance(subdir, str): raise InvalidArguments('"subdir" argument must be a string.') @@ -340,12 +408,10 @@ new_deps.append(dep) kwargs['dependencies'] = new_deps - suffix = self.variables.get('EXT_SUFFIX') or self.variables.get('SO') or self.variables.get('.so') - # msys2's python3 has "-cpython-36m.dll", we have to be clever - split = suffix.rsplit('.', 1) - suffix = split.pop(-1) - args[0] += ''.join(s for s in split) + # FIXME: explain what the specific cleverness is here + split, suffix = self.suffix.rsplit('.', 1) + args[0] += split kwargs['name_prefix'] = '' kwargs['name_suffix'] = suffix @@ -498,12 +564,6 @@ else: return None - def _check_version(self, name_or_path, version): - if name_or_path == 'python2': - return mesonlib.version_compare(version, '< 3.0') - elif name_or_path == 'python3': - return mesonlib.version_compare(version, '>= 3.0') - return True @FeatureNewKwargs('python.find_installation', '0.49.0', ['disabler']) @FeatureNewKwargs('python.find_installation', '0.51.0', ['modules']) @@ -515,13 +575,15 @@ want_modules = mesonlib.extract_as_list(kwargs, 'modules') # type: T.List[str] found_modules = [] # type: T.List[str] missing_modules = [] # type: T.List[str] + fallback = args[0] if args else '' + display_name = fallback or 'python' if len(args) > 1: raise InvalidArguments('find_installation takes zero or one positional argument.') name_or_path = state.environment.lookup_binary_entry(MachineChoice.HOST, 'python') if name_or_path is None and args: - name_or_path = args[0] + name_or_path = fallback if not isinstance(name_or_path, str): raise InvalidArguments('find_installation argument must be a string.') @@ -532,8 +594,8 @@ if not name_or_path: python = PythonExternalProgram('python3', mesonlib.python_command) else: - tmp_python = ExternalProgram.from_entry('python3', name_or_path) - python = PythonExternalProgram('python3', ext_prog=tmp_python) + tmp_python = ExternalProgram.from_entry(display_name, name_or_path) + python = PythonExternalProgram(display_name, ext_prog=tmp_python) if not python.found() and mesonlib.is_windows(): pythonpath = self._get_win_pythonpath(name_or_path) @@ -581,25 +643,13 @@ raise mesonlib.MesonException('{} is missing modules: {}'.format(name_or_path or 'python', ', '.join(missing_modules))) return NonExistingExternalProgram() else: - # Sanity check, we expect to have something that at least quacks in tune - try: - cmd = python.get_command() + ['-c', INTROSPECT_COMMAND] - p, stdout, stderr = mesonlib.Popen_safe(cmd) - info = json.loads(stdout) - except json.JSONDecodeError: - info = None - mlog.debug('Could not introspect Python (%s): exit code %d' % (str(p.args), p.returncode)) - mlog.debug('Program stdout:\n') - mlog.debug(stdout) - mlog.debug('Program stderr:\n') - mlog.debug(stderr) + sane = python.sanity() - if isinstance(info, dict) and 'version' in info and self._check_version(name_or_path, info['version']): - python.info = info + if sane: return python else: if required: - raise mesonlib.MesonException(f'{python} is not a valid python or it is missing setuptools') + raise mesonlib.MesonException(f'{python} is not a valid python or it is missing distutils') return NonExistingExternalProgram() raise mesonlib.MesonBugException('Unreachable code was reached (PythonModule.find_installation).') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/modules/qt.py new/meson-0.59.2/mesonbuild/modules/qt.py --- old/meson-0.59.1/mesonbuild/modules/qt.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/modules/qt.py 2021-09-28 19:04:57.000000000 +0200 @@ -103,10 +103,12 @@ def __init__(self, interpreter: 'Interpreter', qt_version: int = 5): ExtensionModule.__init__(self, interpreter) self.qt_version = qt_version - self.moc: ExternalProgram = NonExistingExternalProgram('moc') - self.uic: ExternalProgram = NonExistingExternalProgram('uic') - self.rcc: ExternalProgram = NonExistingExternalProgram('rcc') - self.lrelease: ExternalProgram = NonExistingExternalProgram('lrelease') + self.tools: T.Dict[str, ExternalProgram] = { + 'moc': NonExistingExternalProgram('moc'), + 'uic': NonExistingExternalProgram('uic'), + 'rcc': NonExistingExternalProgram('rcc'), + 'lrelease': NonExistingExternalProgram('lrelease'), + } self.methods.update({ 'has_tools': self.has_tools, 'preprocess': self.preprocess, @@ -120,13 +122,10 @@ """Detect Qt (4 or 5) moc, uic, rcc in the specified bindir or in PATH""" # It is important that this list does not change order as the order of # the returned ExternalPrograms will change as well - bins = ['moc', 'uic', 'rcc', 'lrelease'] - found = {b: NonExistingExternalProgram(name=f'{b}-qt{qt_dep.qtver}') - for b in bins} wanted = f'== {qt_dep.version}' def gen_bins() -> T.Generator[T.Tuple[str, str], None, None]: - for b in bins: + for b in self.tools: if qt_dep.bindir: yield os.path.join(qt_dep.bindir, b), b # prefer the <tool>-qt<version> of the tool to the plain one, as we @@ -135,7 +134,7 @@ yield b, b for b, name in gen_bins(): - if found[name].found(): + if self.tools[name].found(): continue if name == 'lrelease': @@ -158,7 +157,7 @@ version_func=get_version, wanted=wanted) if p.found(): - setattr(self, name, p) + self.tools[name] = p def _detect_tools(self, state: 'ModuleState', method: str, required: bool = True) -> None: if self._tools_detected: @@ -178,10 +177,10 @@ mlog.bold('https://bugreports.qt.io/browse/QTBUG-45460'), fatal=False) else: suffix = f'-qt{self.qt_version}' - self.moc = NonExistingExternalProgram(name='moc' + suffix) - self.uic = NonExistingExternalProgram(name='uic' + suffix) - self.rcc = NonExistingExternalProgram(name='rcc' + suffix) - self.lrelease = NonExistingExternalProgram(name='lrelease' + suffix) + self.tools['moc'] = NonExistingExternalProgram(name='moc' + suffix) + self.tools['uic'] = NonExistingExternalProgram(name='uic' + suffix) + self.tools['rcc'] = NonExistingExternalProgram(name='rcc' + suffix) + self.tools['lrelease'] = NonExistingExternalProgram(name='lrelease' + suffix) @staticmethod def _qrc_nodes(state: 'ModuleState', rcc_file: 'FileOrString') -> T.Tuple[str, T.List[str]]: @@ -255,7 +254,7 @@ mlog.log('qt.has_tools skipped: feature', mlog.bold(feature), 'disabled') return False self._detect_tools(state, method, required=False) - for tool in (self.moc, self.uic, self.rcc, self.lrelease): + for tool in self.tools.values(): if not tool.found(): if required: raise MesonException('Qt tools not found') @@ -282,7 +281,7 @@ def _compile_resources_impl(self, state: 'ModuleState', kwargs: 'ResourceCompilerKwArgs') -> T.List[build.CustomTarget]: # Avoid the FeatureNew when dispatching from preprocess self._detect_tools(state, kwargs['method']) - if not self.rcc.found(): + if not self.tools['rcc'].found(): err_msg = ("{0} sources specified and couldn't find {1}, " "please check your qt{2} installation") raise MesonException(err_msg.format('RCC', f'rcc-qt{self.qt_version}', self.qt_version)) @@ -307,7 +306,7 @@ rcc_kwargs: T.Dict[str, T.Any] = { # TODO: if CustomTarget had typing information we could use that here... 'input': sources, 'output': name + '.cpp', - 'command': self.rcc.get_command() + ['-name', name, '-o', '@OUTPUT@'] + extra_args + ['@INPUT@'] + DEPFILE_ARGS, + 'command': self.tools['rcc'].get_command() + ['-name', name, '-o', '@OUTPUT@'] + extra_args + ['@INPUT@'] + DEPFILE_ARGS, 'depend_files': qrc_deps, 'depfile': f'{name}.d', } @@ -324,7 +323,7 @@ rcc_kwargs = { 'input': rcc_file, 'output': f'{name}.cpp', - 'command': self.rcc.get_command() + ['-name', '@BASENAME@', '-o', '@OUTPUT@'] + extra_args + ['@INPUT@'] + DEPFILE_ARGS, + 'command': self.tools['rcc'].get_command() + ['-name', '@BASENAME@', '-o', '@OUTPUT@'] + extra_args + ['@INPUT@'] + DEPFILE_ARGS, 'depend_files': qrc_deps, 'depfile': f'{name}.d', } @@ -349,14 +348,14 @@ def _compile_ui_impl(self, state: 'ModuleState', kwargs: 'UICompilerKwArgs') -> build.GeneratedList: # Avoid the FeatureNew when dispatching from preprocess self._detect_tools(state, kwargs['method']) - if not self.uic.found(): + if not self.tools['uic'].found(): err_msg = ("{0} sources specified and couldn't find {1}, " "please check your qt{2} installation") raise MesonException(err_msg.format('UIC', f'uic-qt{self.qt_version}', self.qt_version)) # TODO: This generator isn't added to the generator list in the Interpreter gen = build.Generator( - self.uic, + self.tools['uic'], kwargs['extra_args'] + ['-o', '@OUTPUT@', '@INPUT@'], ['ui_@BASENAME@.h'], name=f'Qt{self.qt_version} ui') @@ -380,7 +379,7 @@ def _compile_moc_impl(self, state: 'ModuleState', kwargs: 'MocCompilerKwArgs') -> T.List[build.GeneratedList]: # Avoid the FeatureNew when dispatching from preprocess self._detect_tools(state, kwargs['method']) - if not self.moc.found(): + if not self.tools['moc'].found(): err_msg = ("{0} sources specified and couldn't find {1}, " "please check your qt{2} installation") raise MesonException(err_msg.format('MOC', f'uic-qt{self.qt_version}', self.qt_version)) @@ -398,12 +397,12 @@ arguments = kwargs['extra_args'] + inc + compile_args + ['@INPUT@', '-o', '@OUTPUT@'] if kwargs['headers']: moc_gen = build.Generator( - self.moc, arguments, ['moc_@BASENAME@.cpp'], + self.tools['moc'], arguments, ['moc_@BASENAME@.cpp'], name=f'Qt{self.qt_version} moc header') output.append(moc_gen.process_files(kwargs['headers'], state)) if kwargs['sources']: moc_gen = build.Generator( - self.moc, arguments, ['@BASENAME@.moc'], + self.tools['moc'], arguments, ['@BASENAME@.moc'], name=f'Qt{self.qt_version} moc source') output.append(moc_gen.process_files(kwargs['sources'], state)) @@ -497,19 +496,19 @@ ts_files.append(c.rstrip('.qm') + '.ts') else: raise MesonException(f'qt.compile_translations: qresource can only contain qm files, found {c}') - results = self.preprocess(state, [], {'qresources': qresource, 'rcc_extra_arguments': kwargs['rcc_extra_arguments']}) + results = self.preprocess(state, [], {'qresources': qresource_file, 'rcc_extra_arguments': kwargs['rcc_extra_arguments']}) self._detect_tools(state, kwargs['method']) translations: T.List[build.CustomTarget] = [] for ts in ts_files: - if not self.lrelease.found(): + if not self.tools['lrelease'].found(): raise MesonException('qt.compile_translations: ' + - self.lrelease.name + ' not found') + self.tools['lrelease'].name + ' not found') if qresource: outdir = os.path.dirname(os.path.normpath(os.path.join(state.subdir, ts))) ts = os.path.basename(ts) else: outdir = state.subdir - cmd = [self.lrelease, '@INPUT@', '-qm', '@OUTPUT@'] + cmd = [self.tools['lrelease'], '@INPUT@', '-qm', '@OUTPUT@'] lrelease_kwargs = {'output': '@BASENAME@.qm', 'input': ts, 'install': kwargs.get('install', False), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/mtest.py new/meson-0.59.2/mesonbuild/mtest.py --- old/meson-0.59.1/mesonbuild/mtest.py 2021-07-20 10:56:20.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/mtest.py 2021-09-28 19:04:57.000000000 +0200 @@ -990,7 +990,14 @@ if self.test.workdir: filename = os.path.join(self.test.workdir, filename) - self.junit = et.parse(filename) + try: + self.junit = et.parse(filename) + except FileNotFoundError: + # This can happen if the test fails to run or complete for some + # reason, like the rpath for libgtest isn't properly set. ExitCode + # will handle the failure, don't generate a stacktrace. + pass + super().complete(returncode, res, stdo, stde) TestRun.PROTOCOL_TO_CLASS[TestProtocol.GTEST] = TestRunGTest diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/programs.py new/meson-0.59.2/mesonbuild/programs.py --- old/meson-0.59.1/mesonbuild/programs.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/programs.py 2021-09-28 19:04:57.000000000 +0200 @@ -295,6 +295,9 @@ commands = self._search_dir(name, search_dir) if commands: return commands + # If there is a directory component, do not look in PATH + if os.path.dirname(name) and not os.path.isabs(name): + return [None] # Do a standard search in PATH path = os.environ.get('PATH', None) if mesonlib.is_windows() and path: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/mesonbuild/wrap/wraptool.py new/meson-0.59.2/mesonbuild/wrap/wraptool.py --- old/meson-0.59.1/mesonbuild/wrap/wraptool.py 2021-08-18 13:22:15.000000000 +0200 +++ new/meson-0.59.2/mesonbuild/wrap/wraptool.py 2021-09-28 19:04:57.000000000 +0200 @@ -98,24 +98,24 @@ f.write(url.read()) print(f'Installed {name} version {version} revision {revision}') -def parse_patch_url(patch_url: str) -> T.Tuple[str, int]: +def parse_patch_url(patch_url: str) -> T.Tuple[str, str]: u = urlparse(patch_url) if u.netloc != 'wrapdb.mesonbuild.com': raise WrapException(f'URL {patch_url} does not seems to be a wrapdb patch') arr = u.path.strip('/').split('/') if arr[0] == 'v1': # e.g. https://wrapdb.mesonbuild.com/v1/projects/zlib/1.2.11/5/get_zip - return arr[-3], int(arr[-2]) + return arr[-3], arr[-2] elif arr[0] == 'v2': # e.g. https://wrapdb.mesonbuild.com/v2/zlib_1.2.11-5/get_patch tag = arr[-2] name, version = tag.rsplit('_', 1) version, revision = version.rsplit('-', 1) - return version, int(revision) + return version, revision else: raise WrapException(f'Invalid wrapdb URL {patch_url}') -def get_current_version(wrapfile: str) -> T.Tuple[str, int, str, str, str]: +def get_current_version(wrapfile: str) -> T.Tuple[str, str, str, str, str]: cp = configparser.ConfigParser(interpolation=None) cp.read(wrapfile) wrap_data = cp['wrap-file'] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/run_project_tests.py new/meson-0.59.2/run_project_tests.py --- old/meson-0.59.1/run_project_tests.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/run_project_tests.py 2021-09-28 19:04:57.000000000 +0200 @@ -52,6 +52,7 @@ from mesonbuild.mlog import blue, bold, cyan, green, red, yellow, normal_green from mesonbuild.coredata import backendlist, version as meson_version from mesonbuild.mesonmain import setup_vsenv +from mesonbuild.modules.python import PythonExternalProgram from run_tests import get_fake_options, run_configure, get_meson_script from run_tests import get_backend_commands, get_backend_args_for_dir, Backend from run_tests import ensure_backend_detects_changes @@ -122,6 +123,9 @@ def fail(self, msg: str) -> None: self.msg = msg +python = PythonExternalProgram(sys.executable) +python.sanity() + class InstalledFile: def __init__(self, raw: T.Dict[str, str]): self.path = raw['file'] @@ -143,6 +147,8 @@ (env.machines.host.is_windows() and compiler in {'pgi', 'dmd', 'ldc'})): canonical_compiler = 'msvc' + python_suffix = python.info['suffix'] + has_pdb = False if self.language in {'c', 'cpp'}: has_pdb = canonical_compiler == 'msvc' @@ -161,6 +167,15 @@ return None # Handle the different types + if self.typ in {'py_implib', 'python_lib', 'python_file'}: + val = p.as_posix() + val = val.replace('@PYTHON_PLATLIB@', python.platlib) + val = val.replace('@PYTHON_PURELIB@', python.purelib) + p = Path(val) + if self.typ == 'python_file': + return p + if self.typ == 'python_lib': + return p.with_suffix(python_suffix) if self.typ in ['file', 'dir']: return p elif self.typ == 'shared_lib': @@ -195,13 +210,15 @@ if self.version: p = p.with_name('{}-{}'.format(p.name, self.version[0])) return p.with_suffix('.pdb') if has_pdb else None - elif self.typ == 'implib' or self.typ == 'implibempty': + elif self.typ in {'implib', 'implibempty', 'py_implib'}: if env.machines.host.is_windows() and canonical_compiler == 'msvc': # only MSVC doesn't generate empty implibs if self.typ == 'implibempty' and compiler == 'msvc': return None return p.parent / (re.sub(r'^lib', '', p.name) + '.lib') elif env.machines.host.is_windows() or env.machines.host.is_cygwin(): + if self.typ == 'py_implib': + p = p.with_suffix(python_suffix) return p.with_suffix('.dll.a') else: return None diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/meson-0.59.1/run_unittests.py new/meson-0.59.2/run_unittests.py --- old/meson-0.59.1/run_unittests.py 2021-08-18 13:22:33.000000000 +0200 +++ new/meson-0.59.2/run_unittests.py 2021-09-28 19:04:57.000000000 +0200 @@ -1708,6 +1708,100 @@ self.assertEqual(k.default, 'foo') self.assertEqual(v.default, 'bar') + def test_detect_cpu_family(self) -> None: + """Test the various cpu familes that we detect and normalize. + + This is particularly useful as both documentation, and to keep testing + platforms that are less common. + """ + + @contextmanager + def mock_trial(value: str) -> T.Iterable[None]: + """Mock all of the ways we could get the trial at once.""" + mocked = mock.Mock(return_value=value) + + with mock.patch('mesonbuild.environment.detect_windows_arch', mocked), \ + mock.patch('mesonbuild.environment.platform.processor', mocked), \ + mock.patch('mesonbuild.environment.platform.machine', mocked): + yield + + cases = [ + ('x86', 'x86'), + ('i386', 'x86'), + ('bepc', 'x86'), # Haiku + ('earm', 'arm'), # NetBSD + ('arm', 'arm'), + ('ppc64', 'ppc64'), + ('powerpc64', 'ppc64'), + ('powerpc', 'ppc'), + ('ppc', 'ppc'), + ('macppc', 'ppc'), + ('power macintosh', 'ppc'), + ('mips64el', 'mips64'), + ('mips64', 'mips64'), + ('mips', 'mips'), + ('mipsel', 'mips'), + ('ip30', 'mips64'), + ('ip35', 'mips64'), + ('parisc64', 'parisc'), + ('sun4u', 'sparc64'), + ('sun4v', 'sparc64'), + ('amd64', 'x86_64'), + ('x64', 'x86_64'), + ('i86pc', 'x86_64'), # Solaris + ('aarch64', 'aarch64'), + ('aarch64_be', 'aarch64'), + ] + + with mock.patch('mesonbuild.environment.any_compiler_has_define', mock.Mock(return_value=False)): + for test, expected in cases: + with self.subTest(test, has_define=False), mock_trial(test): + actual = mesonbuild.environment.detect_cpu_family({}) + self.assertEqual(actual, expected) + + with mock.patch('mesonbuild.environment.any_compiler_has_define', mock.Mock(return_value=True)): + for test, expected in [('x86_64', 'x86'), ('aarch64', 'arm'), ('ppc', 'ppc64')]: + with self.subTest(test, has_define=True), mock_trial(test): + actual = mesonbuild.environment.detect_cpu_family({}) + self.assertEqual(actual, expected) + + def test_detect_cpu(self) -> None: + + @contextmanager + def mock_trial(value: str) -> T.Iterable[None]: + """Mock all of the ways we could get the trial at once.""" + mocked = mock.Mock(return_value=value) + + with mock.patch('mesonbuild.environment.detect_windows_arch', mocked), \ + mock.patch('mesonbuild.environment.platform.processor', mocked), \ + mock.patch('mesonbuild.environment.platform.machine', mocked): + yield + + cases = [ + ('amd64', 'x86_64'), + ('x64', 'x86_64'), + ('i86pc', 'x86_64'), + ('earm', 'arm'), + ('mips64el', 'mips64'), + ('mips64', 'mips64'), + ('mips', 'mips'), + ('mipsel', 'mips'), + ('aarch64', 'aarch64'), + ('aarch64_be', 'aarch64'), + ] + + with mock.patch('mesonbuild.environment.any_compiler_has_define', mock.Mock(return_value=False)): + for test, expected in cases: + with self.subTest(test, has_define=False), mock_trial(test): + actual = mesonbuild.environment.detect_cpu({}) + self.assertEqual(actual, expected) + + with mock.patch('mesonbuild.environment.any_compiler_has_define', mock.Mock(return_value=True)): + for test, expected in [('x86_64', 'i686'), ('aarch64', 'arm'), ('ppc', 'ppc64')]: + with self.subTest(test, has_define=True), mock_trial(test): + actual = mesonbuild.environment.detect_cpu({}) + self.assertEqual(actual, expected) + @unittest.skipIf(is_tarball(), 'Skipping because this is a tarball release') class DataTests(unittest.TestCase): @@ -5334,6 +5428,7 @@ missing prog : NO existing prog : ''' + sys.executable + ''' missing dep : NO + external dep : YES 1.2.3 internal dep : YES Plugins @@ -5351,9 +5446,13 @@ if sys.version_info < (3, 7, 0): # Dictionary order is not stable in Python <3.7, so sort the lines # while comparing - self.assertEqual(sorted(expected_lines), sorted(out_lines)) - else: - self.assertEqual(expected_lines, out_lines) + expected_lines = sorted(expected_lines) + out_lines = sorted(out_lines) + for e, o in zip(expected_lines, out_lines): + if e.startswith(' external dep'): + self.assertRegex(o, r'^ external dep : (YES [0-9.]*|NO)$') + else: + self.assertEqual(o, e) def test_meson_compile(self): """Test the meson compile command.""" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/bar.c" "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/bar.c" --- "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/bar.c" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/bar.c" 2020-03-21 11:05:46.000000000 +0100 @@ -0,0 +1,3 @@ +int bar_dummy_func(void) { + return 42; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/meson.build" "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/meson.build" --- "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/bar-1.0/meson.build" 2020-04-25 15:59:16.000000000 +0200 @@ -0,0 +1,2 @@ +project('static lib bar', 'c') +libbar = static_library('bar', 'bar.c') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/foo.c" "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/foo.c" --- "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/foo.c" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/foo.c" 2020-03-21 11:23:04.000000000 +0100 @@ -0,0 +1,3 @@ +int dummy_func(void) { + return 42; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/meson.build" "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/meson.build" --- "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0/meson.build" 2020-04-25 15:52:29.000000000 +0200 @@ -0,0 +1,2 @@ +project('static lib', 'c') +libfoo = static_library('foo', 'foo.c') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/foo.c" "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/foo.c" --- "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/foo.c" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/foo.c" 2020-03-21 11:23:04.000000000 +0100 @@ -0,0 +1,3 @@ +int dummy_func(void) { + return 42; +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/meson.build" "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/meson.build" --- "old/meson-0.59.1/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/common/153 wrap file should not failed/subprojects/foo-1.0-patchdir/meson.build" 2021-04-27 08:50:21.000000000 +0200 @@ -0,0 +1,2 @@ +project('static lib patchdir', 'c') +libfoo = static_library('foo', 'foo.c') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/219 include_type dependency/meson.build" "new/meson-0.59.2/test cases/common/219 include_type dependency/meson.build" --- "old/meson-0.59.1/test cases/common/219 include_type dependency/meson.build" 2021-04-27 08:50:21.000000000 +0200 +++ "new/meson-0.59.2/test cases/common/219 include_type dependency/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -36,6 +36,9 @@ fallback = dependency('sdffgagf_does_not_exist', include_type: 'system', fallback: ['subDep', 'subDep_dep']) assert(fallback.include_type() == 'system', 'include_type works with dependency fallback') +fallback_empty = dependency('', include_type: 'system', fallback: ['subDep', 'subDep_dep']) +assert(fallback_empty.include_type() == 'system', 'include_type works with empty name dependency fallback') + # Check that PCH works with `include_type : 'system'` See https://github.com/mesonbuild/meson/issues/7167 main_exe = executable('main_exe', 'main.cpp', cpp_pch: 'pch/test.hpp', dependencies: boost_dep) test('main_test', main_exe) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/98 subproject subdir/meson.build" "new/meson-0.59.2/test cases/common/98 subproject subdir/meson.build" --- "old/meson-0.59.1/test cases/common/98 subproject subdir/meson.build" 2021-04-27 08:50:21.000000000 +0200 +++ "new/meson-0.59.2/test cases/common/98 subproject subdir/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -27,7 +27,7 @@ assert(not d.found(), 'Dependency should be not-found') # Verify that implicit fallback works because subprojects/sub_implicit directory exists -d = dependency('sub_implicit') +d = dependency('sub_implicit', default_options: 'opt=overriden') assert(d.found(), 'Should implicitly fallback') # Verify that implicit fallback works because sub_implicit.wrap has diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build" "new/meson-0.59.2/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build" --- "old/meson-0.59.1/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build" 2021-04-27 08:50:21.000000000 +0200 +++ "new/meson-0.59.2/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -9,3 +9,5 @@ # This one is not overridden but the wrap file tells the variable name to use. glib_dep = dep + +assert(get_option('opt') == 'overriden') \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt" "new/meson-0.59.2/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt" --- "old/meson-0.59.1/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/common/98 subproject subdir/subprojects/sub_implicit/meson_options.txt" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1 @@ +option('opt', type: 'string', value: 'default') \ No newline at end of file diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/failing/114 allow_fallback with fallback/meson.build" "new/meson-0.59.2/test cases/failing/114 allow_fallback with fallback/meson.build" --- "old/meson-0.59.1/test cases/failing/114 allow_fallback with fallback/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/failing/114 allow_fallback with fallback/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,3 @@ +project('fallback and allow_fallback') + +dependency('foo', fallback: 'foo', allow_fallback: false) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/failing/114 allow_fallback with fallback/test.json" "new/meson-0.59.2/test cases/failing/114 allow_fallback with fallback/test.json" --- "old/meson-0.59.1/test cases/failing/114 allow_fallback with fallback/test.json" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/failing/114 allow_fallback with fallback/test.json" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,8 @@ +{ + "stdout": [ + { + "line": "test cases/failing/114 allow_fallback with fallback/meson.build:3:0: ERROR: \"fallback\" and \"allow_fallback\" arguments are mutually exclusive" + } + ] +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/frameworks/4 qt/main.cpp" "new/meson-0.59.2/test cases/frameworks/4 qt/main.cpp" --- "old/meson-0.59.1/test cases/frameworks/4 qt/main.cpp" 2020-08-15 18:27:05.000000000 +0200 +++ "new/meson-0.59.2/test cases/frameworks/4 qt/main.cpp" 2021-09-28 19:04:57.000000000 +0200 @@ -1,4 +1,6 @@ #include <QApplication> +#include <QTranslator> +#include <QDebug> #include "mainWindow.h" #if QT_VERSION > 0x050000 @@ -16,6 +18,13 @@ Q_INIT_RESOURCE(stuff2); #endif QApplication app(argc, argv); + + auto *translator = new QTranslator; + if (translator->load(QLocale(), QT "embedded", "_", ":/lang")) + qApp->installTranslator(translator); + + qDebug() << QObject::tr("Translate me!"); + MainWindow *win = new MainWindow(); QImage qi(":/thing.png"); if(qi.width() != 640) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/frameworks/4 qt/meson.build" "new/meson-0.59.2/test cases/frameworks/4 qt/meson.build" --- "old/meson-0.59.1/test cases/frameworks/4 qt/meson.build" 2021-08-18 13:22:33.000000000 +0200 +++ "new/meson-0.59.2/test cases/frameworks/4 qt/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -81,10 +81,16 @@ # qt4-rcc and qt5-rcc take different arguments, for example qt4: ['-compress', '3']; qt5: '--compress=3' qtmodule.preprocess(qt + 'testrccarg', qresources : files(['stuff.qrc', 'stuff2.qrc']), rcc_extra_arguments : '--compress=3', method : get_option('method')) + translations_cpp = qtmodule.compile_translations(qresource: qt+'_lang.qrc') + # unity builds suck and definitely cannot handle two qrc embeds in one compilation unit + unityproof_translations = static_library('unityproof_translations', translations_cpp) + + extra_cpp_args += '-DQT="@0@"'.format(qt) qexe = executable(qt + 'app', sources : ['main.cpp', 'mainWindow.cpp', # Sources that don't need preprocessing. prep, prep_rcc], dependencies : qtdep, + link_with: unityproof_translations, cpp_args: extra_cpp_args, gui_app : true) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/frameworks/4 qt/qt4_lang.qrc" "new/meson-0.59.2/test cases/frameworks/4 qt/qt4_lang.qrc" --- "old/meson-0.59.1/test cases/frameworks/4 qt/qt4_lang.qrc" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/frameworks/4 qt/qt4_lang.qrc" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/lang"> + <file>qt4embedded_fr.qm</file> + </qresource> +</RCC> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/frameworks/4 qt/qt4embedded_fr.ts" "new/meson-0.59.2/test cases/frameworks/4 qt/qt4embedded_fr.ts" --- "old/meson-0.59.1/test cases/frameworks/4 qt/qt4embedded_fr.ts" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/frameworks/4 qt/qt4embedded_fr.ts" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0" language="fr_FR"> +<context> + <name>QObject</name> + <message> + <location filename="q5core.cpp" line="23"/> + <source>Translate me!</source> + <translation>Traduisez moi!</translation> + </message> +</context> +</TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/frameworks/4 qt/qt5_lang.qrc" "new/meson-0.59.2/test cases/frameworks/4 qt/qt5_lang.qrc" --- "old/meson-0.59.1/test cases/frameworks/4 qt/qt5_lang.qrc" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/frameworks/4 qt/qt5_lang.qrc" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,6 @@ +<RCC> + <qresource prefix="/lang"> + <file>qt5embedded_fr.qm</file> + </qresource> +</RCC> + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/frameworks/4 qt/qt5embedded_fr.ts" "new/meson-0.59.2/test cases/frameworks/4 qt/qt5embedded_fr.ts" --- "old/meson-0.59.1/test cases/frameworks/4 qt/qt5embedded_fr.ts" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/frameworks/4 qt/qt5embedded_fr.ts" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.1" language="fr_FR"> +<context> + <name>QObject</name> + <message> + <location filename="q5core.cpp" line="23"/> + <source>Translate me!</source> + <translation>Traduisez moi!</translation> + </message> +</context> +</TS> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/blaster.py" "new/meson-0.59.2/test cases/python/2 extmodule/blaster.py" --- "old/meson-0.59.1/test cases/python/2 extmodule/blaster.py" 2021-04-27 08:49:45.000000000 +0200 +++ "new/meson-0.59.2/test cases/python/2 extmodule/blaster.py" 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -#!/usr/bin/env python3 - -import tachyon - -result = tachyon.phaserize('shoot') - -if not isinstance(result, int): - raise SystemExit('Returned result not an integer.') - -if result != 1: - raise SystemExit(f'Returned result {result} is not 1.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/blaster.py.in" "new/meson-0.59.2/test cases/python/2 extmodule/blaster.py.in" --- "old/meson-0.59.1/test cases/python/2 extmodule/blaster.py.in" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/python/2 extmodule/blaster.py.in" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,11 @@ +#!/usr/bin/env python3 + +import @tachyon_module@ as tachyon + +result = tachyon.phaserize('shoot') + +if not isinstance(result, int): + raise SystemExit('Returned result not an integer.') + +if result != 1: + raise SystemExit(f'Returned result {result} is not 1.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/ext/meson.build" "new/meson-0.59.2/test cases/python/2 extmodule/ext/meson.build" --- "old/meson-0.59.1/test cases/python/2 extmodule/ext/meson.build" 2020-08-15 18:27:05.000000000 +0200 +++ "new/meson-0.59.2/test cases/python/2 extmodule/ext/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -1,6 +1,10 @@ pylib = py.extension_module('tachyon', 'tachyon_module.c', dependencies : py_dep, + c_args: '-DMESON_MODULENAME="tachyon"', + install: true, ) +subdir('nested') +subdir('wrongdir') pypathdir = meson.current_build_dir() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/ext/nested/meson.build" "new/meson-0.59.2/test cases/python/2 extmodule/ext/nested/meson.build" --- "old/meson-0.59.1/test cases/python/2 extmodule/ext/nested/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/python/2 extmodule/ext/nested/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,16 @@ +py.extension_module('tachyon', + '../tachyon_module.c', + dependencies : py_dep, + c_args: '-DMESON_MODULENAME="nested.tachyon"', + install: true, + subdir: 'nested' +) +py.install_sources( + configure_file( + input: '../../blaster.py.in', + output: 'blaster.py', + configuration: {'tachyon_module': 'nested.tachyon'} + ), + pure: false, + subdir: 'nested', +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/ext/tachyon_module.c" "new/meson-0.59.2/test cases/python/2 extmodule/ext/tachyon_module.c" --- "old/meson-0.59.1/test cases/python/2 extmodule/ext/tachyon_module.c" 2020-08-15 18:27:05.000000000 +0200 +++ "new/meson-0.59.2/test cases/python/2 extmodule/ext/tachyon_module.c" 2021-09-28 19:04:57.000000000 +0200 @@ -38,7 +38,7 @@ static struct PyModuleDef tachyonmodule = { PyModuleDef_HEAD_INIT, - "tachyon", + MESON_MODULENAME, NULL, -1, TachyonMethods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/ext/wrongdir/meson.build" "new/meson-0.59.2/test cases/python/2 extmodule/ext/wrongdir/meson.build" --- "old/meson-0.59.1/test cases/python/2 extmodule/ext/wrongdir/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/python/2 extmodule/ext/wrongdir/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,7 @@ +py.extension_module('tachyon', + '../tachyon_module.c', + dependencies : py_dep, + c_args: '-DMESON_MODULENAME="tachyon"', + install: true, + install_dir: get_option('libdir') +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/meson.build" "new/meson-0.59.2/test cases/python/2 extmodule/meson.build" --- "old/meson-0.59.1/test cases/python/2 extmodule/meson.build" 2021-04-01 23:12:21.000000000 +0200 +++ "new/meson-0.59.2/test cases/python/2 extmodule/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -18,11 +18,19 @@ subdir('ext') +blaster = configure_file( + input: 'blaster.py.in', + output: 'blaster.py', + configuration: {'tachyon_module': 'tachyon'} +) + test('extmod', py, - args : files('blaster.py'), + args : blaster, env : ['PYTHONPATH=' + pypathdir]) +py.install_sources(blaster, pure: false) +py.install_sources(blaster, subdir: 'pure') py3_pkg_dep = dependency('python3', method: 'pkg-config', required : false) if py3_pkg_dep.found() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/python/2 extmodule/test.json" "new/meson-0.59.2/test cases/python/2 extmodule/test.json" --- "old/meson-0.59.1/test cases/python/2 extmodule/test.json" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/python/2 extmodule/test.json" 2021-09-28 19:04:57.000000000 +0200 @@ -0,0 +1,13 @@ +{ + "installed": [ + { "type": "python_file", "file": "usr/@PYTHON_PLATLIB@/blaster.py" }, + { "type": "python_lib", "file": "usr/@PYTHON_PLATLIB@/tachyon" }, + { "type": "py_implib", "file": "usr/@PYTHON_PLATLIB@/tachyon" }, + { "type": "python_file", "file": "usr/@PYTHON_PURELIB@/pure/blaster.py" }, + { "type": "python_file", "file": "usr/@PYTHON_PLATLIB@/nested/blaster.py" }, + { "type": "python_lib", "file": "usr/@PYTHON_PLATLIB@/nested/tachyon" }, + { "type": "py_implib", "file": "usr/@PYTHON_PLATLIB@/nested/tachyon" }, + { "type": "python_lib", "file": "usr/lib/tachyon" }, + { "type": "py_implib", "file": "usr/lib/tachyon" } + ] +} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/unit/72 summary/meson.build" "new/meson-0.59.2/test cases/unit/72 summary/meson.build" --- "old/meson-0.59.1/test cases/unit/72 summary/meson.build" 2021-04-27 08:50:21.000000000 +0200 +++ "new/meson-0.59.2/test cases/unit/72 summary/meson.build" 2021-09-28 19:04:57.000000000 +0200 @@ -13,6 +13,7 @@ summary({'missing prog': find_program('xyzzy', required: false), 'existing prog': import('python').find_installation(), 'missing dep': dependency('', required: false), + 'external dep': dependency('zlib', required: false), 'internal dep': declare_dependency(), }, section: 'Stuff') summary('A number', 1, section: 'Configuration') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/unit/79 user options for subproject/subprojects/sub/meson.build" "new/meson-0.59.2/test cases/unit/79 user options for subproject/subprojects/sub/meson.build" --- "old/meson-0.59.1/test cases/unit/79 user options for subproject/subprojects/sub/meson.build" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/unit/79 user options for subproject/subprojects/sub/meson.build" 2021-04-27 08:50:21.000000000 +0200 @@ -0,0 +1,45 @@ +project('options', 'c') + +if get_option('testoption') != 'optval' + error('Incorrect value to test option') +endif + +if get_option('other_one') != false + error('Incorrect value to boolean option.') +endif + +if get_option('combo_opt') != 'combo' + error('Incorrect value to combo option.') +endif + +if get_option('array_opt') != ['one', 'two'] + message(get_option('array_opt')) + error('Incorrect value for array option') +endif + +# If the default changes, update test cases/unit/13 reconfigure +if get_option('b_lto') != false + error('Incorrect value in base option.') +endif + +if get_option('includedir') != 'include' + error('Incorrect value in builtin option.') +endif + +if get_option('integer_opt') != 3 + error('Incorrect value in integer option.') +endif + +if get_option('neg_int_opt') != -3 + error('Incorrect value in negative integer option.') +endif + +if get_option('CaseSenSiTivE') != 'Some CAPS' + error('Incorrect value in mixed caps option.') +endif + +if get_option('CASESENSITIVE') != 'ALL CAPS' + error('Incorrect value in all caps option.') +endif + +assert(get_option('wrap_mode') == 'default', 'Wrap mode option is broken.') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' "old/meson-0.59.1/test cases/unit/79 user options for subproject/subprojects/sub/meson_options.txt" "new/meson-0.59.2/test cases/unit/79 user options for subproject/subprojects/sub/meson_options.txt" --- "old/meson-0.59.1/test cases/unit/79 user options for subproject/subprojects/sub/meson_options.txt" 1970-01-01 01:00:00.000000000 +0100 +++ "new/meson-0.59.2/test cases/unit/79 user options for subproject/subprojects/sub/meson_options.txt" 2021-04-27 08:50:21.000000000 +0200 @@ -0,0 +1,9 @@ +option('testoption', type : 'string', value : 'optval', description : 'An option ' + 'to do something') +option('other_one', type : 'boolean', value : not (not (not (not false)))) +option('combo_opt', type : 'co' + 'mbo', choices : ['one', 'two', 'combo'], value : 'combo') +option('array_opt', type : 'array', choices : ['one', 'two', 'three'], value : ['one', 'two']) +option('free_array_opt', type : 'array') +option('integer_opt', type : 'integer', min : 0, max : -(-5), value : 3) +option('neg' + '_' + 'int' + '_' + 'opt', type : 'integer', min : -5, max : 5, value : -3) +option('CaseSenSiTivE', type : 'string', value: 'Some CAPS', description : 'An option with mixed capitaliziation') +option('CASESENSITIVE', type : 'string', value: 'ALL CAPS', description : 'An option with all caps') ++++++ meson-rust-1.55.patch ++++++ Index: meson-0.59.2/test cases/rust/5 polyglot static/meson.build =================================================================== --- meson-0.59.2.orig/test cases/rust/5 polyglot static/meson.build +++ meson-0.59.2/test cases/rust/5 polyglot static/meson.build @@ -2,6 +2,7 @@ project('static rust and c polyglot exec deps = [ meson.get_compiler('c').find_library('dl', required: false), + meson.get_compiler('c').find_library('m', required: false), dependency('threads'), ]

1 0

commit rust for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package rust for openSUSE:Factory checked in at 2021-10-01 22:28:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rust (Old) and /work/SRC/openSUSE:Factory/.rust.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "rust" Fri Oct 1 22:28:56 2021 rev:68 rq:920193 version:1.55.0 Changes: -------- --- /work/SRC/openSUSE:Factory/rust/rust.changes 2021-08-06 22:44:23.562111913 +0200 +++ /work/SRC/openSUSE:Factory/.rust.new.2443/rust.changes 2021-10-01 22:29:01.549370990 +0200 @@ -1,0 +2,11 @@ +Fri Sep 10 03:07:24 UTC 2021 - William Brown <william.brown(a)suse.com> + +- Update to version 1.55 + +------------------------------------------------------------------- +Mon Aug 16 02:27:30 UTC 2021 - William Brown <william.brown(a)suse.com> + +- Change expression of dependency requirements to resolve zypper dup + issues + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rust.spec ++++++ --- /var/tmp/diff_new_pack.sF9smi/_old 2021-10-01 22:29:02.073371958 +0200 +++ /var/tmp/diff_new_pack.sF9smi/_new 2021-10-01 22:29:02.073371958 +0200 @@ -17,8 +17,14 @@ # -%global version_suffix 1.54 -%global version_current 1.54.0 +%global version_suffix 1.55 +%global version_current 1.55.0 + +%define obsolete_rust_versioned() \ +Obsoletes: %{1}1.54%{?2:-%{2}} \ +Obsoletes: %{1}1.53%{?2:-%{2}} \ +Obsoletes: %{1}1.52%{?2:-%{2}} \ +Obsoletes: %{1}1.51%{?2:-%{2}} # === rust arch support tiers === # https://doc.rust-lang.org/nightly/rustc/platform-support.html @@ -46,8 +52,7 @@ Source: README Source99: %{name}-rpmlintrc Requires: rust%{version_suffix} -Conflicts: rust < %{version} -Obsoletes: rust < %{version} +%obsolete_rust_versioned rust %description Rust is a systems programming language focused on three goals: safety, @@ -68,10 +73,8 @@ License: Apache-2.0 OR MIT Group: Development/Languages/Rust Requires: rust = %{version} -Requires: rust%{version_suffix} Requires: rust%{version_suffix}-gdb -Conflicts: rust-gdb < %{version} -Obsoletes: rust-gdb < %{version} +%obsolete_rust_versioned rust gdb %if 0%{?suse_version} && 0%{?suse_version} < 1500 # Legacy SUSE-only form @@ -86,20 +89,15 @@ invoking gdb on rust binaries. - - - - # As this is masked by tier1, this is arch specific even if it has no content. + %package -n rls Summary: Language server for Rust lang License: Apache-2.0 OR MIT Group: Development/Languages/Rust Requires: rls%{version_suffix} Requires: rust = %{version} -Requires: rust%{version_suffix} -Conflicts: rls < %{version} -Obsoletes: rls < %{version} +%obsolete_rust_versioned rls %description -n rls The RLS provides a server that runs in the background, providing IDEs, @@ -114,9 +112,7 @@ Group: Development/Languages/Rust Requires: cargo%{version_suffix} Requires: rust = %{version} -Requires: rust%{version_suffix} -Conflicts: cargo < %{version} -Obsoletes: cargo < %{version} +%obsolete_rust_versioned cargo %description -n cargo Cargo downloads dependencies of Rust projects and compiles it.

1 0

commit crypto-policies for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package crypto-policies for openSUSE:Factory checked in at 2021-10-01 22:28:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crypto-policies (Old) and /work/SRC/openSUSE:Factory/.crypto-policies.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crypto-policies" Fri Oct 1 22:28:56 2021 rev:2 rq:921687 version:20210917.c9d86d1 Changes: -------- --- /work/SRC/openSUSE:Factory/crypto-policies/crypto-policies.changes 2021-03-03 18:33:55.555336339 +0100 +++ /work/SRC/openSUSE:Factory/.crypto-policies.new.2443/crypto-policies.changes 2021-10-01 22:29:00.233368559 +0200 @@ -1,0 +2,53 @@ +Fri Sep 24 11:30:21 UTC 2021 - Pedro Monreal <pmonreal(a)suse.com> + +- Remove the scripts and documentation regarding + fips-finish-install and test-fips-setup + * Add crypto-policies-FIPS.patch + +------------------------------------------------------------------- +Fri Sep 24 09:34:03 UTC 2021 - Pedro Monreal <pmonreal(a)suse.com> + +- Update to version 20210917.c9d86d1: + * openssl: fix disabling ChaCha20 + * pacify pylint 2.11: use format strings + * pacify pylint 2.11: specify explicit encoding + * fix minor things found by new pylint + * update-crypto-policies: --check against regenerated + * update-crypto-policies: fix --check's walking order + * policygenerators/gnutls: revert disabling DTLS0.9... + * policygenerators/java: add javasystem backend + * LEGACY: bump 1023 key size to 1024 + * cryptopolicies: fix 'and' in deprecation warnings + * *ssh: condition ecdh-sha2-nistp384 on SECP384R1 + * nss: hopefully the last fix for nss sigalgs check + * cryptopolicies: Python 3.10 compatibility + * nss: postponing check + testing at least something + * Rename 'policy modules' to 'subpolicies' + * validation.rules: fix a missing word in error + * cryptopolicies: raise errors right after warnings + * update-crypto-policies: capitalize warnings + * cryptopolicies: syntax-precheck scope errors + * .gitlab-ci.yml, Makefile: enable codespell + * all: fix several typos + * docs: don't leave zero TLS/DTLS protocols on + * openssl: separate TLS/DTLS MinProtocol/MaxProtocol + * alg_lists: order protocols new-to-old for consistency + * alg_lists: max_{d,}tls_version + * update-crypto-policies: fix pregenerated + local.d + * openssh: allow validation with pre-8.5 + * .gitlab-ci.yml: run commit-range against upstream + * openssh: Use the new name for PubkeyAcceptedKeyTypes + * sha1_in_dnssec: deprecate + * .gitlab-ci.yml: test commit ranges + * FIPS:OSPP: sign = -*-SHA2-224 + * scoped policies: documentation update + * scoped policies: use new features to the fullest... + * scoped policies: rewrite + minimal policy changes + * scoped policies: rewrite preparations + * nss: postponing the version check again, to 3.64 +- Remove patches fixed upstream: crypto-policies-typos.patch +- Rebase: crypto-policies-test_supported_modules_only.patch +- Merge crypto-policies-asciidoc.patch into + crypto-policies-no-build-manpages.patch + +------------------------------------------------------------------- Old: ---- crypto-policies-asciidoc.patch crypto-policies-typos.patch fedora-crypto-policies-20210225.05203d2.tar.gz New: ---- crypto-policies-FIPS.patch fedora-crypto-policies-20210917.c9d86d1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crypto-policies.spec ++++++ --- /var/tmp/diff_new_pack.iS424I/_old 2021-10-01 22:29:00.825369652 +0200 +++ /var/tmp/diff_new_pack.iS424I/_new 2021-10-01 22:29:00.825369652 +0200 @@ -1,7 +1,7 @@ # # spec file for package crypto-policies # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %global _python_bytecompile_extra 0 Name: crypto-policies -Version: 20210225.05203d2 +Version: 20210917.c9d86d1 Release: 0 Summary: System-wide crypto policies License: LGPL-2.1-or-later @@ -28,18 +28,23 @@ Source1: README.SUSE Source2: crypto-policies.7.gz Source3: update-crypto-policies.8.gz -Patch0: crypto-policies-asciidoc.patch -Patch1: crypto-policies-typos.patch -Patch2: crypto-policies-test_supported_modules_only.patch -Patch3: crypto-policies-no-build-manpages.patch +Patch0: crypto-policies-test_supported_modules_only.patch +Patch1: crypto-policies-no-build-manpages.patch +Patch2: crypto-policies-FIPS.patch BuildRequires: python3-base +# For testing, the following buildrequires need to be uncommented. # BuildRequires: asciidoc +# BuildRequires: bind # BuildRequires: gnutls >= 3.6.0 # BuildRequires: java-devel # BuildRequires: libxslt # BuildRequires: openssl # BuildRequires: perl +# BuildRequires: python3-coverage # BuildRequires: python3-devel >= 3.6 +# BuildRequires: python3-flake8 +# BuildRequires: python3-pylint +# BuildRequires: python3-pytest # BuildRequires: perl(File::Copy) # BuildRequires: perl(File::Temp) # BuildRequires: perl(File::Which) @@ -102,6 +107,11 @@ # Drop pre-generated GOST-ONLY policy, we do not need to ship the files rm -rf %{buildroot}%{_datarootdir}/crypto-policies/GOST-ONLY +# Remove fips-finish-install and test-fips-setup scripts and man +find -type f -name fips-finish-install -delete +find -type f -name fips-finish-install.8.txt -delete +find -type f -name test-fips-setup.sh -delete + # Create back-end configs for mounting with read-only /etc/ for d in LEGACY DEFAULT FUTURE FIPS ; do mkdir -p -m 755 %{buildroot}%{_datarootdir}/crypto-policies/back-ends/$d @@ -119,7 +129,7 @@ cp %{SOURCE1} %{buildroot}%{_sysconfdir}/crypto-policies %check -%make_build check || : +%make_build test || : %post -p <lua> if not posix.access("%{_sysconfdir}/crypto-policies/config") then @@ -175,6 +185,7 @@ %ghost %config(missingok,noreplace) %{_sysconfdir}/crypto-policies/back-ends/nss.config %ghost %config(missingok,noreplace) %{_sysconfdir}/crypto-policies/back-ends/bind.config %ghost %config(missingok,noreplace) %{_sysconfdir}/crypto-policies/back-ends/java.config +%ghost %config(missingok,noreplace) %{_sysconfdir}/crypto-policies/back-ends/javasystem.config %ghost %config(missingok,noreplace) %{_sysconfdir}/crypto-policies/back-ends/krb5.config %ghost %config(missingok,noreplace) %{_sysconfdir}/crypto-policies/back-ends/libreswan.config %ghost %config(missingok,noreplace) %{_sysconfdir}/crypto-policies/back-ends/libssh.config ++++++ README.SUSE ++++++ --- /var/tmp/diff_new_pack.iS424I/_old 2021-10-01 22:29:00.857369711 +0200 +++ /var/tmp/diff_new_pack.iS424I/_new 2021-10-01 22:29:00.857369711 +0200 @@ -1,2 +1,2 @@ -Currently only OpenSSL, GnuTLS, and NSS policies are supported. +Currently only OpenSSL and GnuTLS policies are supported. The rest of the modules ignore the policy settings for the time being. ++++++ _service ++++++ --- /var/tmp/diff_new_pack.iS424I/_old 2021-10-01 22:29:00.877369749 +0200 +++ /var/tmp/diff_new_pack.iS424I/_new 2021-10-01 22:29:00.877369749 +0200 @@ -4,7 +4,7 @@ <param name="scm">git</param> <param name="versionformat">%cd.%h</param> <param name="changesgenerate">enable</param> - <param name="revision">05203d21f6d0ea9bbdb351e4600f1e273720bb8e</param> + <param name="revision">c9d86d1154c4b286c9be3d5e9e32451df6f64e19</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.iS424I/_old 2021-10-01 22:29:00.893369778 +0200 +++ /var/tmp/diff_new_pack.iS424I/_new 2021-10-01 22:29:00.897369785 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://gitlab.com/redhat-crypto/fedora-crypto-policies.git</param> - <param name="changesrevision">05203d21f6d0ea9bbdb351e4600f1e273720bb8e</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">c9d86d1154c4b286c9be3d5e9e32451df6f64e19</param></service></servicedata> \ No newline at end of file ++++++ crypto-policies-FIPS.patch ++++++ Index: fedora-crypto-policies/Makefile =================================================================== --- fedora-crypto-policies.orig/Makefile +++ fedora-crypto-policies/Makefile @@ -5,8 +5,8 @@ MANDIR?=/usr/share/man CONFDIR?=/etc/crypto-policies DESTDIR?= MAN7PAGES=crypto-policies.7 -MAN8PAGES=update-crypto-policies.8 fips-finish-install.8 fips-mode-setup.8 -SCRIPTS=update-crypto-policies fips-finish-install fips-mode-setup +MAN8PAGES=update-crypto-policies.8 fips-finish-install.8 +SCRIPTS=update-crypto-policies fips-finish-install NUM_PROCS = $$(getconf _NPROCESSORS_ONLN) PYVERSION = -3 DIFFTOOL?=meld Index: fedora-crypto-policies/crypto-policies.7.txt =================================================================== --- fedora-crypto-policies.orig/crypto-policies.7.txt +++ fedora-crypto-policies/crypto-policies.7.txt @@ -144,9 +144,6 @@ PROVIDED POLICIES *FIPS*:: A policy to aid conformance to the *FIPS 140-2* requirements. - This policy is used internally by the *fips-mode-setup(8)* tool - which can switch the system into the *FIPS 140-2* mode. - This policy provides at least 112-bit security. * MACs: all *HMAC* with *SHA1* or better * Curves: all prime >= 256 bits @@ -255,12 +252,6 @@ COMMANDS back ends and allows the system administrator to change the active cryptographic policy. -*fips-mode-setup(8)*:: - This command allows the system administrator to enable, or disable the - system FIPS mode and also apply the *FIPS* cryptographic policy - which limits the allowed algorithms and protocols to these allowed by - the FIPS 140-2 requirements. - NOTES ----- @@ -427,7 +418,7 @@ FILES SEE ALSO -------- -update-crypto-policies(8), fips-mode-setup(8) +update-crypto-policies(8) AUTHOR Index: fedora-crypto-policies/python/update-crypto-policies.py =================================================================== --- fedora-crypto-policies.orig/python/update-crypto-policies.py +++ fedora-crypto-policies/python/update-crypto-policies.py @@ -344,16 +344,12 @@ def apply_policy(pconfig, profile=None, eprint("Warning: Using 'update-crypto-policies --set FIPS' " "is not sufficient for") eprint(" FIPS compliance.") - eprint(" Use 'fips-mode-setup --enable' " - "command instead.") elif fips_mode(): eprint("Warning: Using 'update-crypto-policies --set' " "in FIPS mode will make the system") eprint(" non-compliant with FIPS.") eprint(" It can also break " "the ssh access to the system.") - eprint(" Use 'fips-mode-setup --disable' " - "to disable the system FIPS mode.") if base_dir == DEFAULT_BASE_DIR: if not os.geteuid() == 0: ++++++ crypto-policies-no-build-manpages.patch ++++++ --- /var/tmp/diff_new_pack.iS424I/_old 2021-10-01 22:29:00.909369808 +0200 +++ /var/tmp/diff_new_pack.iS424I/_new 2021-10-01 22:29:00.913369815 +0200 @@ -1,23 +1,8 @@ -Index: fedora-crypto-policies-master/Makefile +Index: fedora-crypto-policies/Makefile =================================================================== ---- fedora-crypto-policies-master.orig/Makefile 2020-09-23 08:49:28.000000000 +0200 -+++ fedora-crypto-policies-master/Makefile 2020-11-12 10:00:52.418204054 +0100 -@@ -60,8 +60,8 @@ clean: - rm -rf output - - %: %.txt -- asciidoc -v -d manpage -b docbook $< -- xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml -+ # asciidoc -v -d manpage -b docbook $< -+ # xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml - - dist: - rm -rf crypto-policies && git clone . crypto-policies && rm -rf crypto-policies/.git/ && tar -czf crypto-policies-git$(VERSION).tar.gz crypto-policies && rm -rf crypto-policies -Index: fedora-crypto-policies-master -=================================================================== ---- fedora-crypto-policies-master.orig/Makefile -+++ fedora-crypto-policies-master/Makefile -@@ -21,9 +21,9 @@ install: $(MANPAGES) +--- fedora-crypto-policies.orig/Makefile ++++ fedora-crypto-policies/Makefile +@@ -22,9 +22,9 @@ install: $(MANPAGES) mkdir -p $(DESTDIR)$(MANDIR)/man7 mkdir -p $(DESTDIR)$(MANDIR)/man8 mkdir -p $(DESTDIR)$(BINDIR) @@ -30,3 +15,14 @@ mkdir -p $(DESTDIR)$(DIR)/ install -p -m 644 default-config $(DESTDIR)$(DIR) install -p -m 644 output/reload-cmds.sh $(DESTDIR)$(DIR) +@@ -106,8 +106,8 @@ clean: + rm -rf output + + %: %.txt +- asciidoc.py -v -d manpage -b docbook $< +- xsltproc --nonet -o $@ /usr/share/asciidoc/docbook-xsl/manpage.xsl $@.xml ++ # asciidoc -v -d manpage -b docbook $< ++ # xsltproc --nonet -o $@ /etc/asciidoc/docbook-xsl/manpage.xsl $@.xml + + dist: + rm -rf crypto-policies && git clone . crypto-policies && rm -rf crypto-policies/.git/ && tar -czf crypto-policies-git$(VERSION).tar.gz crypto-policies && rm -rf crypto-policies ++++++ crypto-policies-test_supported_modules_only.patch ++++++ --- /var/tmp/diff_new_pack.iS424I/_old 2021-10-01 22:29:00.917369823 +0200 +++ /var/tmp/diff_new_pack.iS424I/_new 2021-10-01 22:29:00.921369830 +0200 @@ -1,8 +1,8 @@ -Index: fedora-crypto-policies-master/Makefile +Index: fedora-crypto-policies/Makefile =================================================================== ---- fedora-crypto-policies-master.orig/Makefile -+++ fedora-crypto-policies-master/Makefile -@@ -45,8 +45,6 @@ check: +--- fedora-crypto-policies.orig/Makefile ++++ fedora-crypto-policies/Makefile +@@ -56,8 +56,6 @@ check: tests/openssl.pl tests/gnutls.pl tests/nss.py @@ -10,4 +10,4 @@ - tests/krb5.py top_srcdir=. tests/update-crypto-policies.sh - test: check runpylint + # Alternative, equivalent ways to write the same policies ++++++ fedora-crypto-policies-20210225.05203d2.tar.gz -> fedora-crypto-policies-20210917.c9d86d1.tar.gz ++++++ ++++ 5686 lines of diff (skipped)

1 0

commit diffutils for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package diffutils for openSUSE:Factory checked in at 2021-10-01 22:28:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/diffutils (Old) and /work/SRC/openSUSE:Factory/.diffutils.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "diffutils" Fri Oct 1 22:28:55 2021 rev:45 rq:920617 version:3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/diffutils/diffutils.changes 2021-08-18 08:55:14.763019331 +0200 +++ /work/SRC/openSUSE:Factory/.diffutils.new.2443/diffutils.changes 2021-10-01 22:28:59.349366926 +0200 @@ -1,0 +2,5 @@ +Mon Sep 20 17:45:41 UTC 2021 - Andreas Schwab <schwab(a)suse.de> + +- Skip stack overflow tests under qemu emulation (bsc#1190046) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ diffutils.spec ++++++ --- /var/tmp/diff_new_pack.RShcwn/_old 2021-10-01 22:28:59.845367842 +0200 +++ /var/tmp/diff_new_pack.RShcwn/_new 2021-10-01 22:28:59.845367842 +0200 @@ -45,6 +45,12 @@ %make_build %check +%if 0%{?qemu_user_space_build} +# Stack overflow tests are difficult to emulate, skip them +echo exit 77 > gnulib-tests/test-c-stack.sh +echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow1.c +echo 'int main() { return 77; }' > gnulib-tests/test-sigsegv-catch-stackoverflow2.c +%endif %make_build check %install

1 0

commit help2man for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package help2man for openSUSE:Factory checked in at 2021-10-01 22:28:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/help2man (Old) and /work/SRC/openSUSE:Factory/.help2man.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "help2man" Fri Oct 1 22:28:55 2021 rev:53 rq:920600 version:1.48.5 Changes: -------- --- /work/SRC/openSUSE:Factory/help2man/help2man.changes 2021-08-18 08:55:11.595022887 +0200 +++ /work/SRC/openSUSE:Factory/.help2man.new.2443/help2man.changes 2021-10-01 22:28:58.421365211 +0200 @@ -1,0 +2,6 @@ +Fri Sep 17 20:14:54 UTC 2021 - Bernhard Voelker <mail(a)bernhard-voelker.de> + +- help2man 1.48.5: + * Update French translations + +------------------------------------------------------------------- Old: ---- help2man-1.48.4.tar.xz help2man-1.48.4.tar.xz.sig New: ---- help2man-1.48.5.tar.xz help2man-1.48.5.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ help2man.spec ++++++ --- /var/tmp/diff_new_pack.62eEel/_old 2021-10-01 22:28:58.973366231 +0200 +++ /var/tmp/diff_new_pack.62eEel/_new 2021-10-01 22:28:58.977366239 +0200 @@ -17,7 +17,7 @@ Name: help2man -Version: 1.48.4 +Version: 1.48.5 Release: 0 Summary: Script for generating man pages from --help output License: GPL-3.0-or-later ++++++ help2man-1.48.4.tar.xz -> help2man-1.48.5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/INSTALL new/help2man-1.48.5/INSTALL --- old/help2man-1.48.4/INSTALL 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/INSTALL 2021-08-22 14:33:07.000000000 +0200 @@ -1,8 +1,8 @@ Installation Instructions ************************* - Copyright (C) 1994-1996, 1999-2002, 2004-2016 Free Software -Foundation, Inc. + Copyright (C) 1994-1996, 1999-2002, 2004-2017, 2020-2021 Free +Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted in any medium without royalty provided the copyright @@ -225,7 +225,7 @@ and if that doesn't work, install pre-built binaries of GCC for HP-UX. - HP-UX 'make' updates targets which have the same time stamps as their + HP-UX 'make' updates targets which have the same timestamps as their prerequisites, which makes it generally unusable when shipped generated files such as 'configure' are involved. Use GNU 'make' instead. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/README new/help2man-1.48.5/README --- old/help2man-1.48.4/README 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/README 2021-08-22 14:33:07.000000000 +0200 @@ -1,4 +1,4 @@ - README for GNU help2man version 1.48.4 + README for GNU help2man version 1.48.5 help2man is a script to create simple man pages from the --help and --version output of programs. @@ -8,7 +8,7 @@ still providing some useful information. Home page: https://www.gnu.org/software/help2man/ - Distribution: https://ftp.gnu.org/gnu/help2man/help2man-1.48.4.tar.xz + Distribution: https://ftp.gnu.org/gnu/help2man/help2man-1.48.5.tar.xz Repository: https://salsa.debian.org/bod/help2man.git -- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/THANKS new/help2man-1.48.5/THANKS --- old/help2man-1.48.4/THANKS 2021-08-08 06:58:29.000000000 +0200 +++ new/help2man-1.48.5/THANKS 2021-08-22 14:06:10.000000000 +0200 @@ -4,6 +4,7 @@ Yasumichi AKAHOSHI <yasumichi(a)vinelinux.org> Ben Asselstine <benasselstine(a)hushmail.com> +St��phane Aulery <lkppo(a)free.fr> Denis Barbier <barbier(a)debian.org> Daniil Baturin <daniil(a)baturin.org> Karl Berry <karl(a)freefriends.org> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/build-aux/missing new/help2man-1.48.5/build-aux/missing --- old/help2man-1.48.4/build-aux/missing 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/build-aux/missing 2021-08-22 14:33:07.000000000 +0200 @@ -3,7 +3,7 @@ scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2020 Free Software Foundation, Inc. +# Copyright (C) 1996-2021 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pinard(a)iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/configure new/help2man-1.48.5/configure --- old/help2man-1.48.4/configure 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/configure 2021-08-22 14:33:07.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for GNU help2man 1.48.4. +# Generated by GNU Autoconf 2.69 for GNU help2man 1.48.5. # # Report bugs to <bug-help2man(a)gnu.org>. # @@ -579,8 +579,8 @@ # Identity of this package. PACKAGE_NAME='GNU help2man' PACKAGE_TARNAME='help2man' -PACKAGE_VERSION='1.48.4' -PACKAGE_STRING='GNU help2man 1.48.4' +PACKAGE_VERSION='1.48.5' +PACKAGE_STRING='GNU help2man 1.48.5' PACKAGE_BUGREPORT='bug-help2man(a)gnu.org' PACKAGE_URL='http://www.gnu.org/software/help2man/' @@ -1211,7 +1211,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 GNU help2man 1.48.4 to adapt to many kinds of systems. +\`configure' configures GNU help2man 1.48.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1273,7 +1273,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of GNU help2man 1.48.4:";; + short | recursive ) echo "Configuration of GNU help2man 1.48.5:";; esac cat <<\_ACEOF @@ -1360,7 +1360,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -GNU help2man configure 1.48.4 +GNU help2man configure 1.48.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1461,7 +1461,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by GNU help2man $as_me 1.48.4, which was +It was created by GNU help2man $as_me 1.48.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3777,7 +3777,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by GNU help2man $as_me 1.48.4, which was +This file was extended by GNU help2man $as_me 1.48.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3832,7 +3832,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -GNU help2man config.status 1.48.4 +GNU help2man config.status 1.48.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/debian/changelog new/help2man-1.48.5/debian/changelog --- old/help2man-1.48.4/debian/changelog 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/debian/changelog 2021-08-22 14:33:07.000000000 +0200 @@ -1,3 +1,13 @@ +help2man (1.48.5) unstable; urgency=medium + + * Use @samp{} around the option in the menu description for "--help + recommendations" to avoid rendering the -- as endash. (thanks to + Anders Jonsson). + * Update French translations (thanks to St��phane Aulery). + * Update standards version to 4.6.0 (no changes). + + -- Brendan O'Dea <bod(a)debian.org> Sun, 22 Aug 2021 22:33:07 +1000 + help2man (1.48.4) unstable; urgency=medium * Drop dependency on dpkg/install-info (not required since policy diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/debian/control new/help2man-1.48.5/debian/control --- old/help2man-1.48.4/debian/control 2021-04-11 04:51:56.000000000 +0200 +++ new/help2man-1.48.5/debian/control 2021-08-22 14:32:18.000000000 +0200 @@ -2,7 +2,7 @@ Section: devel Priority: optional Maintainer: Brendan O'Dea <bod(a)debian.org> -Standards-Version: 4.5.1 +Standards-Version: 4.6.0 Build-Depends: perl (>= 5.8.0-7), debhelper-compat (= 13), gettext (>= 0.12.1), liblocale-gettext-perl, dpkg-dev (>= 1.17.0) Vcs-Browser: https://salsa.debian.org/bod/help2man Vcs-Git: https://salsa.debian.org/bod/help2man.git diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-de.info new/help2man-1.48.5/help2man-de.info --- old/help2man-1.48.4/help2man-de.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-de.info 2021-08-22 14:33:07.000000000 +0200 @@ -43,7 +43,7 @@ * ��berblick:: ��berblick ��ber ��help2man��. * Aufruf von help2man:: Ausf��hren von ��help2man��. * Empfehlungen f��r --help:: Empfohlene Formatierung f��r die - Ausgabe von��help. + Ausgabe von��--help��. * Einbeziehen von Text:: Verarbeitung von zus��tzlichem Text in derAusgabe. * Verwendung in Makefiles:: Verwendung von ��help2man�� mit��make��. @@ -550,15 +550,15 @@ Tag Table: Node: Top1359 -Node: ��berblick2399 -Node: Aufruf von help2man3212 -Node: Empfehlungen f��r --help6644 -Node: Einbeziehen von Text11385 -Node: Verwendung in Makefiles13763 -Node: Lokalisierte Handbuchseiten14923 -Node: Beispiel17216 -Node: R��ckmeldungen19880 -Node: Bezugsquellen20419 +Node: ��berblick2404 +Node: Aufruf von help2man3217 +Node: Empfehlungen f��r --help6649 +Node: Einbeziehen von Text11390 +Node: Verwendung in Makefiles13768 +Node: Lokalisierte Handbuchseiten14928 +Node: Beispiel17221 +Node: R��ckmeldungen19885 +Node: Bezugsquellen20424 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-es.info new/help2man-1.48.5/help2man-es.info --- old/help2man-1.48.4/help2man-es.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-es.info 2021-08-22 14:33:07.000000000 +0200 @@ -41,7 +41,7 @@ * Visi��n de conjunto:: Visi��n de conjunto de ��help2man��. * Invocar help2man:: C��mo ejecutar ��help2man��. * recomendaciones para --help:: Formato recomendado para la salida - de��help. + de��--help��. * Incluir texto:: Incluir texto adicional en la salida. * Empleo con Makefile:: Utilizar ��help2man�� con ��make��. * Pag��nas de manual regionales:: Generar p��ginas de manual en la @@ -531,15 +531,15 @@ Tag Table: Node: Top1307 -Node: Visi��n de conjunto2245 -Node: Invocar help2man3149 -Node: recomendaciones para --help6324 -Node: Incluir texto10711 -Node: Empleo con Makefile12917 -Node: Pag��nas de manual regionales13975 -Node: Ejemplo16109 -Node: Contacto18976 -Node: Obtenci��n19544 +Node: Visi��n de conjunto2250 +Node: Invocar help2man3154 +Node: recomendaciones para --help6329 +Node: Incluir texto10716 +Node: Empleo con Makefile12922 +Node: Pag��nas de manual regionales13980 +Node: Ejemplo16114 +Node: Contacto18981 +Node: Obtenci��n19549 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-fr.info new/help2man-1.48.5/help2man-fr.info --- old/help2man-1.48.4/help2man-fr.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-fr.info 2021-08-22 14:33:07.000000000 +0200 @@ -5,7 +5,7 @@ pages de manuel �� partir de la sortie d��autres commandes avec les options ��--help�� et ��--version��. - Copyright �� 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, + Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2020, 2021 Free Software Foundation, Inc. Produire et distribuer des copies conformes de ce manuel est permis �� @@ -40,7 +40,7 @@ * Vue d��ensemble:: Vue d��ensemble de ��help2man��. * Appeler help2man:: Fa��ons d��ex��cuter ��help2man��. * Recommandations pour --help:: Formatage recommand�� pour la sortie - avec��help. + avec��--help��. * Texte inclus:: Inclusion de texte suppl��mentaire dans lasortie. * Utilisation de Makefile:: Utilisation de ��help2man�� avec��make��. @@ -536,16 +536,16 @@ Tag Table: -Node: Top1331 -Node: Vue d��ensemble2375 -Node: Appeler help2man3221 -Node: Recommandations pour --help6404 -Node: Texte inclus10902 -Node: Utilisation de Makefile13360 -Node: Pages de manuel traduites14482 -Node: Exemple16725 -Node: Signalements19705 -Node: Disponibilit��20252 +Node: Top1332 +Node: Vue d��ensemble2381 +Node: Appeler help2man3227 +Node: Recommandations pour --help6410 +Node: Texte inclus10908 +Node: Utilisation de Makefile13366 +Node: Pages de manuel traduites14488 +Node: Exemple16731 +Node: Signalements19711 +Node: Disponibilit��20258 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-pl.info new/help2man-1.48.5/help2man-pl.info --- old/help2man-1.48.4/help2man-pl.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-pl.info 2021-08-22 14:33:07.000000000 +0200 @@ -40,7 +40,7 @@ * Przegl��d:: Przegl��d polecenia ��help2man��. * Uruchamianie help2man:: Jak uruchomi�� polecenie ��help2man��. * Zalecenia --help:: Zalecenia dotycz��ce formatowania - wyj��cia��help. + wyj��cia��--help��. * Do��czanie tekstu:: Do��czanie dodatkowego tekstu na wyj��ciu. * U��ycie Makefile:: U��ycie polecenia ��help2man�� z poziomuprogramu ��make��. @@ -520,15 +520,15 @@ Tag Table: Node: Top1235 -Node: Przegl��d2271 -Node: Uruchamianie help2man3084 -Node: Zalecenia --help6190 -Node: Do��czanie tekstu10427 -Node: U��ycie Makefile12558 -Node: Zlokalizowane strony man13752 -Node: Przyk��ad15871 -Node: Kontakt18768 -Node: Dost��pno��19243 +Node: Przegl��d2276 +Node: Uruchamianie help2man3089 +Node: Zalecenia --help6195 +Node: Do��czanie tekstu10432 +Node: U��ycie Makefile12563 +Node: Zlokalizowane strony man13757 +Node: Przyk��ad15876 +Node: Kontakt18773 +Node: Dost��pno��19248 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-sr.info new/help2man-1.48.5/help2man-sr.info --- old/help2man-1.48.4/help2man-sr.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-sr.info 2021-08-22 14:33:07.000000000 +0200 @@ -40,7 +40,7 @@ * ��:: �� help2man��. * �� help2man��:: �� help2man��. -* ��--help�� :: �� help�� +* ��--help�� :: �� --help�� . * �� :: �� . * �� :: ��help2man��make��. @@ -511,15 +511,15 @@ Tag Table: Node: Top1875 -Node: ��3751 -Node: �� help2man��4921 -Node: ��--help�� 9236 -Node: �� 15680 -Node: �� 18970 -Node: �� 20514 -Node: ��23352 -Node: ��27149 -Node: ��27852 +Node: ��3756 +Node: �� help2man��4926 +Node: ��--help�� 9241 +Node: �� 15685 +Node: �� 18975 +Node: �� 20519 +Node: ��23357 +Node: ��27154 +Node: ��27857 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-sv.info new/help2man-1.48.5/help2man-sv.info --- old/help2man-1.48.4/help2man-sv.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-sv.info 2021-08-22 14:33:07.000000000 +0200 @@ -38,8 +38,8 @@ * ��versikt:: ��versikt av ��help2man��. * Anropa help2man:: Hur man k��r ��help2man��. -* --help-rekommendationer:: Rekommenderad formatering av - ��help-utmatning. +* --help-rekommendationer:: Rekommenderad formatering + av��--help��-utmatning. * Inkludera text:: Inkludera ytterligare text i utmatningen. * Anv��ndning av Makefiler:: Anv��ndning av ��help2man�� med��make��. * Lokaliserade manualsidor:: Att producera manualsidor p�� @@ -518,15 +518,15 @@ Tag Table: Node: Top1189 -Node: ��versikt2095 -Node: Anropa help2man2850 -Node: --help-rekommendationer5697 -Node: Inkludera text9889 -Node: Anv��ndning av Makefiler12025 -Node: Lokaliserade manualsidor13040 -Node: Exempel15080 -Node: Rapportering17876 -Node: Tillg��nglighet18353 +Node: ��versikt2131 +Node: Anropa help2man2886 +Node: --help-rekommendationer5733 +Node: Inkludera text9925 +Node: Anv��ndning av Makefiler12061 +Node: Lokaliserade manualsidor13076 +Node: Exempel15116 +Node: Rapportering17912 +Node: Tillg��nglighet18389 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-uk.info new/help2man-1.48.5/help2man-uk.info --- old/help2man-1.48.4/help2man-uk.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-uk.info 2021-08-22 14:33:07.000000000 +0200 @@ -41,7 +41,7 @@ * ��:: �� help2man��. * �� help2man:: �� help2man��. * �� --help:: ��, - �� help. + �� --help��. * �� :: �� . * �� Makefile:: ��help2man�� @@ -543,15 +543,15 @@ Tag Table: Node: Top1990 -Node: ��4199 -Node: �� help2man5766 -Node: �� --help10474 -Node: �� 17950 -Node: �� Makefile21449 -Node: �� man23157 -Node: ��26472 -Node: ��29342 -Node: ��30273 +Node: ��4204 +Node: �� help2man5771 +Node: �� --help10479 +Node: �� 17955 +Node: �� Makefile21454 +Node: �� man23162 +Node: ��26477 +Node: ��29347 +Node: ��30278 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man-zh_CN.info new/help2man-1.48.5/help2man-zh_CN.info --- old/help2man-1.48.4/help2man-zh_CN.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man-zh_CN.info 2021-08-22 14:33:07.000000000 +0200 @@ -37,7 +37,7 @@ * ��:: ��help2man�� * �� help2man:: �� help2man�� -* --help ��:: �� help �� +* --help ��:: �� --help�� * ��:: �� * Makefile ��:: �� make�� help2man�� * ��:: �� @@ -490,15 +490,15 @@ Tag Table: Node: Top1155 -Node: ��1949 -Node: �� help2man2622 -Node: --help ��5299 -Node: ��9173 -Node: Makefile ��11028 -Node: ��12018 -Node: ��13887 -Node: ��16516 -Node: ��16992 +Node: ��1954 +Node: �� help2man2627 +Node: --help ��5304 +Node: ��9178 +Node: Makefile ��11033 +Node: ��12023 +Node: ��13892 +Node: ��16521 +Node: ��16997 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.1 new/help2man-1.48.5/help2man.1 --- old/help2man-1.48.4/help2man.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.PL new/help2man-1.48.5/help2man.PL --- old/help2man-1.48.4/help2man.PL 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.PL 2021-08-22 14:22:46.000000000 +0200 @@ -16,7 +16,7 @@ use Config; use Getopt::Long; -my ($program, $version) = ('help2man', '1.48.4'); +my ($program, $version) = ('help2man', '1.48.5'); my %opts; die "Usage: $0 [--quiet] [--stdout] [--with-gettext] [--name] [--version]\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.da.1 new/help2man-1.48.5/help2man.da.1 --- old/help2man-1.48.4/help2man.da.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.da.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.de.1 new/help2man-1.48.5/help2man.de.1 --- old/help2man-1.48.4/help2man.de.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.de.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.el.1 new/help2man-1.48.5/help2man.el.1 --- old/help2man-1.48.4/help2man.el.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.el.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.eo.1 new/help2man-1.48.5/help2man.eo.1 --- old/help2man-1.48.4/help2man.eo.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.eo.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.es.1 new/help2man-1.48.5/help2man.es.1 --- old/help2man-1.48.4/help2man.es.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.es.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.fi.1 new/help2man-1.48.5/help2man.fi.1 --- old/help2man-1.48.4/help2man.fi.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.fi.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.fr.1 new/help2man-1.48.5/help2man.fr.1 --- old/help2man-1.48.4/help2man.fr.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.fr.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.hr.1 new/help2man-1.48.5/help2man.hr.1 --- old/help2man-1.48.4/help2man.hr.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.hr.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.hu.1 new/help2man-1.48.5/help2man.hu.1 --- old/help2man-1.48.4/help2man.hu.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.hu.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.info new/help2man-1.48.5/help2man.info --- old/help2man-1.48.4/help2man.info 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.info 2021-08-22 14:33:07.000000000 +0200 @@ -38,7 +38,7 @@ * Overview:: Overview of ��help2man��. * Invoking help2man:: How to run ��help2man��. -* --help recommendations:: Recommended formatting for ��help output. +* --help recommendations:: Recommended formatting for ��--help�� output. * Including text:: Including additional text in the output. * Makefile usage:: Using ��help2man�� with ��make��. * Localised man pages:: Producing native language manual pages. @@ -509,15 +509,15 @@ Tag Table: Node: Top1177 -Node: Overview1984 -Node: Invoking help2man2701 -Node: --help recommendations5460 -Node: Including text9336 -Node: Makefile usage11338 -Node: Localised man pages12299 -Node: Example14203 -Node: Reports16823 -Node: Availability17277 +Node: Overview1989 +Node: Invoking help2man2706 +Node: --help recommendations5465 +Node: Including text9341 +Node: Makefile usage11343 +Node: Localised man pages12304 +Node: Example14208 +Node: Reports16828 +Node: Availability17282 End Tag Table diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.it.1 new/help2man-1.48.5/help2man.it.1 --- old/help2man-1.48.4/help2man.it.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.it.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.ja.1 new/help2man-1.48.5/help2man.ja.1 --- old/help2man-1.48.4/help2man.ja.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.ja.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.nb.1 new/help2man-1.48.5/help2man.nb.1 --- old/help2man-1.48.4/help2man.nb.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.nb.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.pl.1 new/help2man-1.48.5/help2man.pl.1 --- old/help2man-1.48.4/help2man.pl.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.pl.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.pt_BR.1 new/help2man-1.48.5/help2man.pt_BR.1 --- old/help2man-1.48.4/help2man.pt_BR.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.pt_BR.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.ru.1 new/help2man-1.48.5/help2man.ru.1 --- old/help2man-1.48.4/help2man.ru.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.ru.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.sr.1 new/help2man-1.48.5/help2man.sr.1 --- old/help2man-1.48.4/help2man.sr.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.sr.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.sv.1 new/help2man-1.48.5/help2man.sv.1 --- old/help2man-1.48.4/help2man.sv.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.sv.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.ta.1 new/help2man-1.48.5/help2man.ta.1 --- old/help2man-1.48.4/help2man.ta.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.ta.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.texi new/help2man-1.48.5/help2man.texi --- old/help2man-1.48.4/help2man.texi 2021-01-19 12:26:07.000000000 +0100 +++ new/help2man-1.48.5/help2man.texi 2021-08-22 13:06:45.000000000 +0200 @@ -77,7 +77,7 @@ @menu * Overview:: Overview of @command{help2man}. * Invoking help2man:: How to run @command{help2man}. -* --help recommendations:: Recommended formatting for --help output. +* --help recommendations:: Recommended formatting for @samp{--help} output. * Including text:: Including additional text in the output. * Makefile usage:: Using @command{help2man} with @command{make}. * Localised man pages:: Producing native language manual pages. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.uk.1 new/help2man-1.48.5/help2man.uk.1 --- old/help2man-1.48.4/help2man.uk.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.uk.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.vi.1 new/help2man-1.48.5/help2man.vi.1 --- old/help2man-1.48.4/help2man.vi.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.vi.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/help2man.zh_CN.1 new/help2man-1.48.5/help2man.zh_CN.1 --- old/help2man-1.48.4/help2man.zh_CN.1 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/help2man.zh_CN.1 2021-08-22 14:33:07.000000000 +0200 @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.4. -.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.4" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.48.5. +.TH HELP2MAN "1" "August 2021" "GNU help2man 1.48.5" "User Commands" .SH NAME help2man \- generate a simple manual page .SH SYNOPSIS Binary files old/help2man-1.48.4/po/fr.gmo and new/help2man-1.48.5/po/fr.gmo differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po/fr.po new/help2man-1.48.5/po/fr.po --- old/help2man-1.48.4/po/fr.po 2021-01-19 13:03:05.000000000 +0100 +++ new/help2man-1.48.5/po/fr.po 2021-08-22 14:05:00.000000000 +0200 @@ -4,18 +4,20 @@ # # Denis Barbier <barbier(a)linuxfr.org>, 1997-2005. # David Pr��vot <david(a)tilapin.org>, 2010-2015. +# St��phane Aulery <lkppo(a)free.fr>, 2021. msgid "" msgstr "" -"Project-Id-Version: help2man 1.46.6\n" +"Project-Id-Version: help2man 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" "POT-Creation-Date: 2021-01-19 22:31+1100\n" -"PO-Revision-Date: 2021-01-19 23:03+1100\n" -"Last-Translator: David Pr��vot <david(a)tilapin.org>\n" +"PO-Revision-Date: 2021-08-19 23:33+0200\n" +"Last-Translator: St��phane Aulery <lkppo(a)free.fr>\n" "Language-Team: French <traduc(a)traduc.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" @@ -34,8 +36,9 @@ msgstr "" "GNU %s %s\n" "\n" -"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010,\n" -"2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020, 2021 Free Software Foundation, Inc.\n" +"Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009,\n" +"2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017, 2020, 2021 Free Software\n" +"Foundation, Inc.\n" "Ce logiciel est libre��; voir les sources pour les conditions de\n" "reproduction. AUCUNE garantie n'est donn��e, pas m��me la garantie\n" "implicite de COMMERCIALISATION ni l'AD��QUATION �� UN BESOIN PARTICULIER.\n" @@ -63,8 +66,7 @@ " --help print this help, then exit\n" " --version print version number, then exit\n" "\n" -"EXECUTABLE should accept `--help' and `--version' options and produce output " -"on\n" +"EXECUTABLE should accept `--help' and `--version' options and produce output on\n" "stdout although alternatives may be specified using:\n" "\n" " -h, --help-option=STRING help option string\n" @@ -102,8 +104,7 @@ "pr��cis��es en utilisant��:\n" "\n" " -h, --help-option=CHA��NE cha��ne pour l'option ��quivalente �� --help��\n" -" -v, --version-option=CHA��NE cha��ne pour l'option ��quivalente �� --" -"version��\n" +" -v, --version-option=CHA��NE cha��ne pour l'option ��quivalente �� --version��\n" " --version-string=CHA��NE cha��ne de version\n" " --no-discard-stderr inclure la sortie d'erreur standard lors\n" " de l'analyse de la sortie d'option\n" @@ -214,9 +215,7 @@ #. be matched. #: help2man:448 msgid "Report +(?:[\\w-]+ +)?bugs|Email +bug +reports +to" -msgstr "" -"([Ss]ignaler|[Rr]apporter|[Ee]nvoyer) +(?:[\\w-]+ +)?(bogue|anomalie|" -"probl��me)s?" +msgstr "([Ss]ignaler|[Rr]apporter|[Ee]nvoyer) +(?:[\\w-]+ +)?(bogue|anomalie|probl��me)s?" # When a string matches this regular expression, it is put into an # AUTHOR section. @@ -465,8 +464,7 @@ #: help2man.h2m.PL:174 msgid "" -"Placement of the text within the section may be explicitly requested by " -"using\n" +"Placement of the text within the section may be explicitly requested by using\n" "the syntax\n" ".RI [< section ],\n" ".RI [= section ]\n" @@ -475,8 +473,7 @@ "to place the additional text before, in place of, or after the default\n" "output respectively.\n" msgstr "" -"Le placement du texte au sein de la section peut ��tre explicitement indiqu�� " -"en\n" +"Le placement du texte au sein de la section peut ��tre explicitement indiqu�� en\n" "utilisant la syntaxe\n" ".RI [< section ],\n" ".RI [= section ]\n" @@ -491,5 +488,4 @@ #: help2man.h2m.PL:186 msgid "The latest version of this distribution is available on-line from:" -msgstr "" -"La derni��re version de cette distribution est disponible en ligne sur\\ :" +msgstr "La derni��re version de cette distribution est disponible en ligne sur\\ :" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/de.po new/help2man-1.48.5/po-texi/de.po --- old/help2man-1.48.4/po-texi/de.po 2021-03-31 13:58:02.000000000 +0200 +++ new/help2man-1.48.5/po-texi/de.po 2021-08-22 13:13:52.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: help2man-texi 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-01-20 19:44+0100\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:13+1000\n" "Last-Translator: Mario Bl��ttermann <mario.blaettermann(a)gmail.com>\n" "Language-Team: German <translation-team-de(a)lists.sourceforge.net>\n" "Language: de\n" @@ -146,8 +146,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "Empfohlene Formatierung f��r die Ausgabe von --help." +msgid "Recommended formatting for @samp{--help} output." +msgstr "Empfohlene Formatierung f��r die Ausgabe von @samp{--help}." #. type: node #: help2man.texi:87 help2man.texi:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/es.po new/help2man-1.48.5/po-texi/es.po --- old/help2man-1.48.4/po-texi/es.po 2021-03-31 13:58:02.000000000 +0200 +++ new/help2man-1.48.5/po-texi/es.po 2021-08-22 13:15:53.000000000 +0200 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: help2man-texi-1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-01-21 20:17+0100\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:15+1000\n" "Last-Translator: Antonio Ceballos <aceballos(a)gmail.com>\n" "Language-Team: Spanish <es(a)tp.org.es>\n" "Language: es\n" @@ -150,8 +150,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "Formato recomendado para la salida de --help." +msgid "Recommended formatting for @samp{--help} output." +msgstr "Formato recomendado para la salida de @samp{--help}." #. type: node #: help2man.texi:87 help2man.texi:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/fr.po new/help2man-1.48.5/po-texi/fr.po --- old/help2man-1.48.4/po-texi/fr.po 2021-03-31 13:58:02.000000000 +0200 +++ new/help2man-1.48.5/po-texi/fr.po 2021-08-22 14:14:57.000000000 +0200 @@ -3,18 +3,20 @@ # This file is distributed under the same license as the help2man-texi package. # # David Pr��vot <david(a)tilapin.org>, 2014, 2015. +# St��phane Aulery <lkppo(a)free.fr>, 2021. msgid "" msgstr "" -"Project-Id-Version: help2man-texi 1.46.6\n" +"Project-Id-Version: help2man-texi 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-01-19 23:08+1100\n" -"Last-Translator: David Pr��vot <david(a)tilapin.org>\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 22:14+1000\n" +"Last-Translator: St��phane Aulery <lkppo(a)free.fr>\n" "Language-Team: French <traduc(a)traduc.org>\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Bugs: Report translation errors to the Language-Team address.\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" @@ -52,7 +54,7 @@ "Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011, " "2012, 2013, 2014, 2015, 2020, 2021 Free Software Foundation, Inc." msgstr "" -"Copyright �� 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011, " +"Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2009, 2010, 2011, " "2012, 2013, 2014, 2015, 2020, 2021 Free Software Foundation, Inc." #. type: titlepage @@ -146,8 +148,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "Formatage recommand�� pour la sortie avec --help." +msgid "Recommended formatting for @samp{--help} output." +msgstr "Formatage recommand�� pour la sortie avec @samp{--help}." #. type: node #: help2man.texi:87 help2man.texi:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/help2man-texi.pot new/help2man-1.48.5/po-texi/help2man-texi.pot --- old/help2man-1.48.4/po-texi/help2man-texi.pot 2021-03-31 14:13:03.000000000 +0200 +++ new/help2man-1.48.5/po-texi/help2man-texi.pot 2021-08-22 13:07:29.000000000 +0200 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -125,7 +125,7 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." +msgid "Recommended formatting for @samp{--help} output." msgstr "" #. type: node diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/pl.po new/help2man-1.48.5/po-texi/pl.po --- old/help2man-1.48.4/po-texi/pl.po 2021-03-31 13:58:02.000000000 +0200 +++ new/help2man-1.48.5/po-texi/pl.po 2021-08-22 13:18:21.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: help2man-texi 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-01-20 20:22+0100\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:18+1000\n" "Last-Translator: Jakub Bogusz <qboosh(a)pld-linux.org>\n" "Language-Team: Polish <translation-team-pl(a)lists.sourceforge.net>\n" "Language: pl\n" @@ -144,8 +144,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "Zalecenia dotycz��ce formatowania wyj��cia --help." +msgid "Recommended formatting for @samp{--help} output." +msgstr "Zalecenia dotycz��ce formatowania wyj��cia @samp{--help}." #. type: node #: help2man.texi:87 help2man.texi:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/pt_BR.po new/help2man-1.48.5/po-texi/pt_BR.po --- old/help2man-1.48.4/po-texi/pt_BR.po 2021-03-31 13:58:02.000000000 +0200 +++ new/help2man-1.48.5/po-texi/pt_BR.po 2021-08-22 13:18:21.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: help2man-texi 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-02-02 08:40-0300\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:18+1000\n" "Last-Translator: Rafael Fontenelle <rafaelff(a)gnome.org>\n" "Language-Team: Brazilian Portuguese <ldpbr-translation(a)lists.sourceforge." "net>\n" @@ -148,7 +148,7 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." +msgid "Recommended formatting for @samp{--help} output." msgstr "Formata��o recomendada para a sa��da de @samp{--help}." #. type: node diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/sr.po new/help2man-1.48.5/po-texi/sr.po --- old/help2man-1.48.4/po-texi/sr.po 2021-03-31 13:54:44.000000000 +0200 +++ new/help2man-1.48.5/po-texi/sr.po 2021-08-22 13:25:24.000000000 +0200 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: help2man-texi 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-03-28 18:42+0200\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:18+1000\n" "Last-Translator: �� <miroslavnikolic(a)rocketmail.com>\n" "Language-Team: Serbian <(nothing)>\n" "Language: sr\n" @@ -144,8 +144,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "�� --help�� ." +msgid "Recommended formatting for @samp{--help} output." +msgstr "�� @samp{--help}�� ." #. type: node #: help2man.texi:87 help2man.texi:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/sv.po new/help2man-1.48.5/po-texi/sv.po --- old/help2man-1.48.4/po-texi/sv.po 2021-08-08 06:58:52.000000000 +0200 +++ new/help2man-1.48.5/po-texi/sv.po 2021-08-22 13:21:28.000000000 +0200 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: help2man-texi 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-08-05 14:50+0200\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:21+1000\n" "Last-Translator: Anders Jonsson <anders.jonsson(a)norsjovallen.se>\n" "Language-Team: Swedish <tp-sv(a)listor.tp-sv.se>\n" "Language: sv\n" @@ -146,8 +146,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "Rekommenderad formatering av --help-utmatning." +msgid "Recommended formatting for @samp{--help} output." +msgstr "Rekommenderad formatering av @samp{--help}-utmatning." #. type: node #: help2man.texi:87 help2man.texi:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/uk.po new/help2man-1.48.5/po-texi/uk.po --- old/help2man-1.48.4/po-texi/uk.po 2021-03-31 13:58:02.000000000 +0200 +++ new/help2man-1.48.5/po-texi/uk.po 2021-08-22 13:21:27.000000000 +0200 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: help2man-texi 1.47.17\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-01-20 20:39+0200\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:21+1000\n" "Last-Translator: Yuri Chornoivan <yurchor(a)ukr.net>\n" "Language-Team: Ukrainian <trans-uk(a)lists.fedoraproject.org>\n" "Language: uk\n" @@ -144,8 +144,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "�� , �� --help." +msgid "Recommended formatting for @samp{--help} output." +msgstr "�� , �� @samp{--help}." #. type: node #: help2man.texi:87 help2man.texi:304 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/help2man-1.48.4/po-texi/zh_CN.po new/help2man-1.48.5/po-texi/zh_CN.po --- old/help2man-1.48.4/po-texi/zh_CN.po 2021-03-31 13:58:02.000000000 +0200 +++ new/help2man-1.48.5/po-texi/zh_CN.po 2021-08-22 13:21:27.000000000 +0200 @@ -16,8 +16,8 @@ msgstr "" "Project-Id-Version: help2man-texi 1.47.3\n" "Report-Msgid-Bugs-To: Brendan O'Dea <bug-help2man(a)gnu.org>\n" -"POT-Creation-Date: 2021-03-31 22:44+1100\n" -"PO-Revision-Date: 2021-01-19 23:13+1100\n" +"POT-Creation-Date: 2021-08-22 21:07+1000\n" +"PO-Revision-Date: 2021-08-22 21:21+1000\n" "Last-Translator: Mingye Wang (Arthur2e5) <arthur200126(a)gmail.com>\n" "Language-Team: Chinese (simplified) <i18n-zh(a)googlegroups.com>\n" "Language: zh_CN\n" @@ -152,8 +152,8 @@ #. type: menuentry #: help2man.texi:87 -msgid "Recommended formatting for --help output." -msgstr "�� --help ��" +msgid "Recommended formatting for @samp{--help} output." +msgstr "�� @samp{--help} ��" #. type: node #: help2man.texi:87 help2man.texi:304

1 0

commit gd for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package gd for openSUSE:Factory checked in at 2021-10-01 22:28:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gd (Old) and /work/SRC/openSUSE:Factory/.gd.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gd" Fri Oct 1 22:28:54 2021 rev:57 rq:922326 version:2.3.3 Changes: -------- --- /work/SRC/openSUSE:Factory/gd/gd.changes 2021-09-20 23:31:59.103086990 +0200 +++ /work/SRC/openSUSE:Factory/.gd.new.2443/gd.changes 2021-10-01 22:28:57.705363889 +0200 @@ -1,0 +2,6 @@ +Thu Sep 30 09:05:44 UTC 2021 - pgajdos(a)suse.com + +- reenable gd/gd2 legacy formats, was disabled by upstream by + default [bsc#1190762] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gd.spec ++++++ --- /var/tmp/diff_new_pack.VQ3gGZ/_old 2021-10-01 22:28:58.233364864 +0200 +++ /var/tmp/diff_new_pack.VQ3gGZ/_new 2021-10-01 22:28:58.233364864 +0200 @@ -106,6 +106,7 @@ --with-jpeg \ --with-png \ --with-xpm \ + --enable-gd-formats=yes \ --with-webp \ %if 0%{?suse_version} >= 1550 || 0%{?sle_version} > 150300 --with-avif \

1 0

commit selinux-policy for openSUSE:Factory
by Source-Sync 01 Oct '21

01 Oct '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package selinux-policy for openSUSE:Factory checked in at 2021-10-01 22:28:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/selinux-policy (Old) and /work/SRC/openSUSE:Factory/.selinux-policy.new.2443 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "selinux-policy" Fri Oct 1 22:28:54 2021 rev:18 rq:922280 version:20210716 Changes: -------- --- /work/SRC/openSUSE:Factory/selinux-policy/selinux-policy.changes 2021-09-02 23:20:15.676549478 +0200 +++ /work/SRC/openSUSE:Factory/.selinux-policy.new.2443/selinux-policy.changes 2021-10-01 22:28:55.557359921 +0200 @@ -1,0 +2,6 @@ +Tue Sep 28 12:44:22 UTC 2021 - Enzo Matsumiya <ematsumiya(a)suse.com> + +- Fix auditd service start with systemd hardening directives (boo#1190918) + * add fix_auditd.patch + +------------------------------------------------------------------- New: ---- fix_auditd.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ selinux-policy.spec ++++++ --- /var/tmp/diff_new_pack.C3mMl7/_old 2021-10-01 22:28:56.593361834 +0200 +++ /var/tmp/diff_new_pack.C3mMl7/_new 2021-10-01 22:28:56.597361842 +0200 @@ -136,6 +136,7 @@ Patch053: fix_systemd_watch.patch # kernel specific sysctl.conf (boo#1184804) Patch054: fix_kernel_sysctl.patch +Patch055: fix_auditd.patch Patch100: sedoctool.patch ++++++ fix_auditd.patch ++++++ --- a/policy/modules/system/logging.if +++ b/policy/modules/system/logging.if @@ -430,6 +430,7 @@ interface(`logging_manage_audit_config', files_search_etc($1) manage_files_pattern($1, auditd_etc_t, auditd_etc_t) + allow $1 auditd_etc_t:dir mounton; ') ########################################

1 0