January 2021 - openSUSE Commits - openSUSE Mailing Lists

commit roundcubemail for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package roundcubemail for openSUSE:Factory checked in at 2021-01-30 13:56:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/roundcubemail (Old) and /work/SRC/openSUSE:Factory/.roundcubemail.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "roundcubemail" Sat Jan 30 13:56:40 2021 rev:70 rq:867791 version:1.4.10 Changes: -------- --- /work/SRC/openSUSE:Factory/roundcubemail/roundcubemail.changes 2020-12-28 13:56:16.569036966 +0100 +++ /work/SRC/openSUSE:Factory/.roundcubemail.new.28504/roundcubemail.changes 2021-01-30 13:57:45.978396946 +0100 @@ -1,0 +2,8 @@ +Fri Jan 22 17:46:59 UTC 2021 - Arjen de Korte <suse+build(a)de-korte.org> + +- add PHP version to Requires: and Recommends: to make sure the same + version is installed as used during packaging +- drop Requires: http_daemon (fixes boo#1180132) and Suggests: apache2 + (which is already required though mod_php_any) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ roundcubemail.spec ++++++ --- /var/tmp/diff_new_pack.wmvXVg/_old 2021-01-30 13:57:47.026398714 +0100 +++ /var/tmp/diff_new_pack.wmvXVg/_new 2021-01-30 13:57:47.026398714 +0100 @@ -1,7 +1,7 @@ # # spec file for package roundcubemail # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,7 +18,7 @@ %define roundcubepath %{apache_serverroot}/%{name} %define roundcubeconfigpath %{_sysconfdir}/%{name} -%define php_major_version %(php -r "echo PHP_MAJOR_VERSION;") +%define php_name %(php -r "print 'php' . PHP_MAJOR_VERSION;") Name: roundcubemail Version: 1.4.10 Release: 0 @@ -39,17 +39,17 @@ Patch0: %{name}-config_dir.patch BuildRequires: apache-rpm-macros BuildRequires: apache2 -BuildRequires: php -Requires: http_daemon -Requires: mod_php_any >= 5.4 -Requires: php-dom -Requires: php-exif -Requires: php-gettext -Requires: php-iconv -Requires: php-json -Requires: php-mbstring -Requires: php-openssl +BuildRequires: php-cli +Requires: %{php_name}-dom +Requires: %{php_name}-exif +Requires: %{php_name}-gettext +Requires: %{php_name}-iconv +Requires: %{php_name}-json +Requires: %{php_name}-mbstring +Requires: %{php_name}-openssl +Requires: apache2-mod_%{php_name} ## Requires: for upstream dep package +Requires: %{php_name}-sockets Requires: php-pear-Auth_SASL >= 1.0.6 Requires: php-pear-MDB2_Driver_mysqli Requires: php-pear-Mail_Mime >= 1.10.0 @@ -58,17 +58,14 @@ Requires: php-pear-Net_SMTP >= 1.8.1 Requires: php-pear-Net_Sieve >= 1.4.3 Requires: php-pear-Net_Socket >= 1.0.12 -Requires: php-session -Requires: php-sockets -Requires: php_any_db +Requires: (%{php_name}-mysql or %{php_name}-pgsql) Recommends: logrotate -Recommends: php-fileinfo -Recommends: php-intl -Recommends: php-imagick -Recommends: php-mysql +Recommends: %{php_name}-fileinfo +Recommends: %{php_name}-intl +Recommends: %{php_name}-imagick Recommends: php-pear-Crypt_GPG >= 1.6.3 -Recommends: php-zip -Suggests: apache2 +Recommends: %{php_name}-zip +Suggests: %{php_name}-mysql Conflicts: roundcube-framework Provides: roundcube_framework = %{version} BuildArch: noarch @@ -117,8 +114,11 @@ # remove INSTALL doc rm INSTALL # fix interpreter for shell scripts -sed -e 's|%{_bindir}/env php|%{_bindir}/php|' -i bin/*.sh -sed -e 's|%{_bindir}/env php|%{_bindir}/php|' -i vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh +sed -i 's|/usr/bin/env php|%{_bindir}/php|' \ + bin/*.sh \ + vendor/pear/crypt_gpg/scripts/crypt-gpg-pinentry \ + vendor/roundcube/plugin-installer/src/bin/rcubeinitdb.sh \ + plugins/enigma/bin/import_keys.sh %build @@ -128,8 +128,8 @@ install %{SOURCE5} %{buildroot}/%{_sysconfdir}/logrotate.d/%{name} # extract roundcube-framework -install -d -m 0755 %{buildroot}/%{_datadir}/php%{php_major_version} -mv program/lib/Roundcube %{buildroot}%{_datadir}/php%{php_major_version}/Roundcube +install -d -m 0755 %{buildroot}/%{_datadir}/%{php_name} +mv program/lib/Roundcube %{buildroot}%{_datadir}/%{php_name}/Roundcube # install roundcubemail install -d -m 0755 %{buildroot}/%{roundcubepath} @@ -250,7 +250,7 @@ # enable required apache modules %if 0%{?suse_version} > 01500 if ! grep -q php %{_sysconfdir}/sysconfig/apache2 1>&2 2>/dev/null; then - %{_sbindir}/a2enmod -q php7 || %{_sbindir}/a2enmod php7 + %{_sbindir}/a2enmod -q %{php_name} || %{_sbindir}/a2enmod %{php_name} fi %endif for module in alias brotli deflate expires filter headers rewrite setenvif version ; do @@ -353,8 +353,7 @@ %{roundcubepath}/SQL %{roundcubepath}/temp %{roundcubepath}/vendor/ -%dir %{_datadir}/php%{php_major_version} -%{_datadir}/php%{php_major_version}/Roundcube/ +%{_datadir}/%{php_name}/Roundcube %attr(-, wwwrun, root) %{_localstatedir}/log/%{name} %attr(-, wwwrun, root) %{_localstatedir}/lib/%{name}

1 0

commit python-rpcq for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-rpcq for openSUSE:Factory checked in at 2021-01-30 13:56:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-rpcq (Old) and /work/SRC/openSUSE:Factory/.python-rpcq.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-rpcq" Sat Jan 30 13:56:42 2021 rev:4 rq:867799 version:3.8.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-rpcq/python-rpcq.changes 2021-01-19 16:03:16.811478261 +0100 +++ /work/SRC/openSUSE:Factory/.python-rpcq.new.28504/python-rpcq.changes 2021-01-30 13:57:47.274399132 +0100 @@ -1,0 +2,6 @@ +Fri Jan 29 10:25:51 UTC 2021 - andy great <andythe_great(a)pm.me> + +- Update to version 3.8.0. + * No changelog given. + +------------------------------------------------------------------- Old: ---- rpcq-3.7.0.tar.gz New: ---- rpcq-3.8.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-rpcq.spec ++++++ --- /var/tmp/diff_new_pack.7lesOQ/_old 2021-01-30 13:57:47.846400096 +0100 +++ /var/tmp/diff_new_pack.7lesOQ/_new 2021-01-30 13:57:47.850400102 +0100 @@ -20,7 +20,7 @@ %define skip_python2 1 %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-rpcq -Version: 3.7.0 +Version: 3.8.0 Release: 0 Summary: The RPC framework and message specification for Rigetti QCS License: Apache-2.0 ++++++ rpcq-3.7.0.tar.gz -> rpcq-3.8.0.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpcq-3.7.0/VERSION.txt new/rpcq-3.8.0/VERSION.txt --- old/rpcq-3.7.0/VERSION.txt 2020-12-29 21:08:50.000000000 +0100 +++ new/rpcq-3.8.0/VERSION.txt 2021-01-28 20:39:23.000000000 +0100 @@ -1 +1 @@ -3.7.0 +3.8.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpcq-3.7.0/rpcq/core_messages.py new/rpcq-3.8.0/rpcq/core_messages.py --- old/rpcq-3.7.0/rpcq/core_messages.py 2020-12-29 21:08:50.000000000 +0100 +++ new/rpcq-3.8.0/rpcq/core_messages.py 2021-01-28 20:39:23.000000000 +0100 @@ -132,7 +132,7 @@ fwhm: Optional[float] = None """Full Width Half Max shape paramter in seconds""" - t0: float = None + t0: float = 0.0e+0 """Center time coordinate of the shape in seconds. Defaults to mid-point of pulse.""" anh: float = -2.1e+8 @@ -513,7 +513,7 @@ """ port: int - """The physical Tsunami MNIO port, indexed from 0, + """The physical Tsunami MNIO port, indexed from 0, where this connection originates.""" destination: str diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpcq-3.7.0/rpcq/messages.py new/rpcq-3.8.0/rpcq/messages.py --- old/rpcq-3.7.0/rpcq/messages.py 2020-12-29 21:08:50.000000000 +0100 +++ new/rpcq-3.8.0/rpcq/messages.py 2021-01-28 20:39:23.000000000 +0100 @@ -22,7 +22,7 @@ Specification of a dynamic parameter type and array-length. """ - type: str = None + type: str = "" """The parameter type, e.g., one of 'INTEGER', or 'FLOAT'.""" length: int = 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpcq-3.7.0/rpcq/test/test_spec.py new/rpcq-3.8.0/rpcq/test/test_spec.py --- old/rpcq-3.7.0/rpcq/test/test_spec.py 2020-12-29 21:08:50.000000000 +0100 +++ new/rpcq-3.8.0/rpcq/test/test_spec.py 2021-01-28 20:39:23.000000000 +0100 @@ -30,7 +30,7 @@ self.num = num async def add(self, *args): - asyncio.sleep(0.1) + await asyncio.sleep(0.1) return sum(args) + self.num def blocking_add(self, *args): diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpcq-3.7.0/src/core-messages.lisp new/rpcq-3.8.0/src/core-messages.lisp --- old/rpcq-3.7.0/src/core-messages.lisp 2020-12-29 21:08:50.000000000 +0100 +++ new/rpcq-3.8.0/src/core-messages.lisp 2021-01-28 20:39:23.000000000 +0100 @@ -158,7 +158,7 @@ :documentation "Center time coordinate of the shape in seconds. Defaults to mid-point of pulse." :type :float :required t - :default nil) + :default 0.0) (|anh| :documentation "Anharmonicity of the qubit, f01-f12 in Hz" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpcq-3.7.0/src/messages.lisp new/rpcq-3.8.0/src/messages.lisp --- old/rpcq-3.7.0/src/messages.lisp 2020-12-29 21:08:50.000000000 +0100 +++ new/rpcq-3.8.0/src/messages.lisp 2021-01-28 20:39:23.000000000 +0100 @@ -23,7 +23,7 @@ :documentation "The parameter type, e.g., one of 'INTEGER', or 'FLOAT'." :type :string :required t - :default nil) + :default "") (|length| :documentation "If this is not 1, the parameter is an array of this length." diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/rpcq-3.7.0/src/rpcq.lisp new/rpcq-3.8.0/src/rpcq.lisp --- old/rpcq-3.7.0/src/rpcq.lisp 2020-12-29 21:08:50.000000000 +0100 +++ new/rpcq-3.8.0/src/rpcq.lisp 2021-01-28 20:39:23.000000000 +0100 @@ -243,7 +243,6 @@ ;; accept a string as the default value for a bytes object (to-octets default) (coerce default basic-type))))) - (if required (values basic-type coerced-default) @@ -253,8 +252,8 @@ ;; handle defined message types ((symbolp field-type) (if required - (values `(or null ,field-type) default) - (values field-type default))) + (values field-type default) + (values `(or null ,field-type) default))) ;; handle lists ((eq ':list (car field-type))

1 0

commit crash for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package crash for openSUSE:Factory checked in at 2021-01-30 13:56:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/crash (Old) and /work/SRC/openSUSE:Factory/.crash.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "crash" Sat Jan 30 13:56:37 2021 rev:169 rq:867794 version:7.2.8 Changes: -------- --- /work/SRC/openSUSE:Factory/crash/crash.changes 2021-01-07 21:26:26.589792579 +0100 +++ /work/SRC/openSUSE:Factory/.crash.new.28504/crash.changes 2021-01-30 13:57:44.366394228 +0100 @@ -1,0 +2,6 @@ +Thu Jan 28 11:49:06 UTC 2021 - Jiri Bohac <jbohac(a)suse.com> + +- Added crash-xen-increase-__physical_mask_shift_xen-to-52.patch + (bsc#1177050) + +------------------------------------------------------------------- New: ---- crash-xen-increase-__physical_mask_shift_xen-to-52.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ crash.spec ++++++ --- /var/tmp/diff_new_pack.jAUKD7/_old 2021-01-30 13:57:45.578396272 +0100 +++ /var/tmp/diff_new_pack.jAUKD7/_new 2021-01-30 13:57:45.582396278 +0100 @@ -87,6 +87,8 @@ Patch32: %{name}-Fix-kmem-i-option-on-Linux-5.9-rc1-and-later-kernels.patch # PATCH-FIX-UPSTREAM - https://github.com/crash-utility/crash/commit/46cfe1f5aed3b1950df505d71553c… Patch33: %{name}-task.c-avoid-unnecessary-cpu-cycles-in-stkptr_to_tas.patch +# PATCH-FIX-UPSTREAM - https://github.com/crash-utility/crash/commit/fdb41f0b6fa42a692e5fa39da3801… +Patch34: %{name}-xen-increase-__physical_mask_shift_xen-to-52.patch Patch90: %{name}-sial-ps-2.6.29.diff # PATCH-FIX-UPSTREAM - https://github.com/crash-utility/crash/commit/e770735200c02ac2414c394ea6ec5… Patch91: %{name}-gdb-fix-aarch64.patch @@ -289,6 +291,7 @@ %patch31 -p1 %patch32 -p1 %patch33 -p1 +%patch34 -p1 %if %{have_snappy} %patch15 -p1 %endif ++++++ crash-xen-increase-__physical_mask_shift_xen-to-52.patch ++++++ From: Jiri Bohac <jbohac(a)suse.cz> Subject: xen: increase __PHYSICAL_MASK_SHIFT_XEN to 52 Git-commit: fdb41f0b6fa42a692e5fa39da3801f6ca18e8a6b References: bsc#1177050 Acked-by: Jiri Bohac <jbohac(a)suse.cz> The current value of __PHYSICAL_MASK_SHIFT_XEN in crash (40) is smaller than the kernel (52) since kernel commit 6f0e8bf167 (xen: support 52 bit physical addresses in pv guests). This can cause x86_64_pud_offset() to lose the most significant bits of pgd_pte, leading to a failed xen_m2p() translation, resulting in crash failing with an error message like this: crash: read error: physical address: ffffffffffffffff type: "pud page" Both Intel and AMD documentation mandate that unused physical address bits must be 0, so there is no need to explicitly mask them out with a mask narrower than the architecture limit of 52. This is also confirmed by this kernel commit: b83ce5ee91. Increase the value of __PHYSICAL_MASK_SHIFT_XEN to 52. Signed-off-by: Jiri Bohac <jbohac(a)suse.cz> diff --git a/defs.h b/defs.h index ffbe73b..35cdac2 100644 --- a/defs.h +++ b/defs.h @@ -3585,7 +3585,7 @@ struct arm64_stackframe { * PHYSICAL_PAGE_MASK changed (enlarged) between 2.4 and 2.6, so * for safety, use the 2.6 values to generate it. */ -#define __PHYSICAL_MASK_SHIFT_XEN 40 +#define __PHYSICAL_MASK_SHIFT_XEN 52 #define __PHYSICAL_MASK_SHIFT_2_6 46 #define __PHYSICAL_MASK_SHIFT_5LEVEL 52 #define __PHYSICAL_MASK_SHIFT (machdep->machspec->physical_mask_shift) -- 2.30.0

1 0

commit owncloud-client for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package owncloud-client for openSUSE:Factory checked in at 2021-01-30 13:56:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/owncloud-client (Old) and /work/SRC/openSUSE:Factory/.owncloud-client.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "owncloud-client" Sat Jan 30 13:56:32 2021 rev:26 rq:867760 version:2.7.5 Changes: -------- --- /work/SRC/openSUSE:Factory/owncloud-client/owncloud-client.changes 2021-01-22 21:52:50.117892587 +0100 +++ /work/SRC/openSUSE:Factory/.owncloud-client.new.28504/owncloud-client.changes 2021-01-30 13:57:42.850391671 +0100 @@ -1,0 +2,8 @@ +Fri Jan 29 16:32:15 UTC 2021 - Klaas Freitag <opensuse(a)freisturz.de> + +- Update to upstream version 2.7.5 + + Upstream bugfix release, see for details: + https://github.com/owncloud/client/releases/tag/v2.7.5 + +------------------------------------------------------------------- Old: ---- ownCloud_os-2.7.4.obscpio New: ---- ownCloud_os-2.7.5.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ owncloud-client.spec ++++++ --- /var/tmp/diff_new_pack.G3l7kA/_old 2021-01-30 13:57:43.978393574 +0100 +++ /var/tmp/diff_new_pack.G3l7kA/_new 2021-01-30 13:57:43.982393580 +0100 @@ -18,7 +18,7 @@ Name: owncloud-client -Version: 2.7.4 +Version: 2.7.5 Release: 0 Summary: The ownCloud synchronization client ++++++ _service ++++++ --- /var/tmp/diff_new_pack.G3l7kA/_old 2021-01-30 13:57:44.042393682 +0100 +++ /var/tmp/diff_new_pack.G3l7kA/_new 2021-01-30 13:57:44.042393682 +0100 @@ -1,7 +1,7 @@ <services> <service mode="disabled" name="obs_scm"> <param name="filename">ownCloud_os</param> - <param name="revision">v2.7.4</param> + <param name="revision">v2.7.5</param> <param name="scm">git</param> <param name="url">https://github.com/owncloud/client.git</param> <param name="versionformat">@PARENT_TAG@</param> ++++++ ownCloud_os-2.7.4.obscpio -> ownCloud_os-2.7.5.obscpio ++++++ /work/SRC/openSUSE:Factory/owncloud-client/ownCloud_os-2.7.4.obscpio /work/SRC/openSUSE:Factory/.owncloud-client.new.28504/ownCloud_os-2.7.5.obscpio differ: char 47, line 1 ++++++ ownCloud_os.obsinfo ++++++ --- /var/tmp/diff_new_pack.G3l7kA/_old 2021-01-30 13:57:44.102393782 +0100 +++ /var/tmp/diff_new_pack.G3l7kA/_new 2021-01-30 13:57:44.102393782 +0100 @@ -1,5 +1,5 @@ name: ownCloud_os -version: 2.7.4 -mtime: 1608565347 -commit: 44d1541bdc7765d11ab0327910496a09afeb1b0b +version: 2.7.5 +mtime: 1611846633 +commit: 2622c2033979a2b5a37d44be03ccb2e9581003c7

1 0

commit pagure for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pagure for openSUSE:Factory checked in at 2021-01-30 13:56:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pagure (Old) and /work/SRC/openSUSE:Factory/.pagure.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "pagure" Sat Jan 30 13:56:30 2021 rev:22 rq:867751 version:5.13.1 Changes: -------- --- /work/SRC/openSUSE:Factory/pagure/pagure.changes 2021-01-07 21:26:21.969781534 +0100 +++ /work/SRC/openSUSE:Factory/.pagure.new.28504/pagure.changes 2021-01-30 13:57:39.758384209 +0100 @@ -1,0 +2,16 @@ +Fri Jan 29 15:43:26 UTC 2021 - Neal Gompa <ngompa13(a)gmail.com> + +- Update to 5.13.1 + + Add the api_project_hascommit endpoint to the API doc + + Do not return a 500 error when the OpenID provider doesn't provide an email + + Fix bug in the default hook + + When failing to find a git repo, log where pagure looked + + Get the default branch of the target repo when linking for new PR + + Add an hascommit API endpoint + + Fixing sample input and output for alias related api + + Add missing API endpoints related to git aliases and re-order a little + + Add support for chardet 4.0+ + + Fix support for cchardet + + Make the token_id column of the commit_flags table nullable + +------------------------------------------------------------------- Old: ---- pagure-5.12.tar.gz New: ---- pagure-5.13.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pagure.spec ++++++ --- /var/tmp/diff_new_pack.ZbOD7Y/_old 2021-01-30 13:57:40.534387767 +0100 +++ /var/tmp/diff_new_pack.ZbOD7Y/_new 2021-01-30 13:57:40.538387774 +0100 @@ -23,7 +23,7 @@ Name: pagure -Version: 5.12 +Version: 5.13.1 Release: 0 Summary: A git-centered forge Group: Development/Tools/Version Control ++++++ pagure-5.12.tar.gz -> pagure-5.13.1.tar.gz ++++++ /work/SRC/openSUSE:Factory/pagure/pagure-5.12.tar.gz /work/SRC/openSUSE:Factory/.pagure.new.28504/pagure-5.13.1.tar.gz differ: char 5, line 1

1 0

commit yast2-rear for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-rear for openSUSE:Factory checked in at 2021-01-30 13:56:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-rear (Old) and /work/SRC/openSUSE:Factory/.yast2-rear.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-rear" Sat Jan 30 13:56:27 2021 rev:7 rq:867747 version:4.3.0 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-rear/yast2-rear.changes 2021-01-18 11:34:55.257133053 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-rear.new.28504/yast2-rear.changes 2021-01-30 13:57:34.954361588 +0100 @@ -1,0 +2,7 @@ +Sat Jan 23 20:14:50 UTC 2021 - Petr Pavlu <petr.pavlu(a)suse.com> + +- Fix quoting of values in POST_RECOVERY_SCRIPT and + BACKUP_PROG_INCLUDE (bsc#1180983). +- 4.3.0 + +------------------------------------------------------------------- @@ -5,0 +13 @@ +- 4.2.2 Old: ---- yast2-rear-4.2.2.tar.bz2 New: ---- yast2-rear-4.3.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-rear.spec ++++++ --- /var/tmp/diff_new_pack.nPa8Fh/_old 2021-01-30 13:57:35.418363773 +0100 +++ /var/tmp/diff_new_pack.nPa8Fh/_new 2021-01-30 13:57:35.422363791 +0100 @@ -17,7 +17,7 @@ Name: yast2-rear -Version: 4.2.2 +Version: 4.3.0 Release: 0 Summary: YaST2 - Rear - Relax and Recover License: GPL-2.0-only @@ -36,6 +36,7 @@ BuildRequires: yast2-devtools >= 4.2.2 BuildRequires: yast2-storage-ng BuildRequires: yast2-testsuite +BuildRequires: rubygem(%rb_default_ruby_abi:rspec) Requires: rear >= 1.10.0 Requires: yast2 ++++++ yast2-rear-4.2.2.tar.bz2 -> yast2-rear-4.3.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/.github/workflows/ci.yml new/yast2-rear-4.3.0/.github/workflows/ci.yml --- old/yast2-rear-4.2.2/.github/workflows/ci.yml 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-rear-4.3.0/.github/workflows/ci.yml 2021-01-29 17:06:48.000000000 +0100 @@ -0,0 +1,58 @@ + +# See https://docs.github.com/en/actions/reference/workflow-syntax-for-github-act… + +name: CI + +on: [push, pull_request] + +jobs: + Tests: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + # just for easier debugging... + - name: Inspect Installed Packages + run: rpm -qa | sort + + - name: Unit Tests + run: rake test:unit + # enable code coverage reporting + env: + COVERAGE: 1 + + # send the coverage report to coveralls.io + - name: Coveralls Report + uses: coverallsapp/github-action@master + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + + Package: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: Package Build + run: yast-ci-ruby -o package + + # downloading the Docker image takes some time so bundling several fast + # checks into one job avoids that overhead + Checks: + runs-on: ubuntu-latest + container: registry.opensuse.org/yast/head/containers/yast-ruby:latest + + steps: + + - name: Git Checkout + uses: actions/checkout@v2 + + - name: POT Check + run: rake check:pot diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/.travis.yml new/yast2-rear-4.3.0/.travis.yml --- old/yast2-rear-4.2.2/.travis.yml 2021-01-18 09:40:35.000000000 +0100 +++ new/yast2-rear-4.3.0/.travis.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,11 +0,0 @@ -sudo: required -language: bash -services: - - docker - -before_install: - - docker build -t yast-rear-image . -script: - # the "yast-travis-ruby" script is included in the base yastdevel/ruby image - # see https://github.com/yast/docker-yast-ruby/blob/master/yast-travis-ruby - - docker run -it -e TRAVIS=1 -e TRAVIS_JOB_ID="$TRAVIS_JOB_ID" yast-rear-image yast-travis-ruby diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/Dockerfile new/yast2-rear-4.3.0/Dockerfile --- old/yast2-rear-4.2.2/Dockerfile 2021-01-18 09:40:35.000000000 +0100 +++ new/yast2-rear-4.3.0/Dockerfile 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -FROM registry.opensuse.org/yast/head/containers/yast-ruby:latest -COPY . /usr/src/app - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/README.md new/yast2-rear-4.3.0/README.md --- old/yast2-rear-4.2.2/README.md 2021-01-18 09:40:35.000000000 +0100 +++ new/yast2-rear-4.3.0/README.md 2021-01-29 17:06:48.000000000 +0100 @@ -1,7 +1,10 @@ ## YaST - REAR Module -[![Travis Build](https://travis-ci.org/yast/yast-rear.svg?branch=master)](https://tra… -[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-rear-mast… +[![Workflow Status](https://github.com/yast/yast-rear/workflows/CI/badge.svg?branch=mas… +https://github.com/yast/yast-rear/actions?query=branch%3Amaster) +[![Jenkins Status](https://ci.opensuse.org/buildStatus/icon?job=yast-yast-rear-master)… +https://ci.opensuse.org/view/Yast/job/yast-yast-rear-master/) +[![Coverage Status](https://img.shields.io/coveralls/yast/yast-rear.svg)](https://coveralls.io/r/yast/yast-rear?branch=master) [Relax-and-Recover](http://relax-and-recover.org/) is a setup-and-forget Linux bare metal disaster recovery solution. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/package/yast2-rear.changes new/yast2-rear-4.3.0/package/yast2-rear.changes --- old/yast2-rear-4.2.2/package/yast2-rear.changes 2021-01-18 09:40:35.000000000 +0100 +++ new/yast2-rear-4.3.0/package/yast2-rear.changes 2021-01-29 17:06:48.000000000 +0100 @@ -1,8 +1,16 @@ ------------------------------------------------------------------- +Sat Jan 23 20:14:50 UTC 2021 - Petr Pavlu <petr.pavlu(a)suse.com> + +- Fix quoting of values in POST_RECOVERY_SCRIPT and + BACKUP_PROG_INCLUDE (bsc#1180983). +- 4.3.0 + +------------------------------------------------------------------- Fri Jan 15 17:23:26 UTC 2021 - aabdallah(a)suse.com - Don't show a warning anymore for vfat partitions, as versions 1.18 and higher of rear support them (bsc#1180599) +- 4.2.2 ------------------------------------------------------------------- Tue Dec 31 13:59:56 UTC 2019 - Josef Reidinger <jreidinger(a)suse.com> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/package/yast2-rear.spec new/yast2-rear-4.3.0/package/yast2-rear.spec --- old/yast2-rear-4.2.2/package/yast2-rear.spec 2021-01-18 09:40:35.000000000 +0100 +++ new/yast2-rear-4.3.0/package/yast2-rear.spec 2021-01-29 17:06:48.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-rear -Version: 4.2.2 +Version: 4.3.0 Release: 0 Summary: YaST2 - Rear - Relax and Recover Group: System/YaST @@ -35,6 +35,7 @@ BuildRequires: yast2 yast2-testsuite BuildRequires: yast2-storage-ng BuildRequires: yast2-devtools >= 4.2.2 +BuildRequires: rubygem(%rb_default_ruby_abi:rspec) Requires: yast2 Requires: rear >= 1.10.0 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/src/include/rear/ui.rb new/yast2-rear-4.3.0/src/include/rear/ui.rb --- old/yast2-rear-4.2.2/src/include/rear/ui.rb 2021-01-18 09:40:35.000000000 +0100 +++ new/yast2-rear-4.3.0/src/include/rear/ui.rb 2021-01-29 17:06:48.000000000 +0100 @@ -50,6 +50,22 @@ 'fi' ] + # List of scripts that the module should offer to remove from POST_RECOVERY_SCRIPT. + # + # This is used to fix up a problem with older versions of yast-rear which output an incorrectly + # escaped snapper quota snippet when writing it into the ReaR configuration file. The problem + # appeared in the following versions: 3.2.0 (2017) .. 4.2.2 (2021). This logic can be removed at + # some reasonable point in the future when it is expected all configuration files have been + # likely already corrected. + POST_RECOVERY_SCRIPT_REMOVE = [ + 'if snapper --no-dbus -r $TARGET_FS_ROOT get-config | grep -q ^QGROUP.*[0-9]/[0-9] ; '\ + 'then snapper --no-dbus -r $TARGET_FS_ROOT set-config QGROUP= ;'\ + ' snapper --no-dbus -r $TARGET_FS_ROOT setup-quota && echo snapper setup-quota done'\ + ' || echo snapper setup-quota failed ; '\ + 'else echo snapper setup-quota not used ; '\ + 'fi' + ] + def initialize_rear_ui(include_target) Yast.import "UI" @@ -103,16 +119,29 @@ mountpoints.map {|e| e + "/*" } end - # helper to compare an array with a default array and returns a formatted - # list containing the items that need to be added to the array to become - # equal to the default array. - def ArrayChecker(value, default) - to_add = default - value + # Helper to compare two arrays + # + # Compare the value array with the default array. The action selects whether the default array + # defines entries that are expected in the value array and should be added if missing (:add), or + # are not desired and should be removed if present (:remove). + # + # @param value [Array<String>] current entries + # @param default [Array<String>] entries that should appear (:add) or are not desired (:remove) + # in the value array + # @param action [Symbol] operation mode (:add, :remove) + # @return [String] list describing which entries need adding (:add) or removing (:remove) + def ArrayChecker(value, default, action) + if action == :add + diff = default - value + else + raise ArgumentError, "action must be :add or :remove" if action != :remove + diff = default & value + end - unless to_add.empty? + unless diff.empty? message = "<ul><li>" + - to_add.join("</li><li>") + + diff.join("</li><li>") + "</li></ul>" end @@ -508,17 +537,20 @@ backup_options = BACKUP_OPTIONS if backup_options.empty? if RearSystemCheck.Btrfs? - msg = ArrayChecker(backup_prog_include, mountpoints) + msg = ArrayChecker(backup_prog_include, mountpoints, :add) message += _("Additional directories in the backup:") + msg if msg end - msg = ArrayChecker(required_progs, REQUIRED_PROGS) + msg = ArrayChecker(required_progs, REQUIRED_PROGS, :add) message += _("Additional programs in the rescue system:") + msg if msg - msg = ArrayChecker(copy_as_is, COPY_AS_IS) + msg = ArrayChecker(copy_as_is, COPY_AS_IS, :add) message += _("Additional files to be copied into the rescue system:") + msg if msg - msg = ArrayChecker(post_recovery_script, POST_RECOVERY_SCRIPT) + msg = ArrayChecker(post_recovery_script, POST_RECOVERY_SCRIPT_REMOVE, :remove) + message += _("Removal of malformed post recovery scripts:") + msg if msg + + msg = ArrayChecker(post_recovery_script, POST_RECOVERY_SCRIPT, :add) message += _("Additional post recovery scripts:") + msg if msg unless message.empty? @@ -534,6 +566,7 @@ backup_prog_include |= mountpoints required_progs |= REQUIRED_PROGS copy_as_is |= COPY_AS_IS + post_recovery_script -= POST_RECOVERY_SCRIPT_REMOVE post_recovery_script |= POST_RECOVERY_SCRIPT else Builtins.y2warning("User did not accept the config changes we suggested.") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/src/modules/Rear.rb new/yast2-rear-4.3.0/src/modules/Rear.rb --- old/yast2-rear-4.2.2/src/modules/Rear.rb 2021-01-18 09:40:35.000000000 +0100 +++ new/yast2-rear-4.3.0/src/modules/Rear.rb 2021-01-29 17:06:48.000000000 +0100 @@ -30,6 +30,7 @@ # Input and output routines. require "yast" require "y2storage" +require "shellwords" module Yast class RearClass < Module @@ -72,57 +73,75 @@ deep_copy(usbparts) end - + # The module distinguishes between two types of lists that are used in the ReaR configuration. + # They are called by this code as basic and quoted lists. + # * A basic list consists of as-is names. Elements of this list are not transformed in any way + # when being written to or read from the configuration file, with the exception of escaping + # spaces. + # * A quoted list consists of names that should be protected from shell processing. Elements of + # such a list are quoted when writing them in the configuration file and unquoted/unescaped + # when reading them. This is used to store scripts that are invoked by ReaR using + # 'eval "${CONFIG_VAR[@]}"' and for wildcard names that should not be expanded by the shell + # directly. # Convert List from Config File to YCP List def RearListToYCPList(rearlist) - ycplist = [] - ycplisttmp = [] - return [] if rearlist == nil - # remove brakets + # remove parentheses rearlist = Builtins.regexpsub(Convert.to_string(rearlist), "^ *\$(.*)\$ *$", "\\1") - # split string seperated by spaces into a string list, respect backslash escaped blanks - ycplisttmp = Builtins.splitstring(rearlist, " ") + # split string separated by spaces into a string list, respect backslash escaped blanks + ycplisttmp = rearlist.split(" ") + ycplist = [] buffer = "" - Builtins.foreach(ycplisttmp) do |elem| - length = Builtins.size(elem) - if Builtins.substring(elem, Ops.subtract(length, 1), 1) == "\\" - buffer = Ops.add( - Ops.add( - buffer, - Builtins.substring(elem, 0, Ops.subtract(length, 1)) - ), - " " - ) + ycplisttmp.each do |elem| + if elem[-1] == "\\" + buffer += elem[0...-1] + " " else - buffer = Ops.add(buffer, elem) - ycplist = Builtins.add(ycplist, buffer) + buffer += elem + ycplist.push(buffer) buffer = "" end end # remove empty elements - ycplist = Builtins.filter(ycplist) { |element| element != "" } + ycplist = ycplist.select { |elem| elem != "" } deep_copy(ycplist) end - # Convert YCP List to Format for Config File def YCPListToRearList(ycplist) - ycplist = deep_copy(ycplist) - escaped = [] # escape blanks in directories with a backslash - Builtins.foreach(ycplist) do |elem| - escaped = Builtins.add( - escaped, - Builtins.mergestring(Builtins.splitstring(elem, " "), "\\ ") - ) - end - Ops.add(Ops.add("(", Builtins.mergestring(escaped, " ")), ")") + escaped = ycplist.map { |elem| elem.gsub(" ", "\\ ") } + + "(" + escaped.join(" ") + ")" + end + + # Convert Quoted List from Config File to YCP List + def RearQuotedListToYCPList(rearlist) + return [] if rearlist == nil + + # remove parentheses + rearlist = Builtins.regexpsub(Convert.to_string(rearlist), "^ *\$(.*)\$ *$", "\\1") + + # split string separated by spaces into a string list, respect shell quoting + ycplist = Shellwords.split(rearlist); + + # remove empty elements + ycplist = ycplist.select { |elem| elem != "" } + + deep_copy(ycplist) + end + + # Convert YCP List to Quoted Format for Config File + def YCPListToRearQuotedList(ycplist) + # escape all commands by putting them in single quotes, instead of using Shellwords.escape + # which would escape each individual character thus making the result harder to read + escaped = ycplist.map { |elem| "'" + String.Quote(elem) + "'" } + + "(" + escaped.join(" ") + ")" end # Read rear settings from /etc/rear/local.conf @@ -160,11 +179,11 @@ backup_prog_include_tmp = SCR.Read(path(".etc.rear_conf.v.BACKUP_PROG_INCLUDE")) - @backup_prog_include = RearListToYCPList(backup_prog_include_tmp) + @backup_prog_include = RearQuotedListToYCPList(backup_prog_include_tmp) post_recovery_script_tmp = SCR.Read(path(".etc.rear_conf.v.POST_RECOVERY_SCRIPT")) - @post_recovery_script = RearListToYCPList(post_recovery_script_tmp) + @post_recovery_script = RearQuotedListToYCPList(post_recovery_script_tmp) # These two configuration parameters extend a rear system variable. # It is bash, so this is done by including the old value of that variable @@ -213,14 +232,14 @@ unless @backup_prog_include.empty? SCR.Write( path(".etc.rear_conf.v.BACKUP_PROG_INCLUDE"), - YCPListToRearList(@backup_prog_include) + YCPListToRearQuotedList(@backup_prog_include) ) end unless @post_recovery_script.empty? SCR.Write( path(".etc.rear_conf.v.POST_RECOVERY_SCRIPT"), - YCPListToRearList(@post_recovery_script) + YCPListToRearQuotedList(@post_recovery_script) ) end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/test/Makefile.am new/yast2-rear-4.3.0/test/Makefile.am --- old/yast2-rear-4.2.2/test/Makefile.am 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-rear-4.3.0/test/Makefile.am 2021-01-29 17:06:48.000000000 +0100 @@ -0,0 +1,7 @@ +TESTS = \ + rear_test.rb + +TEST_EXTENSIONS = .rb +RB_LOG_COMPILER = rspec +VERBOSE = 1 +EXTRA_DIST = $(TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/test/rear_test.rb new/yast2-rear-4.3.0/test/rear_test.rb --- old/yast2-rear-4.2.2/test/rear_test.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-rear-4.3.0/test/rear_test.rb 2021-01-29 17:06:48.000000000 +0100 @@ -0,0 +1,119 @@ +#!/usr/bin/env rspec + +require_relative "./test_helper" + +Yast.import "Rear" + +describe Yast::Rear do + describe "#RearListToYCPList" do + it "correctly splits and parses a given input list" do + ycplist = subject.RearListToYCPList("()") + expect(ycplist).to eq([]) + + ycplist = subject.RearListToYCPList("(a)") + expect(ycplist).to eq(["a"]) + + ycplist = subject.RearListToYCPList("(a b c)") + expect(ycplist).to eq(["a", "b", "c"]) + + ycplist = subject.RearListToYCPList("(a\\ b c)") + expect(ycplist).to eq(["a b", "c"]) + + ycplist = subject.RearListToYCPList("(a\\ \\ \\ b c)") + expect(ycplist).to eq(["a b", "c"]) + + ycplist = subject.RearListToYCPList("(a* b)") + expect(ycplist).to eq(["a*", "b"]) + + ycplist = subject.RearListToYCPList("('a' b)") + expect(ycplist).to eq(["'a'", "b"]) + end + end + + describe "#YCPListToRearList" do + it "correctly transforms a given list for output" do + rearlist = subject.YCPListToRearList([]) + expect(rearlist).to eq(("()")) + + rearlist = subject.YCPListToRearList(["a"]) + expect(rearlist).to eq("(a)") + + rearlist = subject.YCPListToRearList(["a", "b", "c"]) + expect(rearlist).to eq("(a b c)") + + rearlist = subject.YCPListToRearList(["a b", "c"]) + expect(rearlist).to eq("(a\\ b c)") + + rearlist = subject.YCPListToRearList(["a b", "c"]) + expect(rearlist).to eq("(a\\ \\ \\ b c)") + + rearlist = subject.YCPListToRearList(["a*", "b"]) + expect(rearlist).to eq("(a* b)") + + rearlist = subject.YCPListToRearList(["'a'", "b"]) + expect(rearlist).to eq("('a' b)") + end + end + + describe "#RearQuotedListToYCPList" do + it "correctly splits and parses a given input list" do + ycplist = subject.RearQuotedListToYCPList("()") + expect(ycplist).to eq([]) + + ycplist = subject.RearQuotedListToYCPList("(a)") + expect(ycplist).to eq(["a"]) + + ycplist = subject.RearQuotedListToYCPList("(a b c)") + expect(ycplist).to eq(["a", "b", "c"]) + + ycplist = subject.RearQuotedListToYCPList("(a\\ b c)") + expect(ycplist).to eq(["a b", "c"]) + + ycplist = subject.RearQuotedListToYCPList("(a\\ \\ \\ b c)") + expect(ycplist).to eq(["a b", "c"]) + + ycplist = subject.RearQuotedListToYCPList("(a* b)") + expect(ycplist).to eq(["a*", "b"]) + + ycplist = subject.RearQuotedListToYCPList("('a' b)") + expect(ycplist).to eq(["a", "b"]) + + ycplist = subject.RearQuotedListToYCPList("('a'\\''b' c)") + expect(ycplist).to eq(["a'b", "c"]) + + ycplist = subject.RearQuotedListToYCPList("('' a)") + expect(ycplist).to eq(["a"]) + end + end + + describe "#YCPListToRearQuotedList" do + it "correctly transforms a given list for output" do + rearlist = subject.YCPListToRearQuotedList([]) + expect(rearlist).to eq("()") + + rearlist = subject.YCPListToRearQuotedList(["a"]) + expect(rearlist).to eq("('a')") + + rearlist = subject.YCPListToRearQuotedList(["a", "b", "c"]) + expect(rearlist).to eq("('a' 'b' 'c')") + + rearlist = subject.YCPListToRearQuotedList(["a b", "c"]) + expect(rearlist).to eq("('a b' 'c')") + + rearlist = subject.YCPListToRearQuotedList(["a b", "c"]) + expect(rearlist).to eq("('a b' 'c')") + + rearlist = subject.YCPListToRearQuotedList(["a*", "b"]) + expect(rearlist).to eq("('a*' 'b')") + + rearlist = subject.YCPListToRearQuotedList(["a", "b"]) + expect(rearlist).to eq("('a' 'b')") + + rearlist = subject.YCPListToRearQuotedList(["a'b", "c"]) + expect(rearlist).to eq("('a'\\''b' 'c')") + + rearlist = subject.YCPListToRearQuotedList([""]) + expect(rearlist).to eq("('')") + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-rear-4.2.2/test/test_helper.rb new/yast2-rear-4.3.0/test/test_helper.rb --- old/yast2-rear-4.2.2/test/test_helper.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-rear-4.3.0/test/test_helper.rb 2021-01-29 17:06:48.000000000 +0100 @@ -0,0 +1,42 @@ +ENV["Y2DIR"] = File.expand_path("../../src", __FILE__) + +require "yast" +require "yast/rspec" + +# stable testing in localized env +ENV["LC_ALL"] = "en_US.UTF-8" + +RSpec.configure do |config| + config.mock_with :rspec do |mocks| + # make sure we mock only the existing methods + mocks.verify_partial_doubles = true + end +end + +if ENV["COVERAGE"] + require "simplecov" + SimpleCov.start do + add_filter "/test/" + end + + src_location = File.expand_path("../src", __dir__) + # track all ruby files under src + SimpleCov.track_files("#{src_location}/**/*.rb") + + # additionally use the LCOV format for on-line code coverage reporting at CI + if ENV["CI"] || ENV["COVERAGE_LCOV"] + require "simplecov-lcov" + + SimpleCov::Formatter::LcovFormatter.config do |c| + c.report_with_single_file = true + # this is the default Coveralls GitHub Action location + # https://github.com/marketplace/actions/coveralls-github-action + c.single_report_path = "coverage/lcov.info" + end + + SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[ + SimpleCov::Formatter::HTMLFormatter, + SimpleCov::Formatter::LcovFormatter + ] + end +end

1 0

commit openSUSE-release-tools for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

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 2021-01-30 13:56:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/openSUSE-release-tools (Old) and /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "openSUSE-release-tools" Sat Jan 30 13:56:26 2021 rev:303 rq:867743 version:20210122.29b776fd Changes: -------- --- /work/SRC/openSUSE:Factory/openSUSE-release-tools/openSUSE-release-tools.changes 2021-01-13 18:35:47.094395710 +0100 +++ /work/SRC/openSUSE:Factory/.openSUSE-release-tools.new.28504/openSUSE-release-tools.changes 2021-01-30 13:57:33.374354148 +0100 @@ -1,0 +2,25 @@ +Fri Jan 22 13:48:03 UTC 2021 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20210122.29b776fd: + * Calculate the i586 DVD as i686 package set + +------------------------------------------------------------------- +Tue Jan 19 17:03:14 UTC 2021 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20210119.d564b3d0: + * Accept: Don't crash on actions that aren't submit/delete + +------------------------------------------------------------------- +Tue Jan 19 15:22:57 UTC 2021 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20210119.75c001c9: + * pkglistgen: Check the return code of Popen calls + +------------------------------------------------------------------- +Mon Jan 18 15:41:10 UTC 2021 - opensuse-releaseteam(a)opensuse.org + +- Update to version 20210118.bb3c6e1c: + * pkglistgen: Allow to set require_all for some groups to disable ignore + * Update aggregate.php + +------------------------------------------------------------------- Old: ---- openSUSE-release-tools-20210106.deab50eb.obscpio New: ---- openSUSE-release-tools-20210122.29b776fd.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ openSUSE-release-tools.spec ++++++ --- /var/tmp/diff_new_pack.sIhMj7/_old 2021-01-30 13:57:34.034357255 +0100 +++ /var/tmp/diff_new_pack.sIhMj7/_new 2021-01-30 13:57:34.038357275 +0100 @@ -20,7 +20,7 @@ %define source_dir openSUSE-release-tools %define announcer_filename factory-package-news Name: openSUSE-release-tools -Version: 20210106.deab50eb +Version: 20210122.29b776fd 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.sIhMj7/_old 2021-01-30 13:57:34.078357462 +0100 +++ /var/tmp/diff_new_pack.sIhMj7/_new 2021-01-30 13:57:34.078357462 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/openSUSE-release-tools.git</param> - <param name="changesrevision">fa4f899ff84b10f0782ea5a44e33b917d176addb</param> + <param name="changesrevision">29b776fd9fbc921b7442890f627ca100ef76f076</param> </service> </servicedata> ++++++ openSUSE-release-tools-20210106.deab50eb.obscpio -> openSUSE-release-tools-20210122.29b776fd.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210106.deab50eb/metrics/access/aggregate.php new/openSUSE-release-tools-20210122.29b776fd/metrics/access/aggregate.php --- old/openSUSE-release-tools-20210106.deab50eb/metrics/access/aggregate.php 2021-01-05 17:07:48.000000000 +0100 +++ new/openSUSE-release-tools-20210122.29b776fd/metrics/access/aggregate.php 2021-01-22 14:45:22.000000000 +0100 @@ -11,7 +11,7 @@ const VHOST = 'download.opensuse.org'; const FILENAME = 'download.opensuse.org-%s-access_log.xz'; const IPV6_PREFIX = 'ipv6.'; -const PRODUCT_PATTERN = '/^(10\.[2-3]|11\.[0-4]|12\.[1-3]|13\.[1-2]|42\.[1-3]|15\.[0-2]|tumbleweed)$/'; +const PRODUCT_PATTERN = '/^(10\.[2-3]|11\.[0-4]|12\.[1-3]|13\.[1-2]|42\.[1-3]|15\.[0-3]|tumbleweed)$/'; $begin = new DateTime(); // Skip the current day since the logs are incomplete and not compressed yet. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210106.deab50eb/osclib/accept_command.py new/openSUSE-release-tools-20210122.29b776fd/osclib/accept_command.py --- old/openSUSE-release-tools-20210106.deab50eb/osclib/accept_command.py 2021-01-05 17:07:48.000000000 +0100 +++ new/openSUSE-release-tools-20210122.29b776fd/osclib/accept_command.py 2021-01-22 14:45:22.000000000 +0100 @@ -92,12 +92,15 @@ staging_packages[project] = [] for request in status.findall('staged_requests/request'): - self.requests[request.get('type')].append(request.get('package')) + type = request.get('type') + if type in self.requests: + self.requests[type].append(request.get('package')) staging_packages[project].append(request.get('package')) other_new = self.find_new_requests(self.api.project) for req in other_new: - self.requests[req['type']].append(req['package']) + if req['type'] in self.requests: + self.requests[req['type']].append(req['package']) print('delete links to packages pending deletion...') self.delete_linked() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210106.deab50eb/pkglistgen/group.py new/openSUSE-release-tools-20210122.29b776fd/pkglistgen/group.py --- old/openSUSE-release-tools-20210106.deab50eb/pkglistgen/group.py 2021-01-05 17:07:48.000000000 +0100 +++ new/openSUSE-release-tools-20210122.29b776fd/pkglistgen/group.py 2021-01-22 14:45:22.000000000 +0100 @@ -21,6 +21,7 @@ self.not_found = dict() self.unresolvable = dict() self.default_support_status = None + self.ignore_broken = False for a in self.architectures: self.packages[a] = [] self.unresolvable[a] = dict() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/openSUSE-release-tools-20210106.deab50eb/pkglistgen/tool.py new/openSUSE-release-tools-20210122.29b776fd/pkglistgen/tool.py --- old/openSUSE-release-tools-20210106.deab50eb/pkglistgen/tool.py 2021-01-05 17:07:48.000000000 +0100 +++ new/openSUSE-release-tools-20210122.29b776fd/pkglistgen/tool.py 2021-01-22 14:45:22.000000000 +0100 @@ -118,7 +118,7 @@ fn = '{}.group'.format(group.name) with open(os.path.join(self.output_dir, fn), 'w') as fh: for arch in archs: - x = group.toxml(arch, self.ignore_broken, None) + x = group.toxml(arch, group.ignore_broken, None) x = ET.tostring(x, pretty_print=True, encoding='unicode') fh.write(x) @@ -135,7 +135,7 @@ with open(os.path.join(self.output_dir, fn), 'w') as fh: comment = group.comment for arch in archs: - x = group.toxml(arch, self.ignore_broken, comment) + x = group.toxml(arch, group.ignore_broken, comment) # only comment first time comment = None x = ET.tostring(x, pretty_print=True, encoding='unicode') @@ -189,7 +189,11 @@ def prepare_pool(self, arch, ignore_conflicts): pool = solv.Pool() - pool.setarch(arch) + # the i586 DVD is really a i686 one + if arch == 'i586': + pool.setarch('i686') + else: + pool.setarch(arch) self.lockjobs[arch] = [] solvables = set() @@ -351,9 +355,11 @@ args.append('--nodebug') args.append('{}/public/build/{}/{}/{}'.format(self.apiurl, project, repo, arch)) args.append(d) - p = subprocess.Popen(args, stdout=subprocess.PIPE) - for line in p.stdout: - self.logger.info(line.decode('utf-8').rstrip()) + with subprocess.Popen(args, stdout=subprocess.PIPE) as p: + for line in p.stdout: + self.logger.info(line.decode('utf-8').rstrip()) + if p.wait() != 0: + raise Exception("Mirroring repository failed") files = [os.path.join(d, f) for f in os.listdir(d) if f.endswith('.rpm')] @@ -361,8 +367,9 @@ p = subprocess.Popen( ['rpms2solv', '-m', '-', '-0'], stdin=subprocess.PIPE, stdout=fh) p.communicate(bytes('\0'.join(files), 'utf-8')) - p.wait() fh.close() + if p.wait() != 0: + raise Exception("rpm2solv failed") # Create hash file now that solv creation is complete. open(solv_file_hash, 'a').close() @@ -500,6 +507,9 @@ use_recommends = settings.get('recommends', global_use_recommends) self.solve_module(groupname, includes, excludes, use_recommends) g = self.groups[groupname] + # the default is a little double negated but Factory has ignore_broken + # as default and we only disable it for single groups (for now) + g.ignore_broken = not settings.get('require_all', not self.ignore_broken) g.conflicts = settings.get('conflicts', []) g.default_support_status = settings.get('default-support', 'unsupported') modules.append(g) ++++++ openSUSE-release-tools.obsinfo ++++++ --- /var/tmp/diff_new_pack.sIhMj7/_old 2021-01-30 13:57:34.734360551 +0100 +++ /var/tmp/diff_new_pack.sIhMj7/_new 2021-01-30 13:57:34.734360551 +0100 @@ -1,5 +1,5 @@ name: openSUSE-release-tools -version: 20210106.deab50eb -mtime: 1609862868 -commit: deab50eb50ee7658ee3ff29a166833c7d6eb9039 +version: 20210122.29b776fd +mtime: 1611323122 +commit: 29b776fd9fbc921b7442890f627ca100ef76f076

1 0

commit java-16-openjdk for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package java-16-openjdk for openSUSE:Factory checked in at 2021-01-30 13:56:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/java-16-openjdk (Old) and /work/SRC/openSUSE:Factory/.java-16-openjdk.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "java-16-openjdk" Sat Jan 30 13:56:16 2021 rev:5 rq:867722 version:16.0.0.0~33 Changes: -------- --- /work/SRC/openSUSE:Factory/java-16-openjdk/java-16-openjdk.changes 2021-01-20 18:29:17.631620545 +0100 +++ /work/SRC/openSUSE:Factory/.java-16-openjdk.new.28504/java-16-openjdk.changes 2021-01-30 13:56:30.074056076 +0100 @@ -1,0 +2,101 @@ +Fri Jan 22 13:24:56 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Upgrade to upstream tag jdk-16+33 + * Fixes: + + JDK-8259757: add a regression test for 8259353 and 8259601 + + JDK-8259732: JDK 16 L10n resource file update - msg drop 10 + + JDK-8259796: timed CompletableFuture.get may swallow + InterruptedException + + JDK-8258643: [TESTBUG] javax/swing/JComponent/7154030/ + /bug7154030.java failed with "Exception: Failed to hide opaque + button" + + JDK-8259574: SIGSEGV in BFSClosure::closure_impl + + JDK-8259641: C2: assert(early->dominates(LCA)) failed: early + is high enough + + JDK-8258396: SIGILL in + jdk.jfr.internal.PlatformRecorder.rotateDisk() + + JDK-8253505: JFR: onFlush invoked out of order with a sorted + event stream + + JDK-8255120: C2: assert(outer->outcnt() >= phis + 2 && + outer->outcnt() <= phis + 2 + stores + 1) failed: only phis + + JDK-8259719: ProblemList runtime/cds/appcds/jigsaw/modulepath/ + /ModulePathAndCP_JFR.java on Windows + + JDK-8259720: ProblemList java/awt/Focus/ + /AppletInitialFocusTest/AppletInitialFocusTest1.java on + Windows + + JDK-8259722: ProblemList two jdk/jfr/startupargs tests on + Windows + + JDK-8231461: static/instance overload leads to 'unexpected + static method found in unbound lookup' when resolving method + reference + +------------------------------------------------------------------- +Fri Jan 22 13:16:13 UTC 2021 - Fridrich Strba <fstrba(a)suse.com> + +- Update to upstream tag jdk-16+32 + * Fixes: + + JDK-8259063: Possible deadlock with vtable/itable creation vs + concurrent class unloading + + JDK-8259657: typo in generated HELP page prevents localization + + JDK-8258272: LoadVectorMaskedNode can't be replaced by zero + con + + JDK-8259560: Zero m68k: "static assertion failed: align" + after JDK-8252049 + + JDK-8258985: Parallel WeakProcessor may use too few threads + + JDK-8259061: C2: assert(found) failed: memory-writing node is + not placed in its original loop or an ancestor of it + + JDK-8259601: AArch64: Fix reinterpretX2D match rule issue + + JDK-8259275: JRuby crashes while resolving invokedynamic + instruction + + JDK-8259353: VectorReinterpretNode is incorrectly optimized + out + + JDK-8259636: Check for buffer backed by shared segment kicks + in in unexpected places + + JDK-8259645: Revert JDK-8245956 JavaCompiler still uses File + API instead of Path API in a specific case + + JDK-8259634: MemorySegment::asByteBuffer does not respect + spatial bounds + + JDK-8259298: broken link in Stream::toList spec + + JDK-8259380: Correct pretouch chunk size to cap with actual + page size + + JDK-8259237: Demo selection changes with left/right arrow + key. No need to press space for selection. + + JDK-8258384: AArch64: SVE verify_ptrue fails on some tests + + JDK-8253996: Javac error on jdk16 build 18: invalid flag: + -Xdoclint:-missing + + JDK-8259028: ClassCastException when using custom filesystem + with wrapper FileChannel impl + + JDK-8259043: More Zero architectures need linkage with + libatomic + + JDK-8259429: Update reference to README.md + + JDK-8259014: (so) + ServerSocketChannel.bind(UnixDomainSocketAddress)/ + SocketChannel.bind(UnixDomainSocketAddress) will have unknown + user and group owner (win) + + JDK-8258484: AIX build fails in Harfbuzz with XLC + 16.01.0000.0006 + + JDK-8039278: console.sh failed Automatically with exit code 1 + + JDK-8258972: unexpected compilation error with generic sealed + interface + + JDK-8259227: C2 crashes with SIGFPE due to a division that + floats above its zero check + + JDK-8258657: Doc build is broken by use of new language + features + + JDK-8250903: jdk/jfr/javaagent/TestLoadedAgent.java fails + with Mismatch in TestEvent count + + JDK-8249633: doclint reports missing javadoc for JavaFX + property methods that have a property description + + JDK-8251200: False positive messages about missing comments + for serialization + + JDK-8259312: VerifyCACerts.java fails as soneraclass2ca cert + will expire in 90 days + + JDK-8259075: Update the copyright notice in the files + generated by CLDR Converter tool + + JDK-8259224: (ann) getAnnotatedReceiverType should not + parameterize owner(s) of statically nested classes + + JDK-8258558: Revert changes for JDK-8252505 and related issues + + JDK-8259032: MappedMemorySegmentImpl#makeMappedSegment() + ignores Unmapper#pagePosition + + JDK-8259007: This test printed a blank page + +------------------------------------------------------------------- Old: ---- jdk-16+31.tar.gz New: ---- jdk-16+33.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ java-16-openjdk.spec ++++++ --- /var/tmp/diff_new_pack.gp0RF2/_old 2021-01-30 13:57:29.910337838 +0100 +++ /var/tmp/diff_new_pack.gp0RF2/_new 2021-01-30 13:57:29.918337876 +0100 @@ -35,10 +35,10 @@ %global updatever 0 %global patchver 0 %global datever 2021-03-16 -%global buildver 31 +%global buildver 33 %global openjdk_repo jdk16 -%global openjdk_tag jdk-16+31 -%global openjdk_dir jdk16-jdk-16-31 +%global openjdk_tag jdk-16+33 +%global openjdk_dir jdk16-jdk-16-33 %global icedtea_sound_version 1.0.1 # JavaEE modules %global java_atk_wrapper_version 0.33.2 @@ -342,7 +342,7 @@ # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: tzdata-java8 # Standard JPackage base provides. Provides: java-%{javaver}-headless = %{version}-%{release} @@ -375,7 +375,7 @@ # Post requires update-alternatives to install tool update-alternatives. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall tool update-alternatives. -Requires(postun): update-alternatives +Requires(postun):update-alternatives # Standard JPackage devel provides. Provides: java-%{javaver}-devel = %{version} Provides: java-devel = %{javaver} @@ -419,7 +419,7 @@ # Post requires update-alternatives to install javadoc alternative. Requires(post): update-alternatives # Postun requires update-alternatives to uninstall javadoc alternative. -Requires(postun): update-alternatives +Requires(postun):update-alternatives # Standard JPackage javadoc provides. Provides: java-%{javaver}-javadoc = %{version}-%{release} Provides: java-javadoc = %{version}-%{release} ++++++ jdk-16+31.tar.gz -> jdk-16+33.tar.gz ++++++ /work/SRC/openSUSE:Factory/java-16-openjdk/jdk-16+31.tar.gz /work/SRC/openSUSE:Factory/.java-16-openjdk.new.28504/jdk-16+33.tar.gz differ: char 13, line 1

1 0

commit netcdf for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package netcdf for openSUSE:Factory checked in at 2021-01-30 13:56:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/netcdf (Old) and /work/SRC/openSUSE:Factory/.netcdf.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "netcdf" Sat Jan 30 13:56:24 2021 rev:61 rq:867730 version:4.7.4 Changes: -------- --- /work/SRC/openSUSE:Factory/netcdf/netcdf.changes 2020-12-09 22:22:27.867738856 +0100 +++ /work/SRC/openSUSE:Factory/.netcdf.new.28504/netcdf.changes 2021-01-30 13:57:30.422340249 +0100 @@ -1,0 +2,6 @@ +Fri Jan 29 14:21:02 UTC 2021 - Egbert Eich <eich(a)suse.com> + +- Define-byteswap-functions-before-use.patch: + Define byteswap() functions before use (bsc#1181523). + +------------------------------------------------------------------- New: ---- Define-byteswap-functions-before-use.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ netcdf.spec ++++++ --- /var/tmp/diff_new_pack.ShuQDE/_old 2021-01-30 13:57:30.918342585 +0100 +++ /var/tmp/diff_new_pack.ShuQDE/_new 2021-01-30 13:57:30.922342604 +0100 @@ -1,7 +1,7 @@ # # spec file for package netcdf # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -421,6 +421,7 @@ Source1: nc-config.1.gz Patch0: Fix-logging-argument.patch Patch1: get_filter_info-get-correct-number-of-filter-elements.patch +Patch2: Define-byteswap-functions-before-use.patch BuildRequires: gawk BuildRequires: libtool BuildRequires: m4 ++++++ Define-byteswap-functions-before-use.patch ++++++ From: Egbert Eich <eich(a)suse.com> Date: Fri Jan 29 15:08:00 2021 +0100 Subject: Define byteswap() functions before use Patch-mainline: Not yet Git-commit: d35804c423112c496f7c6b0785b646875866b91c References: This fixes the build on System-z. Signed-off-by: Egbert Eich <eich(a)suse.com> --- netcdf-c-4.7.4/libdispatch/dfilter.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libdispatch/dfilter.c b/netcdf-c-4.7.4/libdispatch/dfilter.c index 8938464..0e490a3 100644 --- a/libdispatch/dfilter.c +++ b/libdispatch/dfilter.c @@ -40,6 +40,10 @@ Unified filter related code /* Forward */ static int gettype(const int q0, const int q1, int* unsignedp); +#ifdef WORDS_BIGENDIAN +static void byteswap8(unsigned char* mem); +static void byteswap4(unsigned char* mem); +#endif const struct LegalFormat { const char* tag;

1 0

commit hypre for openSUSE:Factory
by Source-Sync 30 Jan '21

30 Jan '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package hypre for openSUSE:Factory checked in at 2021-01-30 13:56:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hypre (Old) and /work/SRC/openSUSE:Factory/.hypre.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hypre" Sat Jan 30 13:56:14 2021 rev:11 rq:867883 version:2.20.0 Changes: -------- --- /work/SRC/openSUSE:Factory/hypre/hypre.changes 2020-10-08 13:13:50.595262557 +0200 +++ /work/SRC/openSUSE:Factory/.hypre.new.28504/hypre.changes 2021-01-30 13:56:27.634044586 +0100 @@ -1,0 +2,43 @@ +Fri Jan 29 12:24:00 UTC 2021 - Egbert Eich <eich(a)suse.com> + +- Make cmake files installation non-conflicting. + +------------------------------------------------------------------- +Fri Jan 29 10:25:10 UTC 2021 - Egbert Eich <eich(a)suse.com> + +- Fix hypre package conflicts for non HPC packages. + +------------------------------------------------------------------- +Thu Jan 28 16:58:42 UTC 2021 - Egbert Eich <eich(a)suse.com> + +- Change 'Requires:' to other HPC packages to %requires_eq to depend + on the exact version. This should take care of HPC packages ignoring + proper ABI versioning. + +------------------------------------------------------------------- +Mon Jan 25 15:20:57 UTC 2021 - Ana Guerrero Lopez <aguerrero(a)suse.com> + +- Update to 2.20.0 + * New matrix-based interpolation routines for AMG (CPU and GPU) + * Added GPU support for aggressive coarsening in AMG + * New AMG-DD solver + * Improved distributed sparse matrix-matrix and triple-matrix product + performance on GPUs + * IJMatrix/Vector assembly on GPUs (with pointers to GPU memory) + * Updated caliper usage + * Separated C and C++ headers + * Updated to support superlu-dist version to 6.3.1 + * Moved reference manual API to online documentation + * New AMG features to keep specified F-points and/or C-points. + * Added GPU support for AMG setup and several interpolation approaches. + * New parallel ILU solvers and smoothers. + * New MGR features. + * Added several interpolation routines based on matrix-matrix interpolations. + * Various bug fixes. +- Remove patch merged by upstream + * Fix-empty-elseif-in-CMakeLists.txt.patch +- Rework patch following upstream changes + * Fix-library-version-numbering.patch Patch removed + * Add-library-version.patch Patch added + +------------------------------------------------------------------- Old: ---- Fix-empty-elseif-in-CMakeLists.txt.patch Fix-library-version-numbering.patch hypre-2.18.2.tar.gz New: ---- Add-library-version.patch hypre-2.20.0.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hypre.spec ++++++ --- /var/tmp/diff_new_pack.6qILPF/_old 2021-01-30 13:56:28.138046960 +0100 +++ /var/tmp/diff_new_pack.6qILPF/_new 2021-01-30 13:56:28.142046979 +0100 @@ -1,7 +1,7 @@ # # spec file for package hypre # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,8 +17,8 @@ %global flavor @BUILD_FLAVOR@%{?nil} -%define ver 2.18.2 -%define _ver 2_18_2 +%define ver 2.20.0 +%define _ver 2_20_0 %define somver %{_ver} %define sover %{ver} @@ -356,28 +356,31 @@ %if %{without hpc} %if %{without mpi} - %define my_prefix %_prefix - %define my_bindir %_bindir - %define my_libdir %_libdir - %define my_incdir %_includedir + %global my_bindir %_bindir + %global _incdir %{_prefix}/include/ %else - %global my_suffix -%{?mpi_family}%{?mpi_ext} - %global my_prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext} - %global my_bindir %{my_prefix}/bin - %global my_libdir %{my_prefix}/%{_lib}/ - %global my_incdir %{my_prefix}/include/ - %global my_datadir %{my_prefix}/share/ + %global _bindir %_bindir + %global _defaultlicensedir %_defaultlicensedir + %global _prefix %{_libdir}/mpi/gcc/%{mpi_family}%{?mpi_ext} + %global _suffix -%{?mpi_family}%{?mpi_ext} + %global my_bindir %{_prefix}/bin + %global _libdir %{_prefix}/%{_lib}/ + %global _incdir %{_prefix}/include/ %endif %if 0%{!?package_name:1} - %define package_name %pname%{?my_suffix} + %define package_name %pname%{?_suffix} %endif - %define libname lib%{PNAME}%{somver}%{?my_suffix} + %define libname lib%{PNAME}%{somver}%{?_suffix} %else # with hpc %{hpc_init %{?compiler_family:-c %compiler_family %{?c_f_ver:-v %{c_f_ver}}} %{?with_mpi:-m {%mpi_family}} %{?mpi_vers:-V %{mpi_vers}} %{?ext:-e %{ext}}} - %define my_prefix %hpc_prefix +# Nail these down before changing _prefix + %global hpc_base %hpc_base + %global _bindir %_bindir + %global _defaultlicensedir %_defaultlicensedir + %define _prefix %hpc_prefix %define my_bindir %hpc_bindir - %define my_libdir %hpc_libdir - %define my_incdir %hpc_includedir + %define _libdir %hpc_libdir + %define _incdir %hpc_includedir %define package_name %{hpc_package_name %_ver} %define libname lib%{PNAME}%{hpc_package_name_tail %{?_ver}} %endif @@ -391,8 +394,7 @@ URL: https://www.llnl.gov/casc/hypre/ Source: https://github.com/hypre-space/hypre/archive/v%{version}.tar.gz#/hypre-%{ve… Patch0: hypre_Makefile_examples.patch -Patch1: Fix-library-version-numbering.patch -Patch2: Fix-empty-elseif-in-CMakeLists.txt.patch +Patch1: Add-library-version.patch # TODO : add babel #BuildRequires: babel-devel @@ -431,8 +433,8 @@ Group: System/Libraries %if %{with hpc} %hpc_requires -Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc -Requires: libsuperlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc +%{requires_eq libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc} +%{requires_eq libsuperlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc} Requires: lua-lmod >= 7.6.1 %endif @@ -453,8 +455,8 @@ Requires: lapack-devel Requires: superlu-devel %else -Requires: libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel -Requires: superlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel +%{requires_eq libopenblas%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel} +%{requires_eq superlu%{?hpc_ext}-%{compiler_family}%{?c_f_ver}-hpc-devel} %hpc_requires_devel %endif @@ -491,13 +493,13 @@ %prep %setup -q -n %{pname}-%{version} %patch0 -p0 -%patch1 -p2 -%patch2 -p2 +%patch1 -p0 + %if %{without hpc} cat > %{_sourcedir}/baselibs.conf <<EOF %{libname} %{libname}-devel - requires %{?my_suffix}-<targettype> + requires %{?_suffix}-<targettype> requires "%{libname}-<targettype> = <version>" EOF %endif @@ -544,15 +546,6 @@ cd src/ %cmake_install -# move libaries arround for mpi builds - %if %{without hpc} - %if %{with mpi} -mkdir -pv %{buildroot}%{my_libdir} -mv -v %{buildroot}/usr/%{_lib}/*.so* %{buildroot}%{my_libdir} -mv -v %{buildroot}/usr/include %{buildroot}%{my_incdir} - %endif - %endif - %if %{with hpc} %{hpc_write_pkgconfig -n %{pname} -l %{PNAME}} @@ -603,7 +596,7 @@ EOF %endif -%fdupes -s %{buildroot}%{my_prefix} +%fdupes -s %{buildroot}%{_prefix} %endif # build_all %if %{without hpc} && %{without mpi} @@ -611,10 +604,10 @@ %postun -n %{libname} -p /sbin/ldconfig %else %post -n %{libname} -/sbin/ldconfig -N %{my_libdir} +/sbin/ldconfig -N %{_libdir} %postun -n %{libname} -/sbin/ldconfig -N %{my_libdir} +/sbin/ldconfig -N %{_libdir} %{?with_hpc:%hpc_module_delete_if_default} %endif @@ -622,17 +615,18 @@ %files -n %{libname} %{?hpc_dirs} %{?hpc_modules_files} -%{my_libdir}/*.so.* +%{_libdir}/*.so.* %files devel %if %{with hpc} %{?hpc_dirs} %{hpc_pkgconfig_file} %endif +%{_libdir}/cmake %license COPYRIGHT LICENSE-APACHE LICENSE-MIT NOTICE %doc CHANGELOG README.md INSTALL.md -%{my_incdir}%{?!with_hpc:/%{pname}} -%{my_libdir}/*.so +%{_incdir}%{?!with_hpc:/%{pname}} +%{_libdir}/*.so %endif # build_all %if %{with install_doc} ++++++ Add-library-version.patch ++++++ From: Ana Guerrero Lopez <aguerrero(a)suse.com> Date: Add library version number Patch-mainline: Subject: Mon Jan 25 15:20:57 UTC 2021 Based in a previous patch by Egbert Eich <eich(a)suse.com> --- src/CMakeLists.txt +++ src/CMakeLists.txt @@ -246,6 +246,9 @@ set (BUILD_SHARED_LIBS OFF CACHE INTERNAL "" FORCE) endif () +# Here HYPRE_MINOR == HYPRE_MAJOR == HYPRE_VERSION +set_target_properties(HYPRE PROPERTIES VERSION ${HYPRE_VERSION} SOVERSION ${HYPRE_VERSION}) + # Set MPI compile flags if (NOT HYPRE_SEQUENTIAL) find_program (MPIEXEC_EXECUTABLE NAMES mpiexec mpirun) @@ -302,7 +305,7 @@ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") -install (FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}") +install (FILES ${HYPRE_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hypre") include (CMakePackageConfigHelpers) write_basic_package_version_file ( ++++++ hypre-2.18.2.tar.gz -> hypre-2.20.0.tar.gz ++++++ ++++ 190390 lines of diff (skipped)

1 0