July 2022 - openSUSE Commits - openSUSE Mailing Lists

commit 000update-repos for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000update-repos for openSUSE:Factory checked in at 2022-07-29 21:05:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000update-repos (Old) and /work/SRC/openSUSE:Factory/.000update-repos.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000update-repos" Fri Jul 29 21:05:18 2022 rev:2043 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! New: ---- factory:non-oss_3288.2.packages.zst factory_20220728.packages.zst ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------

1 0

commit 000release-packages for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 000release-packages for openSUSE:Factory checked in at 2022-07-29 17:43:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/000release-packages (Old) and /work/SRC/openSUSE:Factory/.000release-packages.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "000release-packages" Fri Jul 29 17:43:17 2022 rev:1738 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MicroOS-release.spec ++++++ --- /var/tmp/diff_new_pack.G8oISZ/_old 2022-07-29 17:43:20.271211890 +0200 +++ /var/tmp/diff_new_pack.G8oISZ/_new 2022-07-29 17:43:20.275211902 +0200 @@ -17,7 +17,7 @@ Name: MicroOS-release -Version: 20220728 +Version: 20220729 Release: 0 Summary: openSUSE MicroOS License: GPL-2.0-or-later @@ -176,9 +176,9 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = MicroOS -Provides: product(MicroOS) = 20220728-0 +Provides: product(MicroOS) = 20220729-0 Provides: product-label() = openSUSE%20MicroOS -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220728 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Amicroos%3A20220729 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-endoflife() Requires: product_flavor(MicroOS) @@ -194,7 +194,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(MicroOS) = 20220728-0 +Provides: product_flavor(MicroOS) = 20220729-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description dvd @@ -210,7 +210,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(MicroOS) = 20220728-0 +Provides: product_flavor(MicroOS) = 20220729-0 Summary: openSUSE MicroOS%{?betaversion: %{betaversion}} %description appliance @@ -267,11 +267,11 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>MicroOS</name> - <version>20220728</version> + <version>20220729</version> <release>0</release> <endoflife></endoflife> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:microos:20220728</cpeid> + <cpeid>cpe:/o:opensuse:microos:20220729</cpeid> <productline>MicroOS</productline> <register> <pool> ++++++ openSUSE-Addon-NonOss-release.spec ++++++ --- /var/tmp/diff_new_pack.G8oISZ/_old 2022-07-29 17:43:20.295211958 +0200 +++ /var/tmp/diff_new_pack.G8oISZ/_new 2022-07-29 17:43:20.299211968 +0200 @@ -1,5 +1,5 @@ # -# spec file for package openSUSE-Addon-NonOss-release (Version 20220728) +# spec file for package openSUSE-Addon-NonOss-release (Version 20220729) # # Copyright (c) 2022 openSUSE. # @@ -16,16 +16,16 @@ Name: openSUSE-Addon-NonOss-release %define product openSUSE-Addon-NonOss Summary: openSUSE NonOSS Addon%{?betaversion: %{betaversion}} -Version: 20220728 +Version: 20220729 Release: 0 License: BSD-3-Clause Group: System/Fhs Provides: %name-%version Provides: product() = openSUSE-Addon-NonOss -Provides: product(openSUSE-Addon-NonOss) = 20220728-0 +Provides: product(openSUSE-Addon-NonOss) = 20220729-0 Provides: product-label() = non%20oss%20addon -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220728 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%2Daddon%2Dnonoss%3A20220729 AutoReqProv: on @@ -48,10 +48,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE-Addon-NonOss</name> - <version>20220728</version> + <version>20220729</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220728</cpeid> + <cpeid>cpe:/o:opensuse:opensuse-addon-nonoss:20220729</cpeid> <register> <pool> </pool> ++++++ openSUSE-release.spec ++++++ --- /var/tmp/diff_new_pack.G8oISZ/_old 2022-07-29 17:43:20.315212014 +0200 +++ /var/tmp/diff_new_pack.G8oISZ/_new 2022-07-29 17:43:20.319212026 +0200 @@ -20,7 +20,7 @@ #define betaversion %{nil} %define codename Tumbleweed Name: openSUSE-release -Version: 20220728 +Version: 20220729 Release: 0 # 0 is the product release, not the build release of this package Summary: openSUSE Tumbleweed @@ -178,7 +178,7 @@ %include %{SOURCE100} Provides: %name-%version Provides: product() = openSUSE -Provides: product(openSUSE) = 20220728-0 +Provides: product(openSUSE) = 20220729-0 %ifarch x86_64 Provides: product-register-target() = openSUSE%2DTumbleweed%2Dx86_64 %endif @@ -192,7 +192,7 @@ Provides: product-register-target() = openSUSE%2DTumbleweed%2Daarch64 %endif Provides: product-label() = openSUSE -Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220728 +Provides: product-cpeid() = cpe%3A%2Fo%3Aopensuse%3Aopensuse%3A20220729 Provides: product-url(releasenotes) = http%3A%2F%2Fdoc.opensuse.org%2Frelease%2Dnotes%2Fx86_64%2FopenSUSE%2FTumbleweed%2Frelease%2Dnotes%2DopenSUSE.rpm Provides: product-url(repository) = http%3A%2F%2Fdownload.opensuse.org%2Ftumbleweed%2Frepo%2Foss%2F Requires: product_flavor(openSUSE) @@ -206,7 +206,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(ftp) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description ftp @@ -221,7 +221,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(mini) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description mini @@ -236,7 +236,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(dvd) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description dvd @@ -251,7 +251,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-kde) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-kde @@ -266,7 +266,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-x11) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-x11 @@ -281,7 +281,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-gnome) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-gnome @@ -296,7 +296,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(livecd-xfce) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description livecd-xfce @@ -311,7 +311,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-kde) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-kde @@ -326,7 +326,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-gnome) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-gnome @@ -341,7 +341,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(usb-x11) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description usb-x11 @@ -356,7 +356,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance @@ -371,7 +371,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-docker) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-docker @@ -386,7 +386,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-kvm) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-kvm @@ -401,7 +401,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vmware) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vmware @@ -416,7 +416,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-openstack) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-openstack @@ -431,7 +431,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-hyperv) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-hyperv @@ -446,7 +446,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-vagrant) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-vagrant @@ -461,7 +461,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-wsl) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-wsl @@ -476,7 +476,7 @@ Group: System/Fhs Provides: product_flavor() Provides: flavor(appliance-custom) -Provides: product_flavor(openSUSE) = 20220728-0 +Provides: product_flavor(openSUSE) = 20220729-0 Summary: openSUSE Tumbleweed%{?betaversion: %{betaversion}} %description appliance-custom @@ -557,10 +557,10 @@ <product schemeversion="0"> <vendor>openSUSE</vendor> <name>openSUSE</name> - <version>20220728</version> + <version>20220729</version> <release>0</release> <arch>%{_target_cpu}</arch> - <cpeid>cpe:/o:opensuse:opensuse:20220728</cpeid> + <cpeid>cpe:/o:opensuse:opensuse:20220729</cpeid> <productline>openSUSE</productline> <register> <pool>

1 0

commit 00Meta for openSUSE:Leap:15.3:Images
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package 00Meta for openSUSE:Leap:15.3:Images checked in at 2022-07-29 17:30:51 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Leap:15.3:Images/00Meta (Old) and /work/SRC/openSUSE:Leap:15.3:Images/.00Meta.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "00Meta" Fri Jul 29 17:30:51 2022 rev:383 rq: version:unknown Changes: -------- New Changes file: NO CHANGES FILE!!! ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ version_totest ++++++ --- /var/tmp/diff_new_pack.23SkeX/_old 2022-07-29 17:30:52.961797058 +0200 +++ /var/tmp/diff_new_pack.23SkeX/_new 2022-07-29 17:30:52.965797070 +0200 @@ -1,3 +1,3 @@ -9.567 +9.568 (No newline at EOF)

1 0

commit python-starlette for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-starlette for openSUSE:Factory checked in at 2022-07-29 16:48:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-starlette (Old) and /work/SRC/openSUSE:Factory/.python-starlette.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-starlette" Fri Jul 29 16:48:26 2022 rev:9 rq:991718 version:0.20.4 Changes: -------- --- /work/SRC/openSUSE:Factory/python-starlette/python-starlette.changes 2022-07-13 13:45:49.486068990 +0200 +++ /work/SRC/openSUSE:Factory/.python-starlette.new.1533/python-starlette.changes 2022-07-29 16:48:32.150758982 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 10:21:51 UTC 2022 - Torsten Gruner <simmphonie(a)opensuse.org> + +- enable multibuild for test + +------------------------------------------------------------------- New: ---- _multibuild ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-starlette.spec ++++++ --- /var/tmp/diff_new_pack.tosE2T/_old 2022-07-29 16:48:32.682760462 +0200 +++ /var/tmp/diff_new_pack.tosE2T/_new 2022-07-29 16:48:32.686760473 +0200 @@ -1,5 +1,5 @@ # -# spec file for package python-starlette +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -16,9 +16,17 @@ # +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "test" +%define psuffix -test +%bcond_without test +%else +%define psuffix %{nil} +%bcond_with test +%endif %{?!python_module:%define python_module() python3-%{**}} %define skip_python2 1 -Name: python-starlette +Name: python-starlette%{psuffix} Version: 0.20.4 Release: 0 Summary: Lightweight ASGI framework/toolkit @@ -27,25 +35,27 @@ Source: https://github.com/encode/starlette/archive/refs/tags/%{version}.tar.gz#/st… BuildRequires: %{python_module Jinja2} BuildRequires: %{python_module PyYAML} -BuildRequires: %{python_module aiofiles} -BuildRequires: %{python_module aiosqlite} BuildRequires: %{python_module anyio} +BuildRequires: %{python_module base >= 3.7} BuildRequires: %{python_module contextlib2} +BuildRequires: %{python_module itsdangerous} +BuildRequires: %{python_module requests} +BuildRequires: %{python_module setuptools} +BuildRequires: %{python_module typing_extensions} +%if %{with test} +BuildRequires: %{python_module aiofiles} +BuildRequires: %{python_module aiosqlite} BuildRequires: %{python_module databases} BuildRequires: %{python_module flake8} BuildRequires: %{python_module graphene} -BuildRequires: %{python_module itsdangerous} BuildRequires: %{python_module pytest-asyncio} BuildRequires: %{python_module pytest-cov} BuildRequires: %{python_module pytest} BuildRequires: %{python_module python-multipart} -BuildRequires: %{python_module requests} -BuildRequires: %{python_module setuptools} BuildRequires: %{python_module trio} -BuildRequires: %{python_module typing_extensions} +%endif BuildRequires: fdupes BuildRequires: python-rpm-macros -BuildRequires: python3-base >= 3.7 BuildArch: noarch %python_subpackages @@ -60,20 +70,26 @@ %python_build %install +%if ! %{with test} %python_install %python_expand %fdupes %{buildroot}%{$python_sitelib} +%endif %check +%if %{with test} # Remove unrecognized arguments: --strict-config --strict-markers sed -i "s|--strict-config||" setup.cfg sed -i "s|--strict-markers||" setup.cfg sed -i "s| error$||" setup.cfg %pytest --asyncio-mode=strict +%endif +%if ! %{with test} %files %{python_files} %doc README.md %license LICENSE.md %{python_sitelib}/starlette %{python_sitelib}/starlette-%{version}*-info +%endif %changelog ++++++ _multibuild ++++++ <multibuild> <package>test</package> </multibuild>

1 0

commit barvinok for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package barvinok for openSUSE:Factory checked in at 2022-07-29 16:48:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/barvinok (Old) and /work/SRC/openSUSE:Factory/.barvinok.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "barvinok" Fri Jul 29 16:48:25 2022 rev:4 rq:991700 version:0.41.6 Changes: -------- --- /work/SRC/openSUSE:Factory/barvinok/barvinok.changes 2022-04-21 15:49:17.564356876 +0200 +++ /work/SRC/openSUSE:Factory/.barvinok.new.1533/barvinok.changes 2022-07-29 16:48:29.446751465 +0200 @@ -1,0 +2,6 @@ +Fri Jul 29 10:25:22 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 0.41.6 + * Support recent versions of clang + +------------------------------------------------------------------- Old: ---- barvinok-0.41.5.tar.xz New: ---- barvinok-0.41.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ barvinok.spec ++++++ --- /var/tmp/diff_new_pack.rZeZAR/_old 2022-07-29 16:48:30.078753221 +0200 +++ /var/tmp/diff_new_pack.rZeZAR/_new 2022-07-29 16:48:30.082753233 +0200 @@ -18,7 +18,7 @@ %define lname libbarvinok23 Name: barvinok -Version: 0.41.5 +Version: 0.41.6 Release: 0 Summary: Library for computing homotopy continuation of roots License: GPL-2.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.rZeZAR/_old 2022-07-29 16:48:30.150753422 +0200 +++ /var/tmp/diff_new_pack.rZeZAR/_new 2022-07-29 16:48:30.154753433 +0200 @@ -2,9 +2,9 @@ <service name="tar_scm" mode="disabled"> <param name="scm">git</param> <param name="url">https://repo.or.cz/barvinok.git</param> - <param name="revision">barvinok-0.41.5</param> - <param name="parent-tag">barvinok-0.41.5</param> - <param name="versionformat">0.41.5</param> + <param name="revision">barvinok-0.41.6</param> + <param name="parent-tag">barvinok-0.41.6</param> + <param name="versionformat">0.41.6</param> </service> <service name="recompress" mode="disabled"> <param name="file">*.tar</param> ++++++ barvinok-0.41.5.tar.xz -> barvinok-0.41.6.tar.xz ++++++ ++++ 35489 lines of diff (skipped)

1 0

commit brial for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package brial for openSUSE:Factory checked in at 2022-07-29 16:48:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/brial (Old) and /work/SRC/openSUSE:Factory/.brial.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "brial" Fri Jul 29 16:48:24 2022 rev:4 rq:991698 version:1.2.11 Changes: -------- --- /work/SRC/openSUSE:Factory/brial/brial.changes 2020-10-02 17:43:47.550970801 +0200 +++ /work/SRC/openSUSE:Factory/.brial.new.1533/brial.changes 2022-07-29 16:48:27.478745992 +0200 @@ -1,0 +2,7 @@ +Fri Jul 29 10:01:54 UTC 2022 - Jan Engelhardt <jengelh(a)inai.de> + +- Update to release 1.2.11 + * Remove unary_function and binary_function which are + deprecated in c++11 and removed in c++17. + +------------------------------------------------------------------- Old: ---- brial-1.2.10.tar.bz2 New: ---- brial-1.2.11.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ brial.spec ++++++ --- /var/tmp/diff_new_pack.IneUY0/_old 2022-07-29 16:48:28.022747505 +0200 +++ /var/tmp/diff_new_pack.IneUY0/_new 2022-07-29 16:48:28.026747516 +0200 @@ -1,7 +1,7 @@ # # spec file for package brial # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 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 @@ %define lname libbrial3 Name: brial -Version: 1.2.10 +Version: 1.2.11 Release: 0 Summary: The Polynomials over Boolean Rings Computer Algebra System License: GPL-2.0-or-later ++++++ brial-1.2.10.tar.bz2 -> brial-1.2.11.tar.bz2 ++++++ ++++ 24970 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/ar-lib new/brial-1.2.11/ar-lib --- old/brial-1.2.10/ar-lib 2017-10-14 02:41:30.000000000 +0200 +++ new/brial-1.2.11/ar-lib 2022-07-26 12:14:10.000000000 +0200 @@ -2,9 +2,9 @@ # Wrapper for Microsoft lib.exe me=ar-lib -scriptversion=2012-03-01.08; # UTC +scriptversion=2019-07-04.01; # UTC -# Copyright (C) 2010-2014 Free Software Foundation, Inc. +# Copyright (C) 2010-2021 Free Software Foundation, Inc. # Written by Peter Rosin <peda(a)lysator.liu.se>. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -65,7 +65,7 @@ mingw) file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` ;; - cygwin) + cygwin | msys) file=`cygpath -m "$file" || echo "$file"` ;; wine) @@ -224,10 +224,11 @@ esac done else - $AR -NOLOGO -LIST "$archive" | sed -e 's/\\/\\\\/g' | while read member - do - $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? - done + $AR -NOLOGO -LIST "$archive" | tr -d '\r' | sed -e 's/\\/\\\\/g' \ + | while read member + do + $AR -NOLOGO -EXTRACT:"$member" "$archive" || exit $? + done fi elif test -n "$quick$replace"; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/compile new/brial-1.2.11/compile --- old/brial-1.2.10/compile 2017-10-14 02:41:30.000000000 +0200 +++ new/brial-1.2.11/compile 2022-07-26 12:14:10.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2021 Free Software Foundation, Inc. # Written by Tom Tromey <tromey(a)cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -53,7 +53,7 @@ MINGW*) file_conv=mingw ;; - CYGWIN*) + CYGWIN* | MSYS*) file_conv=cygwin ;; *) @@ -67,7 +67,7 @@ mingw/*) file=`cmd //C echo "$file " | sed -e 's/"$.*$ " *$/\1/'` ;; - cygwin/*) + cygwin/* | msys/*) file=`cygpath -m "$file" || echo "$file"` ;; wine/*) @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/config_dummy.h.in new/brial-1.2.11/config_dummy.h.in --- old/brial-1.2.10/config_dummy.h.in 2020-10-01 11:47:01.000000000 +0200 +++ new/brial-1.2.11/config_dummy.h.in 2022-07-29 11:10:18.000000000 +0200 @@ -15,12 +15,12 @@ /* Define to 1 if you have the <inttypes.h> header file. */ #undef HAVE_INTTYPES_H -/* Define to 1 if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - /* Define to 1 if you have the <stdint.h> header file. */ #undef HAVE_STDINT_H +/* Define to 1 if you have the <stdio.h> header file. */ +#undef HAVE_STDIO_H + /* Define to 1 if you have the <stdlib.h> header file. */ #undef HAVE_STDLIB_H @@ -84,7 +84,9 @@ /* The size of `void *', as computed by sizeof. */ #undef SIZEOF_VOID_P -/* Define to 1 if you have the ANSI C header files. */ +/* Define to 1 if all of the C90 standard headers exist (not just the ones + required in a freestanding environment). This macro is provided for + backward compatibility; new code need not use it. */ #undef STDC_HEADERS /* Version number of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/configure.ac new/brial-1.2.11/configure.ac --- old/brial-1.2.10/configure.ac 2020-10-01 11:45:04.000000000 +0200 +++ new/brial-1.2.11/configure.ac 2022-07-29 11:09:22.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([BRiAl], [1.2.10]) +AC_INIT([BRiAl],[1.2.11]) AC_CONFIG_MACRO_DIRS([m4]) AM_INIT_AUTOMAKE([foreign -Wall -Werror tar-ustar]) @@ -6,19 +6,16 @@ LT_INIT LT_CURRENT=3 -LT_REVISION=6 +LT_REVISION=7 LT_AGE=0 AC_SUBST(LT_CURRENT) AC_SUBST(LT_REVISION) AC_SUBST(LT_AGE) -AC_PROG_CC_C99 -if test "x$ac_cv_prog_cc_c99" = "xno"; then - AC_MSG_ERROR("A C99 capable compiler is required") -fi +AC_PROG_CC AC_PROG_CXX AC_PROG_INSTALL -AC_PROG_LIBTOOL +LT_INIT dnl C++11 is now the default AX_CXX_COMPILE_STDCXX(11,,mandatory) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/groebner/include/polybori/groebner/BoundedDivisorsOf.h new/brial-1.2.11/groebner/include/polybori/groebner/BoundedDivisorsOf.h --- old/brial-1.2.10/groebner/include/polybori/groebner/BoundedDivisorsOf.h 2017-10-13 23:35:11.000000000 +0200 +++ new/brial-1.2.11/groebner/include/polybori/groebner/BoundedDivisorsOf.h 2022-07-29 10:06:42.000000000 +0200 @@ -39,10 +39,12 @@ * @note The operator stored references of t0 and T only. **/ -class BoundedDivisorsOf: - public std::unary_function<Monomial, MonomialSet> { +class BoundedDivisorsOf { public: + /// typedef to replace unary_function - this are expected in other files + typedef Monomial argument_type; + typedef MonomialSet result_type; /// Initialize mapping with given parameters BoundedDivisorsOf(const Monomial& term, const MonomialSet& terms): m_factor(term), m_terms(terms) {} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/groebner/include/polybori/groebner/PolyFromPolyEntry.h new/brial-1.2.11/groebner/include/polybori/groebner/PolyFromPolyEntry.h --- old/brial-1.2.10/groebner/include/polybori/groebner/PolyFromPolyEntry.h 2017-10-13 23:35:11.000000000 +0200 +++ new/brial-1.2.11/groebner/include/polybori/groebner/PolyFromPolyEntry.h 2022-07-29 10:06:42.000000000 +0200 @@ -29,8 +29,7 @@ * **/ -class PolyFromPolyEntry: - public std::unary_function<PolyEntry, Polynomial> { +class PolyFromPolyEntry { public: const Polynomial& operator()(const PolyEntry& entry) const { return entry.p; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/groebner/src/Makefile.am new/brial-1.2.11/groebner/src/Makefile.am --- old/brial-1.2.10/groebner/src/Makefile.am 2017-10-13 23:35:11.000000000 +0200 +++ new/brial-1.2.11/groebner/src/Makefile.am 2022-07-29 10:06:42.000000000 +0200 @@ -2,7 +2,7 @@ lib_LTLIBRARIES = libbrial_groebner.la -libbrial_groebner_la_CXXFLAGS = $(AM_CXXFLAGS) $(SIMMD_CFLAGS) +libbrial_groebner_la_CXXFLAGS = $(AM_CXXFLAGS) $(M4RI_CFLAGS) $(SIMMD_CFLAGS) libbrial_groebner_la_LIBADD = \ $(top_builddir)/libbrial.la \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/libbrial/include/polybori/common/traits.h new/brial-1.2.11/libbrial/include/polybori/common/traits.h --- old/brial-1.2.10/libbrial/include/polybori/common/traits.h 2020-10-01 11:43:40.000000000 +0200 +++ new/brial-1.2.11/libbrial/include/polybori/common/traits.h 2022-07-29 10:06:42.000000000 +0200 @@ -148,7 +148,6 @@ typedef node_type (*unary_int_function)(mgrcore_type, int); typedef node_type (*void_function)(mgrcore_type); - typedef DD_CTFP binary_function; typedef node_type (*binary_int_function)(mgrcore_type, node_type, int); typedef node_type (*ternary_function)(mgrcore_type, node_type, node_type, node_type); @@ -165,7 +164,6 @@ typedef fromspace::mgrcore_type mgrcore_type; \ typedef fromspace::unary_int_function unary_int_function; \ typedef fromspace::void_function void_function; \ - typedef fromspace::binary_function binary_function; \ typedef fromspace::binary_int_function binary_int_function; \ typedef fromspace::ternary_function ternary_function; \ typedef fromspace::int_unary_function int_unary_function; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/libbrial/include/polybori/config.h new/brial-1.2.11/libbrial/include/polybori/config.h --- old/brial-1.2.10/libbrial/include/polybori/config.h 2020-10-01 11:47:11.000000000 +0200 +++ new/brial-1.2.11/libbrial/include/polybori/config.h 2022-07-29 11:25:42.000000000 +0200 @@ -24,10 +24,10 @@ #define PACKAGE_NAME "BRiAl" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "BRiAl 1.2.10" +#define PACKAGE_STRING "BRiAl 1.2.11" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "brial" /* Define to the version of this package. */ -#define PACKAGE_VERSION "1.2.10" +#define PACKAGE_VERSION "1.2.11" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/libbrial/include/polybori/orderings/pbori_order.h new/brial-1.2.11/libbrial/include/polybori/orderings/pbori_order.h --- old/brial-1.2.10/libbrial/include/polybori/orderings/pbori_order.h 2018-03-07 08:06:30.000000000 +0100 +++ new/brial-1.2.11/libbrial/include/polybori/orderings/pbori_order.h 2022-07-29 10:06:42.000000000 +0200 @@ -53,8 +53,7 @@ /// @class lex_compare_predicate /// @brief defines lexicographic comparison functor template <class LhsType, class RhsType, class BinaryPredicate> -class lex_compare_predicate: - public std::binary_function<LhsType, RhsType, bool> { +class lex_compare_predicate { public: /// Constructor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/libbrial/include/polybori/routines/pbori_func.h new/brial-1.2.11/libbrial/include/polybori/routines/pbori_func.h --- old/brial-1.2.10/libbrial/include/polybori/routines/pbori_func.h 2017-10-16 00:42:42.000000000 +0200 +++ new/brial-1.2.11/libbrial/include/polybori/routines/pbori_func.h 2022-07-29 10:06:42.000000000 +0200 @@ -110,9 +110,7 @@ /// @brief Accessing .uniteAssign() template <class RhsType, class LhsType = typename pbori_traits<RhsType>::idx_type > -class unite_assign: - public std::binary_function<RhsType&, const LhsType&, RhsType&> { - +class unite_assign { public: RhsType& operator() (RhsType& rhs, const LhsType& lhs) const { return (rhs = rhs.unite(lhs)); @@ -422,8 +420,7 @@ class inserts; template <class RhsType, class LhsType> -class inserts: - public std::binary_function<RhsType&, const LhsType&, RhsType&> { +class inserts { public: RhsType& operator() (RhsType& rhs, const LhsType& lhs) const { @@ -450,8 +447,7 @@ class insert_assign; template <class RhsType, class LhsType> -class insert_assign: - public std::binary_function<RhsType&, const LhsType&, RhsType&> { +class insert_assign { public: RhsType& operator() (RhsType& rhs, const LhsType& lhs) const { @@ -480,8 +476,7 @@ template <class RhsType, class LhsType> -class removes: - public std::binary_function<RhsType&, const LhsType&, RhsType&> { +class removes { public: RhsType& operator() (RhsType& rhs, const LhsType& lhs) const { @@ -510,8 +505,7 @@ template <class RhsType, class LhsType> -class remove_assign: - public std::binary_function<RhsType&, const LhsType&, RhsType&> { +class remove_assign { public: RhsType& operator() (RhsType& rhs, const LhsType& lhs) const { @@ -623,9 +617,7 @@ * @brief A functional for size comparisons. **/ template <class ListType> -class sizes_less: - public std::binary_function<const ListType&, const ListType&, bool> { - +class sizes_less { public: bool operator()(const ListType& lhs, const ListType& rhs) const { return (lhs.size() < rhs.size()); @@ -693,8 +685,7 @@ template <class DDType> -class navigates: - public std::unary_function<DDType, typename DDType::navigator> { +class navigates { public: /// Type of decision diagram typedef DDType dd_type; @@ -702,8 +693,12 @@ /// Type for navigation through diagram typedef typename DDType::navigator navigator; - /// Generic access to base type - typedef std::unary_function<dd_type, navigator> base; + /// Generic access to base type (replaced from unary_function) + class base { + public: + typedef dd_type argument_type; + typedef navigator result_type; + }; /// The actual operation typename base::result_type operator()(const dd_type& rhs) const{ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/libbrial/src/BoolePolynomial.cc new/brial-1.2.11/libbrial/src/BoolePolynomial.cc --- old/brial-1.2.10/libbrial/src/BoolePolynomial.cc 2017-10-13 23:35:11.000000000 +0200 +++ new/brial-1.2.11/libbrial/src/BoolePolynomial.cc 2022-07-29 10:06:42.000000000 +0200 @@ -764,14 +764,14 @@ }; template <class SizeType> -class AddEliminationDegree: -public std::binary_function<SizeType, SizeType, SizeType>{ +class AddEliminationDegree { public: typedef SizeType size_type; - typedef std::binary_function<size_type, size_type, size_type> base; + + //typedef std::binary_function<size_type, size_type, size_type> base; AddEliminationDegree(size_type min): - base(), m_min(min) {} + m_min(min) {} size_type& operator()(size_type& rhs, size_type lhs) { ++rhs; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/m4/ax_boost_base.m4 new/brial-1.2.11/m4/ax_boost_base.m4 --- old/brial-1.2.10/m4/ax_boost_base.m4 2020-09-23 11:06:07.000000000 +0200 +++ new/brial-1.2.11/m4/ax_boost_base.m4 2022-07-29 04:43:26.000000000 +0200 @@ -33,7 +33,7 @@ # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 47 +#serial 49 # example boost program (need to pass version) m4_define([_AX_BOOST_BASE_PROGRAM], @@ -114,7 +114,7 @@ AS_CASE([${host_cpu}], [x86_64],[libsubdirs="lib64 libx32 lib lib64"], [mips*64*],[libsubdirs="lib64 lib32 lib lib64"], - [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64],[libsubdirs="lib64 lib lib64"], + [ppc64|powerpc64|s390x|sparc64|aarch64|ppc64le|powerpc64le|riscv64|e2k],[libsubdirs="lib64 lib lib64"], [libsubdirs="lib"] ) @@ -123,6 +123,7 @@ dnl are almost assuredly the ones desired. AS_CASE([${host_cpu}], [i?86],[multiarch_libsubdir="lib/i386-${host_os}"], + [armv7l],[multiarch_libsubdir="lib/arm-${host_os}"], [multiarch_libsubdir="lib/${host_cpu}-${host_os}"] ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/m4/ax_cxx_compile_stdcxx.m4 new/brial-1.2.11/m4/ax_cxx_compile_stdcxx.m4 --- old/brial-1.2.10/m4/ax_cxx_compile_stdcxx.m4 2020-09-23 11:10:21.000000000 +0200 +++ new/brial-1.2.11/m4/ax_cxx_compile_stdcxx.m4 2022-07-29 04:43:14.000000000 +0200 @@ -10,13 +10,13 @@ # # Check for baseline language coverage in the compiler for the specified # version of the C++ standard. If necessary, add switches to CXX and -# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) -# or '14' (for the C++14 standard). +# CXXCPP to enable support. VERSION may be '11', '14', '17', or '20' for +# the respective C++ standard version. # # The second argument, if specified, indicates whether you insist on an # extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. # -std=c++11). If neither is specified, you get whatever works, with -# preference for an extended mode. +# preference for no added switch, and then for an extended mode. # # The third argument, if specified 'mandatory' or if left unspecified, # indicates that baseline support for the specified C++ standard is @@ -35,13 +35,15 @@ # Copyright (c) 2015 Moritz Klammler <moritz(a)klammler.eu> # Copyright (c) 2016, 2018 Krzesimir Nowak <qdlacz(a)gmail.com> # Copyright (c) 2019 Enji Cooper <yaneurabeya(a)gmail.com> +# Copyright (c) 2020 Jason Merrill <jason(a)redhat.com> +# Copyright (c) 2021 J��rn Heusipp <osmanx(a)problemloesungsmaschine.de> # # Copying and distribution of this file, with or without modification, are # permitted in any medium without royalty provided the copyright notice # and this notice are preserved. This file is offered as-is, without any # warranty. -#serial 11 +#serial 14 dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro dnl (serial version number 13). @@ -50,6 +52,7 @@ m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], [$1], [14], [ax_cxx_compile_alternatives="14 1y"], [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [$1], [20], [ax_cxx_compile_alternatives="20"], [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl m4_if([$2], [], [], [$2], [ext], [], @@ -62,6 +65,16 @@ AC_LANG_PUSH([C++])dnl ac_success=no + m4_if([$2], [], [dnl + AC_CACHE_CHECK(whether $CXX supports C++$1 features by default, + ax_cv_cxx_compile_cxx$1, + [AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [ax_cv_cxx_compile_cxx$1=yes], + [ax_cv_cxx_compile_cxx$1=no])]) + if test x$ax_cv_cxx_compile_cxx$1 = xyes; then + ac_success=yes + fi]) + m4_if([$2], [noext], [], [dnl if test x$ac_success = xno; then for alternative in ${ax_cxx_compile_alternatives}; do @@ -140,7 +153,6 @@ _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 ) - dnl Test body for checking C++14 support m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], @@ -148,12 +160,24 @@ _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 ) +dnl Test body for checking C++17 support + m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 ) +dnl Test body for checking C++20 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_20], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_20 +) + + dnl Tests for new features in C++11 m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ @@ -949,3 +973,33 @@ #endif // __cplusplus < 201703L ]]) + + +dnl Tests for new features in C++20 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_20], [[ + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 202002L + +#error "This is not a C++20 compiler" + +#else + +#include <version> + +namespace cxx20 +{ + +// As C++20 supports feature test macros in the standard, there is no +// immediate need to actually test for feature availability on the +// Autoconf side. + +} // namespace cxx20 + +#endif // __cplusplus < 202002L + +]]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/m4/libtool.m4 new/brial-1.2.11/m4/libtool.m4 --- old/brial-1.2.10/m4/libtool.m4 2017-10-14 02:41:26.000000000 +0200 +++ new/brial-1.2.11/m4/libtool.m4 2022-06-14 13:28:37.000000000 +0200 @@ -1,6 +1,7 @@ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- # -# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc. +# Copyright (C) 1996-2001, 2003-2019, 2021-2022 Free Software +# Foundation, Inc. # Written by Gordon Matzigkeit, 1996 # # This file is free software; the Free Software Foundation gives @@ -31,7 +32,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. ]) -# serial 58 LT_INIT +# serial 59 LT_INIT # LT_PREREQ(VERSION) @@ -181,6 +182,7 @@ m4_require([_LT_CHECK_SHELL_FEATURES])dnl m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl m4_require([_LT_CMD_RELOAD])dnl +m4_require([_LT_DECL_FILECMD])dnl m4_require([_LT_CHECK_MAGIC_METHOD])dnl m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl m4_require([_LT_CMD_OLD_ARCHIVE])dnl @@ -219,8 +221,8 @@ ofile=libtool can_build_shared=yes -# All known linkers require a '.a' archive for static linking (except MSVC, -# which needs '.lib'). +# All known linkers require a '.a' archive for static linking (except MSVC and +# ICC, which need '.lib'). libext=a with_gnu_ld=$lt_cv_prog_gnu_ld @@ -778,7 +780,7 @@ # if finds mixed CR/LF and LF-only lines. Since sed operates in # text mode, it properly converts lines to CR/LF. This bash problem # is reportedly fixed, but why not run on old versions too? - sed '$q' "$ltmain" >> "$cfgfile" \ + $SED '$q' "$ltmain" >> "$cfgfile" \ || (rm -f "$cfgfile"; exit 1) mv -f "$cfgfile" "$ofile" || @@ -1042,8 +1044,8 @@ _LT_EOF echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD - echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD - $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD + echo "$AR $AR_FLAGS libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD + $AR $AR_FLAGS libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD cat > conftest.c << _LT_EOF @@ -1067,17 +1069,12 @@ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;; darwin1.*) _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - darwin*) # darwin 5.x on - # if running on 10.5 or later, the deployment target defaults - # to the OS version, if on x86, and 10.4, the deployment - # target defaults to 10.4. Don't you love it? - case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in - 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; - 10.[[012]][[,.]]*) - _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; - 10.*) - _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; + darwin*) + case $MACOSX_DEPLOYMENT_TARGET,$host in + 10.[[012]],*|,*powerpc*-darwin[[5-8]]*) + _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;; + *) + _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;; esac ;; esac @@ -1126,12 +1123,12 @@ output_verbose_link_cmd=func_echo_all _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil" _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" - _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(module_expsym_cmds, $1)="$SED -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil" m4_if([$1], [CXX], [ if test yes != "$lt_cv_apple_cc_single_mod"; then _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil" - _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" + _LT_TAGVAR(archive_expsym_cmds, $1)="$SED 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil" fi ],[]) else @@ -1245,7 +1242,8 @@ # _LT_WITH_SYSROOT # ---------------- AC_DEFUN([_LT_WITH_SYSROOT], -[AC_MSG_CHECKING([for sysroot]) +[m4_require([_LT_DECL_SED])dnl +AC_MSG_CHECKING([for sysroot]) AC_ARG_WITH([sysroot], [AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@], [Search for dependent libraries within DIR (or the compiler's sysroot @@ -1262,7 +1260,7 @@ fi ;; #( /*) - lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"` + lt_sysroot=`echo "$with_sysroot" | $SED -e "$sed_quote_subst"` ;; #( no|'') ;; #( @@ -1292,7 +1290,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *ELF-32*) HPUX_IA64_MODE=32 ;; @@ -1309,7 +1307,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then if test yes = "$lt_cv_prog_gnu_ld"; then - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -melf32bsmip" ;; @@ -1321,7 +1319,7 @@ ;; esac else - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) LD="${LD-ld} -32" ;; @@ -1343,7 +1341,7 @@ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then emul=elf - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *32-bit*) emul="${emul}32" ;; @@ -1351,7 +1349,7 @@ emul="${emul}64" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *MSB*) emul="${emul}btsmip" ;; @@ -1359,7 +1357,7 @@ emul="${emul}ltsmip" ;; esac - case `/usr/bin/file conftest.$ac_objext` in + case `$FILECMD conftest.$ac_objext` in *N32*) emul="${emul}n32" ;; @@ -1379,14 +1377,14 @@ # not appear in the list. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *32-bit*) case $host in x86_64-*kfreebsd*-gnu) LD="${LD-ld} -m elf_i386_fbsd" ;; x86_64-*linux*) - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *x86-64*) LD="${LD-ld} -m elf32_x86_64" ;; @@ -1454,7 +1452,7 @@ # options accordingly. echo 'int i;' > conftest.$ac_ext if AC_TRY_EVAL(ac_compile); then - case `/usr/bin/file conftest.o` in + case `$FILECMD conftest.o` in *64-bit*) case $lt_cv_prog_gnu_ld in yes*) @@ -1493,9 +1491,22 @@ m4_defun([_LT_PROG_AR], [AC_CHECK_TOOLS(AR, [ar], false) : ${AR=ar} -: ${AR_FLAGS=cru} _LT_DECL([], [AR], [1], [The archiver]) -_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive]) + +# Use ARFLAGS variable as AR's operation code to sync the variable naming with +# Automake. If both AR_FLAGS and ARFLAGS are specified, AR_FLAGS should have +# higher priority because thats what people were doing historically (setting +# ARFLAGS for automake and AR_FLAGS for libtool). FIXME: Make the AR_FLAGS +# variable obsoleted/removed. + +test ${AR_FLAGS+y} || AR_FLAGS=${ARFLAGS-cr} +lt_ar_flags=$AR_FLAGS +_LT_DECL([], [lt_ar_flags], [0], [Flags to create an archive (by configure)]) + +# Make AR_FLAGS overridable by 'make ARFLAGS='. Don't try to run-time override +# by AR_FLAGS because that was never working and AR_FLAGS is about to die. +_LT_DECL([], [AR_FLAGS], [\@S|@{ARFLAGS-"\@S|@lt_ar_flags"}], + [Flags to create an archive]) AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file], [lt_cv_ar_at_file=no @@ -1708,13 +1719,18 @@ lt_cv_sys_max_cmd_len=8192; ;; + mint*) + # On MiNT this can take a long time and run out of memory. + lt_cv_sys_max_cmd_len=8192; + ;; + amigaos*) # On AmigaOS with pdksh, this test takes hours, literally. # So we just punt and use a minimum line length of 8192. lt_cv_sys_max_cmd_len=8192; ;; - bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*) + bitrig* | darwin* | dragonfly* | freebsd* | midnightbsd* | netbsd* | openbsd*) # This has been around since 386BSD, at least. Likely further. if test -x /sbin/sysctl; then lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` @@ -1757,7 +1773,7 @@ sysv5* | sco5v6* | sysv4.2uw2*) kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` if test -n "$kargmax"; then - lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` + lt_cv_sys_max_cmd_len=`echo $kargmax | $SED 's/.*[[ ]]//'` else lt_cv_sys_max_cmd_len=32768 fi @@ -2207,26 +2223,35 @@ striplib= old_striplib= AC_MSG_CHECKING([whether stripping libraries is possible]) -if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" - AC_MSG_RESULT([yes]) +if test -z "$STRIP"; then + AC_MSG_RESULT([no]) else -# FIXME - insert some real tests, host_os isn't really good enough - case $host_os in - darwin*) - if test -n "$STRIP"; then + if $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + case $host_os in + darwin*) + # FIXME - insert some real tests, host_os isn't really good enough striplib="$STRIP -x" old_striplib="$STRIP -S" AC_MSG_RESULT([yes]) - else + ;; + freebsd*) + if $STRIP -V 2>&1 | $GREP "elftoolchain" >/dev/null; then + old_striplib="$STRIP --strip-debug" + striplib="$STRIP --strip-unneeded" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi + ;; + *) AC_MSG_RESULT([no]) - fi - ;; - *) - AC_MSG_RESULT([no]) - ;; - esac + ;; + esac + fi fi _LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) _LT_DECL([], [striplib], [1]) @@ -2549,7 +2574,7 @@ case $host_os in cygwin*) # Cygwin DLLs use 'cyg' prefix rather than 'lib' - soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + soname_spec='`echo $libname | $SED -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"]) ;; @@ -2559,14 +2584,14 @@ ;; pw32*) # pw32 DLLs use 'pw' prefix rather than 'lib' - library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' + library_names_spec='`echo $libname | $SED -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' ;; esac dynamic_linker='Win32 ld.exe' ;; - *,cl*) - # Native MSVC + *,cl* | *,icl*) + # Native MSVC or ICC libname_spec='$name' soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext' library_names_spec='$libname.dll.lib' @@ -2585,7 +2610,7 @@ done IFS=$lt_save_ifs # Convert to MSYS style. - sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` + sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's|\\\\|/|g' -e 's| \$[[a-zA-Z]]\$:| /\\1|g' -e 's|^ ||'` ;; cygwin*) # Convert to unix form, then to dos form, then back to unix form @@ -2622,7 +2647,7 @@ ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib' dynamic_linker='Win32 ld.exe' ;; @@ -2636,11 +2661,11 @@ version_type=darwin need_lib_prefix=no need_version=no - library_names_spec='$libname$release$major$shared_ext $libname$shared_ext' + library_names_spec='$libname$release$versuffix$shared_ext $libname$release$major$shared_ext $libname$shared_ext' soname_spec='$libname$release$major$shared_ext' shlibpath_overrides_runpath=yes shlibpath_var=DYLD_LIBRARY_PATH - shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' + shrext_cmds='`test .$module = .yes && echo .bundle || echo .dylib`' m4_if([$1], [],[ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' @@ -2655,7 +2680,7 @@ shlibpath_var=LD_LIBRARY_PATH ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) # DragonFly does not have aout. When/if they implement a new # versioning mechanism, adjust this. if test -x /usr/bin/objformat; then @@ -3467,7 +3492,7 @@ bsdi[[45]]*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)' - lt_cv_file_magic_cmd='/usr/bin/file -L' + lt_cv_file_magic_cmd='$FILECMD -L' lt_cv_file_magic_test_file=/shlib/libc.so ;; @@ -3501,14 +3526,14 @@ lt_cv_deplibs_check_method=pass_all ;; -freebsd* | dragonfly*) +freebsd* | dragonfly* | midnightbsd*) if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then case $host_cpu in i*86 ) # Not sure whether the presence of OpenBSD here was a mistake. # Let's accept both of them until this is cleared up. lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ;; esac @@ -3522,7 +3547,7 @@ ;; hpux10.20* | hpux11*) - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD case $host_cpu in ia64*) lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' @@ -3569,7 +3594,7 @@ newos6*) lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' - lt_cv_file_magic_cmd=/usr/bin/file + lt_cv_file_magic_cmd=$FILECMD lt_cv_file_magic_test_file=/usr/lib/libnls.so ;; @@ -3696,13 +3721,13 @@ mingw*) lt_bad_file=conftest.nm/nofile ;; *) lt_bad_file=/dev/null ;; esac - case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in + case `"$tmp_nm" -B $lt_bad_file 2>&1 | $SED '1q'` in *$lt_bad_file* | *'Invalid file or object type'*) lt_cv_path_NM="$tmp_nm -B" break 2 ;; *) - case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in + case `"$tmp_nm" -p /dev/null 2>&1 | $SED '1q'` in */dev/null*) lt_cv_path_NM="$tmp_nm -p" break 2 @@ -3728,7 +3753,7 @@ # Let the user override the test. else AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :) - case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in + case `$DUMPBIN -symbols -headers /dev/null 2>&1 | $SED '1q'` in *COFF*) DUMPBIN="$DUMPBIN -symbols -headers" ;; @@ -3968,7 +3993,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Gets list of data symbols to import. - lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* $.*$$/\1/p'" + lt_cv_sys_global_symbol_to_import="$SED -n -e 's/^I .* $.*$$/\1/p'" # Adjust the below global symbol transforms to fixup imported variables. lt_cdecl_hook=" -e 's/^I .* $.*$$/extern __declspec(dllimport) char \1;/p'" lt_c_name_hook=" -e 's/^I .* $.*$$/ {\"\1\", (void *) 0},/p'" @@ -3986,20 +4011,20 @@ # Transform an extracted symbol line into a proper C declaration. # Some systems (esp. on ia64) link data and code symbols differently, # so use this general approach. -lt_cv_sys_global_symbol_to_cdecl="sed -n"\ +lt_cv_sys_global_symbol_to_cdecl="$SED -n"\ $lt_cdecl_hook\ " -e 's/^T .* $.*$$/extern int \1();/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/extern char \1;/p'" # Transform an extracted symbol line into symbol name and symbol address -lt_cv_sys_global_symbol_to_c_name_address="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address="$SED -n"\ $lt_c_name_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $.*$$/ {\"\1\", (void *) \&\1},/p'" # Transform an extracted symbol line into symbol name with lib prefix and # symbol address. -lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\ +lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="$SED -n"\ $lt_c_name_lib_hook\ " -e 's/^: $.*$ .*$/ {\"\1\", (void *) 0},/p'"\ " -e 's/^$symcode$symcode* .* $lib.*$$/ {\"\1\", (void *) \&\1},/p'"\ @@ -4023,7 +4048,7 @@ if test "$lt_cv_nm_interface" = "MS dumpbin"; then # Fake it for dumpbin and say T for any non-static function, # D for any global variable and I for any imported variable. - # Also find C++ and __fastcall symbols from MSVC++, + # Also find C++ and __fastcall symbols from MSVC++ or ICC, # which start with @ or ?. lt_cv_sys_global_symbol_pipe="$AWK ['"\ " {last_section=section; section=\$ 3};"\ @@ -4041,9 +4066,9 @@ " s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\ " ' prfx=^$ac_symprfx]" else - lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" + lt_cv_sys_global_symbol_pipe="$SED -n -e 's/^.*[[ ]]$$symcode$symcode*$[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" fi - lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'" + lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | $SED '/ __gnu_lto/d'" # Check to see that the pipe works correctly. pipe_works=no @@ -4330,7 +4355,7 @@ ;; esac ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD uses GNU C++ ;; hpux9* | hpux10* | hpux11*) @@ -4413,7 +4438,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4749,7 +4774,7 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*) # Sun Fortran 8.3 passes all unrecognized flags to the linker _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' @@ -4932,7 +4957,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi ;; pw32*) @@ -4940,7 +4965,7 @@ ;; cygwin* | mingw* | cegcc*) case $cc_basename in - cl*) + cl* | icl*) _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*' ;; *) @@ -4997,15 +5022,15 @@ case $host_os in cygwin* | mingw* | pw32* | cegcc*) - # FIXME: the MSVC++ port hasn't been tested in a loooong time + # FIXME: the MSVC++ and ICC port hasn't been tested in a loooong time # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. if test yes != "$GCC"; then with_gnu_ld=no fi ;; interix*) - # we just hope/assume this is gcc and not c89 (= MSVC++) + # we just hope/assume this is gcc and not c89 (= MSVC++ or ICC) with_gnu_ld=yes ;; openbsd* | bitrig*) @@ -5057,7 +5082,7 @@ _LT_TAGVAR(whole_archive_flag_spec, $1)= fi supports_anon_versioning=no - case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in + case `$LD -v | $SED -e 's/([[^)]]\+)\s\+//' 2>&1` in *GNU\ gold*) supports_anon_versioning=yes ;; *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... @@ -5169,6 +5194,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; interix[[3-9]]*) @@ -5183,7 +5209,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu) @@ -5226,7 +5252,7 @@ _LT_TAGVAR(compiler_needs_object, $1)=yes ;; esac - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C 5.9 _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive' _LT_TAGVAR(compiler_needs_object, $1)=yes @@ -5238,7 +5264,7 @@ if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi @@ -5254,7 +5280,7 @@ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' fi @@ -5386,7 +5412,7 @@ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols' else - _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' + _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B$[[^B]]*$$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols' fi aix_use_runtimelinking=no @@ -5569,12 +5595,12 @@ cygwin* | mingw* | pw32* | cegcc*) # When not using gcc, we currently assume that we are using - # Microsoft Visual C++. + # Microsoft Visual C++ or Intel C++ Compiler. # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. case $cc_basename in - cl*) - # Native MSVC + cl* | icl*) + # Native MSVC or ICC _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported _LT_TAGVAR(always_export_symbols, $1)=yes @@ -5615,7 +5641,7 @@ fi' ;; *) - # Assume MSVC wrapper + # Assume MSVC and ICC wrapper _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' _LT_TAGVAR(allow_undefined_flag, $1)=unsupported # Tell ltmain to make .lib files, not .a files. @@ -5663,7 +5689,7 @@ ;; # FreeBSD 3 and greater uses gcc -shared to do shared libraries. - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' _LT_TAGVAR(hardcode_direct, $1)=yes @@ -5874,6 +5900,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; osf3*) @@ -6644,8 +6671,8 @@ cygwin* | mingw* | pw32* | cegcc*) case $GXX,$cc_basename in - ,cl* | no,cl*) - # Native MSVC + ,cl* | no,cl* | ,icl* | no,icl*) + # Native MSVC or ICC # hardcode_libdir_flag_spec is actually meaningless, as there is # no search path for DLLs. _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' @@ -6743,6 +6770,7 @@ emximp -o $lib $output_objdir/$libname.def' _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def' _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes + _LT_TAGVAR(file_list_spec, $1)='@' ;; dgux*) @@ -6773,7 +6801,7 @@ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; - freebsd* | dragonfly*) + freebsd* | dragonfly* | midnightbsd*) # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF # conventions _LT_TAGVAR(ld_shlibs, $1)=yes @@ -6910,7 +6938,7 @@ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link # time. Moving up from 0x10000000 also allows more sbrk(2) space. _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' - _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' + _LT_TAGVAR(archive_expsym_cmds, $1)='$SED "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ;; irix5* | irix6*) case $cc_basename in @@ -7050,13 +7078,13 @@ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib' if test yes = "$supports_anon_versioning"; then _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ - cat $export_symbols | sed -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ + cat $export_symbols | $SED -e "s/$.*$/\1;/" >> $output_objdir/$libname.ver~ echo "local: *; };" >> $output_objdir/$libname.ver~ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib' fi ;; *) - case `$CC -V 2>&1 | sed 5q` in + case `$CC -V 2>&1 | $SED 5q` in *Sun\ C*) # Sun C++ 5.9 _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' @@ -8202,6 +8230,14 @@ AC_SUBST([DLLTOOL]) ]) +# _LT_DECL_FILECMD +# ---------------- +# Check for a file(cmd) program that can be used to detect file type and magic +m4_defun([_LT_DECL_FILECMD], +[AC_CHECK_TOOL([FILECMD], [file], [:]) +_LT_DECL([], [FILECMD], [1], [A file(cmd) program that detects file types]) +])# _LD_DECL_FILECMD + # _LT_DECL_SED # ------------ # Check for a fully-functional sed program, that truncates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/m4/ltoptions.m4 new/brial-1.2.11/m4/ltoptions.m4 --- old/brial-1.2.10/m4/ltoptions.m4 2017-10-14 02:41:26.000000000 +0200 +++ new/brial-1.2.11/m4/ltoptions.m4 2022-06-14 13:28:37.000000000 +0200 @@ -1,7 +1,7 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007-2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/m4/ltsugar.m4 new/brial-1.2.11/m4/ltsugar.m4 --- old/brial-1.2.10/m4/ltsugar.m4 2017-10-14 02:41:26.000000000 +0200 +++ new/brial-1.2.11/m4/ltsugar.m4 2022-06-14 13:28:37.000000000 +0200 @@ -1,6 +1,6 @@ # ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software +# Copyright (C) 2004-2005, 2007-2008, 2011-2019, 2021-2022 Free Software # Foundation, Inc. # Written by Gary V. Vaughan, 2004 # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/m4/ltversion.m4 new/brial-1.2.11/m4/ltversion.m4 --- old/brial-1.2.10/m4/ltversion.m4 2017-10-14 02:41:26.000000000 +0200 +++ new/brial-1.2.11/m4/ltversion.m4 2022-06-14 13:28:37.000000000 +0200 @@ -1,6 +1,7 @@ # ltversion.m4 -- version numbers -*- Autoconf -*- # -# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc. +# Copyright (C) 2004, 2011-2019, 2021-2022 Free Software Foundation, +# Inc. # Written by Scott James Remnant, 2004 # # This file is free software; the Free Software Foundation gives @@ -9,15 +10,15 @@ # @configure_input@ -# serial 4179 ltversion.m4 +# serial 4245 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.4.6]) -m4_define([LT_PACKAGE_REVISION], [2.4.6]) +m4_define([LT_PACKAGE_VERSION], [2.4.7]) +m4_define([LT_PACKAGE_REVISION], [2.4.7]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.4.6' -macro_revision='2.4.6' +[macro_version='2.4.7' +macro_revision='2.4.7' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/m4/lt~obsolete.m4 new/brial-1.2.11/m4/lt~obsolete.m4 --- old/brial-1.2.10/m4/lt~obsolete.m4 2017-10-14 02:41:26.000000000 +0200 +++ new/brial-1.2.11/m4/lt~obsolete.m4 2022-06-14 13:28:37.000000000 +0200 @@ -1,7 +1,7 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software -# Foundation, Inc. +# Copyright (C) 2004-2005, 2007, 2009, 2011-2019, 2021-2022 Free +# Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/missing new/brial-1.2.11/missing --- old/brial-1.2.10/missing 2017-10-14 02:41:30.000000000 +0200 +++ new/brial-1.2.11/missing 2022-07-26 12:14:10.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 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 @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/brial-1.2.10/test-driver new/brial-1.2.11/test-driver --- old/brial-1.2.10/test-driver 2019-06-06 00:20:11.000000000 +0200 +++ new/brial-1.2.11/test-driver 2022-07-26 12:14:10.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2016-01-11.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2017 Free Software Foundation, Inc. +# Copyright (C) 2011-2021 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -42,11 +42,13 @@ { cat <<END Usage: - test-driver --test-name=NAME --log-file=PATH --trs-file=PATH - [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] + test-driver --test-name NAME --log-file PATH --trs-file PATH + [--expect-failure {yes|no}] [--color-tests {yes|no}] + [--enable-hard-errors {yes|no}] [--] TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] + The '--test-name', '--log-file' and '--trs-file' options are mandatory. +See the GNU Automake documentation for information. END } @@ -103,8 +105,11 @@ trap "st=141; $do_exit" 13 trap "st=143; $do_exit" 15 -# Test script is run here. -"$@" >$log_file 2>&1 +# Test script is run here. We create the file first, then append to it, +# to ameliorate tests themselves also writing to the log file. Our tests +# don't, but others can (automake bug#35762). +: >"$log_file" +"$@" >>"$log_file" 2>&1 estatus=$? if test $enable_hard_errors = no && test $estatus -eq 99; then @@ -126,7 +131,7 @@ # know whether the test passed or failed simply by looking at the '.log' # file, without the need of also peaking into the corresponding '.trs' # file (automake bug#11814). -echo "$res $test_name (exit status: $estatus)" >>$log_file +echo "$res $test_name (exit status: $estatus)" >>"$log_file" # Report outcome to console. echo "${col}${res}${std}: $test_name" @@ -140,7 +145,7 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" # time-stamp-time-zone: "UTC0"

1 0

commit osc for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package osc for openSUSE:Factory checked in at 2022-07-29 16:48:20 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/osc (Old) and /work/SRC/openSUSE:Factory/.osc.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "osc" Fri Jul 29 16:48:20 2022 rev:164 rq:991675 version:0.181.0 Changes: -------- --- /work/SRC/openSUSE:Factory/osc/osc.changes 2022-06-25 10:24:51.170724349 +0200 +++ /work/SRC/openSUSE:Factory/.osc.new.1533/osc.changes 2022-07-29 16:48:25.962741777 +0200 @@ -1,0 +2,16 @@ +Tue Jul 26 19:37:46 UTC 2022 - Daniel Mach <daniel.mach(a)suse.com> + +- 0.181.0 + - fix crash when 'pass' is not set in the config file + - add missing attributes to Package when scm_url is set + - fix failure to create config in current dir + - update list of considered file names for ssh key autodetection + - allow users to prefer ssh key over password auth + - ssh: recognize gpg keys (yubikey usage) + - fix operating on _project meta + - revert "interpretation of string literals in messages" that broke unicode handling + - fix product build rpm caching + - enable md5 revisions in osc log + - parseRevisionOption(): raise an exception on invalid revisions + +------------------------------------------------------------------- Old: ---- osc-0.180.0.tar.gz New: ---- osc-0.181.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ osc.spec ++++++ --- /var/tmp/diff_new_pack.d2ztT7/_old 2022-07-29 16:48:26.782744057 +0200 +++ /var/tmp/diff_new_pack.d2ztT7/_new 2022-07-29 16:48:26.786744068 +0200 @@ -27,7 +27,7 @@ %define use_python python %endif -%define version_unconverted 0.180.0 +%define version_unconverted 0.181.0 %define osc_plugin_dir %{_prefix}/lib/osc-plugins %define macros_file macros.osc %if ! %{defined _rpmmacrodir} @@ -35,7 +35,7 @@ %endif Name: osc -Version: 0.180.0 +Version: 0.181.0 Release: 0 Summary: Open Build Service Commander License: GPL-2.0-or-later ++++++ PKGBUILD ++++++ --- /var/tmp/diff_new_pack.d2ztT7/_old 2022-07-29 16:48:26.826744180 +0200 +++ /var/tmp/diff_new_pack.d2ztT7/_new 2022-07-29 16:48:26.830744191 +0200 @@ -1,5 +1,5 @@ pkgname=osc -pkgver=0.180.0 +pkgver=0.181.0 pkgrel=0 pkgdesc="Open Build Service client" arch=('x86_64') ++++++ _service ++++++ --- /var/tmp/diff_new_pack.d2ztT7/_old 2022-07-29 16:48:26.850744247 +0200 +++ /var/tmp/diff_new_pack.d2ztT7/_new 2022-07-29 16:48:26.866744291 +0200 @@ -1,7 +1,7 @@ <services> <service name="tar_scm" mode="disabled"> - <param name="version">0.180.0</param> - <param name="revision">0.180.0</param> + <param name="version">0.181.0</param> + <param name="revision">0.181.0</param> <param name="url">https://github.com/openSUSE/osc.git</param> <param name="scm">git</param> </service> ++++++ debian.changelog ++++++ --- /var/tmp/diff_new_pack.d2ztT7/_old 2022-07-29 16:48:26.906744402 +0200 +++ /var/tmp/diff_new_pack.d2ztT7/_new 2022-07-29 16:48:26.910744413 +0200 @@ -1,4 +1,4 @@ -osc (0.180.0-0) unstable; urgency=low +osc (0.181.0-0) unstable; urgency=low - Update to 0.174.0: - fix password deletion via "osc config -d <apiurl> pass" - support changing the password store via "osc config <apiurl> ++++++ osc-0.180.0.tar.gz -> osc-0.181.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/NEWS new/osc-0.181.0/NEWS --- old/osc-0.180.0/NEWS 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/NEWS 2022-07-26 21:34:07.000000000 +0200 @@ -1,3 +1,16 @@ +0.181.0 + - fix crash when 'pass' is not set in the config file + - add missing attributes to Package when scm_url is set + - fix failure to create config in current dir + - update list of considered file names for ssh key autodetection + - allow users to prefer ssh key over password auth + - ssh: recognize gpg keys (yubikey usage) + - fix operating on _project meta + - revert "interpretation of string literals in messages" that broke unicode handling + - fix product build rpm caching + - enable md5 revisions in osc log + - parseRevisionOption(): raise an exception on invalid revisions + 0.180.0 - warn when trying to commit a prj/pac managed in scm - fix crash on "osc up" for git based package/projects diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/build.py new/osc-0.181.0/osc/build.py --- old/osc-0.180.0/osc/build.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/build.py 2022-07-26 21:34:07.000000000 +0200 @@ -293,7 +293,7 @@ def makeurls(self, cachedir, urllist): - self.localdir = '%s/%s/%s/%s' % (cachedir, self.project, self.repository, self.arch) + self.localdir = '%s/%s/%s/%s' % (cachedir, self.project, self.repository, self.repoarch) self.fullfilename = os.path.join(self.localdir, self.canonname) self.urllist = [url % self.mp for url in urllist] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/commandline.py new/osc-0.181.0/osc/commandline.py --- old/osc-0.180.0/osc/commandline.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/commandline.py 2022-07-26 21:34:07.000000000 +0200 @@ -983,10 +983,6 @@ # If project or package arguments missing, assume to work # with project and/or package in current local directory. attributepath = [] - - if opts.message: - opts.message = str(opts.message.encode().decode('unicode_escape')) - if cmd in ['prj', 'prjconf']: if len(args) < 1: apiurl = store_read_apiurl(os.curdir) @@ -1291,7 +1287,7 @@ src_update = "noupdate" if opts.message: - opts.message = str(opts.message.encode().decode('unicode_escape')) + pass elif opts.file: if opts.file == '-': opts.message = sys.stdin.read() @@ -1962,8 +1958,6 @@ if not opts.message: opts.message = edit_message() - else: - opts.message = str(opts.message.encode().decode('unicode_escape')) xml = """<request> %s <state name="new"/> <description>%s</description> </request> """ % \ (actionsxml, _html_escape(opts.message or "")) @@ -2041,8 +2035,6 @@ raise oscerr.WrongOptions('invalid \'--role\': either specify \'maintainer\' or \'bugowner\'') if not opts.message: opts.message = edit_message() - else: - opts.message = str(opts.message.encode().decode('unicode_escape')) r = Request() if user.startswith('group:'): @@ -2121,8 +2113,6 @@ footer = textwrap.TextWrapper(width = 66).fill( 'please explain why you like to delete project %s' % project) opts.message = edit_message(footer) - else: - opts.message = str(opts.message.encode().decode('unicode_escape')) r = Request() r.add_action('delete', tgt_project=project, tgt_package=package, tgt_repository=repository) @@ -2170,8 +2160,6 @@ 'please explain why you like to change the devel project of %s/%s to %s/%s' % (project, package, devel_project, devel_package)) opts.message = edit_message(footer) - else: - opts.message = str(opts.message.encode().decode('unicode_escape')) r = Request() r.add_action('change_devel', src_project=devel_project, src_package=devel_package, @@ -2341,9 +2329,6 @@ if opts.incoming: conf.config['include_request_from_project'] = False - if opts.message: - opts.message = str(opts.message.encode().decode('unicode_escape')) - if args[0] == 'help': return self.do_help(['help', 'request']) @@ -2895,8 +2880,7 @@ raise oscerr.WrongArgs('Too many arguments (required none or two)') else: raise oscerr.WrongArgs('Too few arguments (required none or two)') - if opts.message: - opts.message = str(opts.message.encode().decode('unicode_escape')) + try: copy_pac(apiurl, project, package, apiurl, project, package, expand=True, comment=opts.message) except HTTPError as e: @@ -3108,7 +3092,7 @@ rev, dummy = parseRevisionOption(opts.revision) if opts.message: - comment = str(opts.message.encode().decode('unicode_escape')) + comment = opts.message else: if not rev: rev = show_upstream_rev(src_apiurl, src_project, src_package) @@ -3255,8 +3239,6 @@ if not opts.message: opts.message = edit_message() - else: - opts.message = str(opts.message.encode().decode('unicode_escape')) if 'kind' in root.attrib and root.attrib['kind'] == 'maintenance_incident': r = create_release_request(apiurl, source_project, opts.message) @@ -3300,8 +3282,6 @@ maintenance_attribute = conf.config['maintenance_attribute'] if opts.attribute: maintenance_attribute = opts.attribute - if opts.message: - opts.message = str(opts.message.encode().decode('unicode_escape')) source_project = target_project = None @@ -3440,8 +3420,6 @@ if not opts.message: opts.message = edit_message() - else: - opts.message = str(opts.message.encode().decode('unicode_escape')) supersede_existing = False reqs = [] @@ -3665,9 +3643,6 @@ if len(args) >= 4: tpackage = args[3] - if opts.message: - opts.message = str(opts.message.encode().decode('unicode_escape')) - try: exists, targetprj, targetpkg, srcprj, srcpkg = \ branch_pkg(apiurl, args[0], args[1], @@ -3761,7 +3736,7 @@ msg = '' if opts.message: - msg = str(opts.message.encode().decode('unicode_escape')) + msg = opts.message else: msg = edit_message() @@ -3808,7 +3783,7 @@ msg = '' if opts.message: - msg = str(opts.message.encode().decode('unicode_escape')) + msg = opts.message else: msg = edit_message() @@ -3854,8 +3829,6 @@ ${cmd_option_list} """ apiurl = self.get_api_url() - if opts.message: - opts.message = str(opts.message.encode().decode('unicode_escape')) kind = 'prj' path_args = (project,) if package is not None: @@ -3896,7 +3869,7 @@ msg = '' if opts.message: - msg = str(opts.message.encode().decode('unicode_escape')) + msg = opts.message else: msg = edit_message() @@ -5003,7 +4976,7 @@ msg = '' if opts.message: - msg = str(opts.message.encode().decode('unicode_escape')) + msg = opts.message elif opts.file: if opts.file == '-': msg = sys.stdin.read() @@ -7120,7 +7093,7 @@ project = args[0] package = args[1] - rev, rev_upper = parseRevisionOption(opts.revision, allow_md5=False) + rev, rev_upper = parseRevisionOption(opts.revision) if rev and not checkRevision(project, package, rev, apiurl, opts.meta): print('Revision \'%s\' does not exist' % rev, file=sys.stderr) sys.exit(1) @@ -8538,7 +8511,7 @@ if requestactionsxml != "": if opts.message: - message = str(opts.message.encode().decode('unicode_escape')) + message = opts.message else: message = edit_message() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/conf.py new/osc-0.181.0/osc/conf.py --- old/osc-0.180.0/osc/conf.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/conf.py 2022-07-26 21:34:07.000000000 +0200 @@ -540,14 +540,26 @@ for authreq in headers.get_all('www-authenticate', []): scheme = authreq.split()[0].lower() authreqs[scheme] = authreq - if 'signature' in authreqs and self.signatureauthhandler and \ - (self.signatureauthhandler.sshkey_known() or 'basic' not in authreqs): + + if 'signature' in authreqs \ + and self.signatureauthhandler \ + and ( + # sshkey explicitly set in the config file, use it instead of doing basic auth + self.signatureauthhandler.sshkey_known() + or ( + # can't fall-back to basic auth, because server doesn't support it + 'basic' not in authreqs + # can't fall-back to basic auth, because there's no password provided + or not self.passwd.find_user_password(None, apiurl)[1] + )): del headers['www-authenticate'] headers['www-authenticate'] = authreqs['signature'] return self.signatureauthhandler.http_error_401(req, fp, code, msg, headers) + if 'basic' in authreqs: del headers['www-authenticate'] headers['www-authenticate'] = authreqs['basic'] + response = super(self.__class__, self).http_error_401(req, fp, code, msg, headers) # workaround for http://bugs.python.org/issue9639 if hasattr(self, 'retried'): @@ -565,7 +577,7 @@ proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, _ = proc.communicate() if proc.returncode == 0 and stdout.strip(): - return stdout.splitlines() + return [self.get_fingerprint(line) for line in stdout.splitlines()] else: return [] @@ -584,21 +596,43 @@ return True return False + def is_ssh_public_keyfile(self, keyfile_path): + if not os.path.isfile(keyfile_path): + return False + return keyfile_path.endswith(".pub") + + @staticmethod + def get_fingerprint(line): + parts = line.strip().split(b" ") + if len(parts) < 2: + raise ValueError("Unable to retrieve ssh key fingerprint from line: {}".format(line)) + return parts[1] + def list_ssh_dir_keys(self): sshdir = os.path.expanduser('~/.ssh') keys_in_home_ssh = {} for keyfile in os.listdir(sshdir): - if keyfile.endswith(".pub"): + if keyfile.startswith(("agent-", "authorized_keys", "config", "known_hosts")): + # skip files that definitely don't contain keys continue + keyfile_path = os.path.join(sshdir, keyfile) - if not self.is_ssh_private_keyfile(keyfile_path): + # public key alone may be sufficient because the private key + # can get loaded into ssh-agent from gpg (yubikey works this way) + is_public = self.is_ssh_public_keyfile(keyfile_path) + # skip private detection if we think the key is a public one already + is_private = False if is_public else self.is_ssh_private_keyfile(keyfile_path) + + if not is_public and not is_private: continue + cmd = ["ssh-keygen", "-lf", keyfile_path] proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) stdout, _ = proc.communicate() if proc.returncode == 0: - fingerprint = stdout.strip() - if fingerprint: + fingerprint = self.get_fingerprint(stdout) + if fingerprint and (fingerprint not in keys_in_home_ssh or is_private): + # prefer path to a private key keys_in_home_ssh[fingerprint] = keyfile_path return keys_in_home_ssh @@ -610,7 +644,7 @@ if fingerprint in keys_in_home_ssh: return keys_in_home_ssh[fingerprint] sshdir = os.path.expanduser('~/.ssh') - keyfiles = ('id_ed25519', 'id_rsa') + keyfiles = ('id_ed25519', 'id_ed25519_sk', 'id_rsa', 'id_ecdsa', 'id_ecdsa_sk', 'id_dsa') for keyfile in keyfiles: keyfile_path = os.path.join(sshdir, keyfile) if os.path.isfile(keyfile_path): @@ -827,9 +861,10 @@ fname = os.readlink(fname) # create directories to the config file (if they don't exist already) - if not os.path.exists(os.path.dirname(fname)): + fdir = os.path.dirname(fname) + if fdir: try: - os.makedirs(os.path.dirname(fname), mode=0o700) + os.makedirs(fdir, mode=0o700) except OSError as e: if e.errno != errno.EEXIST: raise diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/core.py new/osc-0.181.0/osc/core.py --- old/osc-0.180.0/osc/core.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/core.py 2022-07-26 21:34:07.000000000 +0200 @@ -7,7 +7,7 @@ from .util import git_version -__version__ = git_version.get_version('0.180.0') +__version__ = git_version.get_version('0.181.0') # __store_version__ is to be incremented when the format of the working copy @@ -1800,6 +1800,10 @@ self.srcmd5 = None self.linkinfo = None self.serviceinfo = None + self.size_limit = None + self.meta = None + self.excluded = [] + self.filenamelist_unvers = [] return files_tree = read_filemeta(self.dir) @@ -3612,10 +3616,6 @@ query['view'] = "blame" query['meta'] = 1 - # The fake packages _project has no _meta file - if pac.startswith('_project'): - return "" - url = makeurl(apiurl, ['source', prj, pac, '_meta'], query) try: f = http_GET(url) @@ -6851,12 +6851,15 @@ revisions = [None, None] if string: parts = string.split(':') - for i, revision in enumerate(parts[0:2], 0): + + if len(parts) > 2: + raise oscerr.OscInvalidRevision(string) + + for i, revision in enumerate(parts, 0): if revision.isdigit() or (allow_md5 and revision.isalnum() and len(revision) == 32): revisions[i] = revision elif revision != '' and revision != 'latest': - print('your revision \'%s\' will be ignored' % string, file=sys.stderr) - return None, None + raise oscerr.OscInvalidRevision(string) return tuple(revisions) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/credentials.py new/osc-0.181.0/osc/credentials.py --- old/osc-0.180.0/osc/credentials.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/credentials.py 2022-07-26 21:34:07.000000000 +0200 @@ -166,6 +166,9 @@ @classmethod def decode_password(cls, password): + if password is None: + # avoid crash on encoding None when 'pass' is not specified in the config + return None compressed_pw = base64.b64decode(password.encode("ascii")) return bz2.decompress(compressed_pw).decode("ascii") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/fetch.py new/osc-0.181.0/osc/fetch.py --- old/osc-0.180.0/osc/fetch.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/fetch.py 2022-07-26 21:34:07.000000000 +0200 @@ -265,8 +265,8 @@ if not hdrmd5 or hdrmd5 != i.hdrmd5: print('%s/%s: attempting download from api, since the hdrmd5 did not match - %s != %s' % (i.project, i.name, hdrmd5, i.hdrmd5)) - os.unlink(i.fullfilename) - self.__add_cpio(i) + os.unlink(i.fullfilename) + self.__add_cpio(i) except KeyboardInterrupt: print('Cancelled by user (ctrl-c)') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/oscerr.py new/osc-0.181.0/osc/oscerr.py --- old/osc-0.180.0/osc/oscerr.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/oscerr.py 2022-07-26 21:34:07.000000000 +0200 @@ -121,6 +121,22 @@ self.e = e self.msg = msg + +class OscValueError(OscBaseError): + """ + Invalid argument value (of correct type). + """ + pass + + +class OscInvalidRevision(OscValueError): + """ + Invalid revision value. + """ + def __str__(self): + return "Invalid revision value: {}".format("".join(self.args)) + + class PackageNotInstalled(OscBaseError): """ Exception raised when a package is not installed on local system diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/osc/util/git_version.py new/osc-0.181.0/osc/util/git_version.py --- old/osc-0.180.0/osc/util/git_version.py 2022-06-24 15:23:26.000000000 +0200 +++ new/osc-0.181.0/osc/util/git_version.py 2022-07-26 21:34:07.000000000 +0200 @@ -10,8 +10,9 @@ # the `version` variable contents get substituted during `git archive` # it requires adding this to .gitattributes: <path to this file> export-subst version = "$Format:%(describe:tags=true)$" - if version.startswith("$"): - # version hasn't been substituted during `git archive` + if version.startswith(("$", "%")): + # "$": version hasn't been substituted during `git archive` + # "%": "Format:" and "$" characters get removed from the version string (a GitHub bug?) return None return version diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/osc-0.180.0/tests/test_core.py new/osc-0.181.0/tests/test_core.py --- old/osc-0.180.0/tests/test_core.py 1970-01-01 01:00:00.000000000 +0100 +++ new/osc-0.181.0/tests/test_core.py 2022-07-26 21:34:07.000000000 +0200 @@ -0,0 +1,52 @@ +from osc.core import parseRevisionOption +from osc.oscerr import OscInvalidRevision + +import unittest + + +class TestParseRevisionOption(unittest.TestCase): + def test_empty(self): + expected = None, None + actual = parseRevisionOption("") + self.assertEqual(expected, actual) + + def test_colon(self): + expected = None, None + actual = parseRevisionOption(":") + # your revision ':' will be ignored + self.assertEqual(expected, actual) + + def test_invalid_multiple_colons(self): + self.assertRaises(OscInvalidRevision, parseRevisionOption, ":::::") + + def test_one_number(self): + expected = ("1", None) + actual = parseRevisionOption("1") + self.assertEqual(expected, actual) + + def test_two_numbers(self): + expected = ("1", "2") + actual = parseRevisionOption("1:2") + self.assertEqual(expected, actual) + + def test_invalid_multiple_numbers(self): + self.assertRaises(OscInvalidRevision, parseRevisionOption, "1:2:3:4:5") + + def test_one_hash(self): + expected = "c4ca4238a0b923820dcc509a6f75849b", None + actual = parseRevisionOption("c4ca4238a0b923820dcc509a6f75849b") + self.assertEqual(expected, actual) + + def test_two_hashes(self): + expected = ("d41d8cd98f00b204e9800998ecf8427e", "c4ca4238a0b923820dcc509a6f75849b") + actual = parseRevisionOption("d41d8cd98f00b204e9800998ecf8427e:c4ca4238a0b923820dcc509a6f75849b") + self.assertEqual(expected, actual) + + def test_invalid_multiple_hashes(self): + rev = "d41d8cd98f00b204e9800998ecf8427e:c4ca4238a0b923820dcc509a6f75849b:c81e728d9d4c2f636f067f89cc14862c" + self.assertRaises(OscInvalidRevision, parseRevisionOption, rev) + + +if __name__ == "__main__": + import unittest + unittest.main() ++++++ osc.dsc ++++++ --- /var/tmp/diff_new_pack.d2ztT7/_old 2022-07-29 16:48:27.302745503 +0200 +++ /var/tmp/diff_new_pack.d2ztT7/_new 2022-07-29 16:48:27.306745514 +0200 @@ -1,6 +1,6 @@ Format: 1.0 Source: osc -Version: 0.180.0-0 +Version: 0.181.0-0 Binary: osc Maintainer: Adrian Schroeter <adrian(a)suse.de> Architecture: any

1 0

commit kubic-coredns-image for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kubic-coredns-image for openSUSE:Factory checked in at 2022-07-29 16:48:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubic-coredns-image (Old) and /work/SRC/openSUSE:Factory/.kubic-coredns-image.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubic-coredns-image" Fri Jul 29 16:48:19 2022 rev:5 rq:991677 version:6.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kubic-coredns-image/kubic-coredns-image.changes 2021-06-09 21:51:28.150385665 +0200 +++ /work/SRC/openSUSE:Factory/.kubic-coredns-image.new.1533/kubic-coredns-image.changes 2022-07-29 16:48:24.646738118 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 06:50:05 UTC 2022 - Guillaume GARDET <guillaume.gardet(a)opensuse.org> + +- Exclude 32-bit Arm to match kubernetes set of architectures + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubic-coredns-image.kiwi ++++++ --- /var/tmp/diff_new_pack.eh4tS4/_old 2022-07-29 16:48:25.162739553 +0200 +++ /var/tmp/diff_new_pack.eh4tS4/_new 2022-07-29 16:48:25.162739553 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - + <!-- This is an autogenerated file from coredns-image.kiwi.ini template. Do not manually modify this file.

1 0

commit kubic-coredns-minus1-image for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kubic-coredns-minus1-image for openSUSE:Factory checked in at 2022-07-29 16:48:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kubic-coredns-minus1-image (Old) and /work/SRC/openSUSE:Factory/.kubic-coredns-minus1-image.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kubic-coredns-minus1-image" Fri Jul 29 16:48:18 2022 rev:3 rq:991676 version:1.0.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kubic-coredns-minus1-image/kubic-coredns-minus1-image.kiwi.changes 2021-06-09 21:51:28.790386806 +0200 +++ /work/SRC/openSUSE:Factory/.kubic-coredns-minus1-image.new.1533/kubic-coredns-minus1-image.kiwi.changes 2022-07-29 16:48:23.866735949 +0200 @@ -1,0 +2,5 @@ +Fri Jul 29 06:51:00 UTC 2022 - Guillaume GARDET <guillaume.gardet(a)opensuse.org> + +- Exclude 32-bit Arm to match kubernetes set of architectures + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kubic-coredns-minus1-image.kiwi ++++++ --- /var/tmp/diff_new_pack.U5UkEb/_old 2022-07-29 16:48:24.426737507 +0200 +++ /var/tmp/diff_new_pack.U5UkEb/_new 2022-07-29 16:48:24.430737517 +0200 @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> - + <!-- This is an autogenerated file from coredns-image.kiwi.ini template. Do not manually modify this file.

1 0

commit openSUSE-release-tools for openSUSE:Factory
by Source-Sync 29 Jul '22

29 Jul '22

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package openSUSE-release-tools for openSUSE:Factory checked in at 2022-07-29 16:48:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1533 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Fri Jul 29 16:48:17 2022 rev:447 rq:991671 version:20220729.5c03f149 Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2022-07-28 20:59:33.635723985 +0200 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.1533/openSUSE-release-tools.changes 2022-07-29 16:48:22.038730866 +0200 @@ -1,0 +2,6 @@ +Fri Jul 29 07:41:10 UTC 2022 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20220729.5c03f149: + * Enable Leap 15.5 rebuild-trigger + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20220728.5b31dfff.obscpio New: ---- openSUSE-release-tools-20220729.5c03f149.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.OliJ9A/_old 2022-07-29 16:48:22.778732924 +0200 +++ /var/tmp/diff_new_pack.OliJ9A/_new 2022-07-29 16:48:22.782732936 +0200 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20220728.5b31dfff +Version: 20220729.5c03f149 Release: 0 Summary: Tools to aid in staging and release work for openSUSE/SUSE License: GPL-2.0-or-later AND MIT ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.OliJ9A/_old 2022-07-29 16:48:22.842733102 +0200 +++ /var/tmp/diff_new_pack.OliJ9A/_new 2022-07-29 16:48:22.846733113 +0200 @@ -1,7 +1,7 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">7131167301416af81f3fbdbb3f0a2541ec11334b</param> + <param name="changesrevision">b183a06498ae9e90273c57c6d4c8420b56684ff5</param> </service> </servicedata> ++++++ openSUSE-release-tools-20220728.5b31dfff.obscpio -> openSUSE-release-tools-20220729.5c03f149.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20220728.5b31dfff/gocd/rebuild-trigger.gocd.yaml new/openSUSE-release-tools-20220729.5c03f149/gocd/rebuild-trigger.gocd.yaml --- old/openSUSE-release-tools-20220728.5b31dfff/gocd/rebuild-trigger.gocd.yaml 2022-07-28 13:13:05.000000000 +0200 +++ new/openSUSE-release-tools-20220729.5c03f149/gocd/rebuild-trigger.gocd.yaml 2022-07-29 09:39:36.000000000 +0200 @@ -173,3 +173,23 @@ ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15-SP1 echo "Step 15" ./project-installcheck.py --debug check --store home:repo-checker/rebuilds -r standard openSUSE:Step:15 + Trigger.Rebuild.Leap_15_5: + group: openSUSE.Checkers + lock_behavior: unlockWhenFinished + environment_variables: + OSC_CONFIG: /home/go/config/oscrc-factory-maintainer + materials: + script: + git: https://github.com/openSUSE/openSUSE-release-tools.git + timer: + spec: 0 0 * ? * * + only_on_changes: false + stages: + - Run: + approval: manual + resources: + - repo-checker + tasks: + - script: |- + echo "Leap 15.5" + ./project-installcheck.py --debug check --store openSUSE:Leap:15.5:Staging/dashboard --no-rebuild openSUSE:Leap:15.5 ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.OliJ9A/_old 2022-07-29 16:48:23.726735560 +0200 +++ /var/tmp/diff_new_pack.OliJ9A/_new 2022-07-29 16:48:23.730735571 +0200 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20220728.5b31dfff -mtime: 1659006785 -commit: 5b31dfffe1b23db4272ae2c5853d416f1d1a1aea +version: 20220729.5c03f149 +mtime: 1659080376 +commit: 5c03f1492a1682ca9de2a4024bb7e04533e2cda2

1 0