February 2020 - openSUSE Commits - openSUSE Mailing Lists

commit yomi-formula for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package yomi-formula for openSUSE:Factory checked in at 2020-02-29 21:21:31 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yomi-formula (Old) and /work/SRC/openSUSE:Factory/.yomi-formula.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yomi-formula" Sat Feb 29 21:21:31 2020 rev:10 rq:779324 version:0.0.1+git.1582036279.1c70638 Changes: -------- --- /work/SRC/openSUSE:Factory/yomi-formula/yomi-formula.changes 2020-01-24 13:05:22.425293585 +0100 +++ /work/SRC/openSUSE:Factory/.yomi-formula.new.26092/yomi-formula.changes 2020-02-29 21:21:39.994178342 +0100 @@ -1,0 +2,14 @@ +Tue Feb 18 14:34:00 UTC 2020 - Alberto Planas Dominguez <aplanas(a)suse.com> + +- Update to version 0.0.1+git.1582036279.1c70638: + * Revert "init: drop namespace for the check" + +------------------------------------------------------------------- +Tue Feb 18 10:22:10 UTC 2020 - Alberto Planas Dominguez <aplanas(a)suse.com> + +- Update to version 0.0.1+git.1581958876.d324e18: + * metadata: support "after" ordering +- Adjust the ordering of the forms +- Move out the user modules from the susemanager domain + +------------------------------------------------------------------- Old: ---- yomi-0.0.1+git.1579090265.ecae64c.obscpio New: ---- yomi-0.0.1+git.1582036279.1c70638.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yomi-formula.spec ++++++ --- /var/tmp/diff_new_pack.N1BfJi/_old 2020-02-29 21:21:42.854184001 +0100 +++ /var/tmp/diff_new_pack.N1BfJi/_new 2020-02-29 21:21:42.858184009 +0100 @@ -20,7 +20,7 @@ %define fdir %{_datadir}/salt-formulas Name: yomi-formula -Version: 0.0.1+git.1579090265.ecae64c +Version: 0.0.1+git.1582036279.1c70638 Release: 0 Summary: Yomi - Yet one more installer License: Apache-2.0 @@ -30,7 +30,8 @@ URL: https://github.com/openSUSE/yomi Source0: %{fname}-%{version}.tar.xz -# On SLE/Leap 15-SP1 and TW requires the new salt-formula configuration location. +# On SLE/Leap 15-SP1 and TW requires the new salt-formula +# configuration location. %if ! (0%{?sle_version:1} && 0%{?sle_version} < 150100) Requires(pre): salt-formulas-configuration %else @@ -61,6 +62,10 @@ # Remove the top.sls, as can overwrite the one from the user rm %{buildroot}%{fdir}/states/top.sls +# Reallocate the user defined modules +mkdir -p %{buildroot}%{_prefix}/lib/%{fname}/ +mv %{buildroot}%{fdir}/states/_* %{buildroot}%{_prefix}/lib/%{fname}/ + # Example of pillars mkdir -p %{buildroot}%{_datadir}/%{fname}/ cp -R pillar %{buildroot}%{_datadir}/%{fname}/ @@ -113,14 +118,15 @@ file_roots: base: - /usr/share/yomi/kubic + - %{_prefix}/lib/%{fname} - /usr/share/salt-formulas/states - /srv/salt EOF -# Metadata, forms and subform (and fake states) -for form in metadata/form*.yml; do - form_name=${form#metadata/form-} - form_name=${form_name%.yml} +# Metadata, forms, subforms, and 'after' order +after='' +for form in metadata/*form*.yml; do + form_name=$(echo $form | sed -n 's/.*-form-$.*$\.yml/\1/p') mkdir -p %{buildroot}%{fdir}/metadata/$form_name/ cp -a $form %{buildroot}%{fdir}/metadata/$form_name/form.yml cp metadata/metadata.yml %{buildroot}%{fdir}/metadata/$form_name/ @@ -128,8 +134,22 @@ mkdir -p %{buildroot}%{fdir}/states/$form_name/ touch %{buildroot}%{fdir}/states/$form_name/init.sls fi + # Add the 'after' section to ordering the forms + sed -i "s/#AFTER/$after/g" %{buildroot}%{fdir}/metadata/$form_name/metadata.yml + if [ -z "$after" ]; then + after='after:\n' + fi + after+=" - ${form_name}\n" done +# Configuration file for the master +mkdir -p %{buildroot}%{_sysconfdir}/salt/master.d/ +cat <<EOF > %{buildroot}%{_sysconfdir}/salt/master.d/%{name}.conf +file_roots: + base: + - %{_prefix}/lib/%{fname} +EOF + %files %defattr(-,root,root,-) %license LICENSE @@ -137,10 +157,13 @@ %dir %attr(0755, root, salt) %{fdir}/ %dir %attr(0755, root, salt) %{fdir}/states/ %dir %attr(0755, root, salt) %{fdir}/metadata/ -%dir %attr(0755, root, root) %{_datadir}/%{fname} +%dir %attr(0755, root, root) %{_prefix}/lib/%{fname}/ +%dir %attr(0755, root, root) %{_datadir}/%{fname}/ %{fdir}/states/ %{fdir}/metadata/ +%{_prefix}/lib/%{fname}/ %{_datadir}/%{fname} %{_bindir}/monitor +%config %{_sysconfdir}/salt/master.d/%{name}.conf %changelog ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.N1BfJi/_old 2020-02-29 21:21:42.906184104 +0100 +++ /var/tmp/diff_new_pack.N1BfJi/_new 2020-02-29 21:21:42.906184104 +0100 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/yomi.git</param> - <param name="changesrevision">ecae64c237deabb76182c551fad36ee69955fe57</param></service></servicedata> \ No newline at end of file + <param name="changesrevision">1c70638e55bad3efe243c1466b48514a43d76034</param></service></servicedata> \ No newline at end of file ++++++ yomi-0.0.1+git.1579090265.ecae64c.obscpio -> yomi-0.0.1+git.1582036279.1c70638.obscpio ++++++ ++++ 3970 lines of diff (skipped) ++++++ yomi.obsinfo ++++++ --- /var/tmp/diff_new_pack.N1BfJi/_old 2020-02-29 21:21:43.162184611 +0100 +++ /var/tmp/diff_new_pack.N1BfJi/_new 2020-02-29 21:21:43.162184611 +0100 @@ -1,5 +1,5 @@ name: yomi -version: 0.0.1+git.1579090265.ecae64c -mtime: 1579090265 -commit: ecae64c237deabb76182c551fad36ee69955fe57 +version: 0.0.1+git.1582036279.1c70638 +mtime: 1582036279 +commit: 1c70638e55bad3efe243c1466b48514a43d76034

1 0

commit ovmf for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package ovmf for openSUSE:Factory checked in at 2020-02-29 21:21:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ovmf (Old) and /work/SRC/openSUSE:Factory/.ovmf.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "ovmf" Sat Feb 29 21:21:22 2020 rev:44 rq:779256 version:201911 Changes: -------- --- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes 2020-02-20 15:37:26.382744978 +0100 +++ /work/SRC/openSUSE:Factory/.ovmf.new.26092/ovmf.changes 2020-02-29 21:21:37.958174312 +0100 @@ -1,0 +2,10 @@ +Mon Feb 24 04:00:24 UTC 2020 - Gary Ching-Pang Lin <glin(a)suse.com> + +- Add ovmf-bsc1163969-fix-DxeImageVerificationHandler.patch to fix + dbx signature check (bsc#1163969, CVE-2019-14575) + + Also change the order of several patches to distinguish the + openssl patch +- Add ovmf-bsc1163927-fix-ip4dxe-and-arpdxe.patch to fix memory + leakage in Ip4Dxe and ArpDxe (bsc#1163927, CVE-2019-14559) + +------------------------------------------------------------------- New: ---- ovmf-bsc1163927-fix-ip4dxe-and-arpdxe.patch ovmf-bsc1163969-fix-DxeImageVerificationHandler.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ovmf.spec ++++++ --- /var/tmp/diff_new_pack.WB2zxY/_old 2020-02-29 21:21:38.830176038 +0100 +++ /var/tmp/diff_new_pack.WB2zxY/_new 2020-02-29 21:21:38.834176046 +0100 @@ -49,8 +49,10 @@ Patch3: %{name}-pie.patch Patch4: %{name}-disable-ia32-firmware-piepic.patch Patch5: %{name}-set-fixed-enroll-time.patch -Patch6: openssl-fix-syntax-error.patch -Patch7: %{name}-bsc1163959-PiDxeS3BootScriptLib-fix-numeric-truncation.patch +Patch6: %{name}-bsc1163959-PiDxeS3BootScriptLib-fix-numeric-truncation.patch +Patch7: %{name}-bsc1163969-fix-DxeImageVerificationHandler.patch +Patch8: %{name}-bsc1163927-fix-ip4dxe-and-arpdxe.patch +Patch100: openssl-fix-syntax-error.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: bc BuildRequires: fdupes @@ -173,12 +175,14 @@ %patch3 -p1 %patch4 -p1 %patch5 -p1 +%patch6 -p1 %patch7 -p1 +%patch8 -p1 # add openssl pushd CryptoPkg/Library/OpensslLib/openssl tar -xf %{SOURCE1} --strip 1 -%patch6 -p1 +%patch100 -p1 popd # add berkeley-softfloat-3 ++++++ ovmf-bsc1163927-fix-ip4dxe-and-arpdxe.patch ++++++ >From 7f9f7fccf58af2db5ac8c88801f56f4efe664fcb Mon Sep 17 00:00:00 2001 From: Jiaxin Wu <Jiaxin.wu(a)intel.com> Date: Mon, 29 Apr 2019 09:51:53 +0800 Subject: [PATCH 1/2] NetworkPkg/Ip4Dxe: Check the received package length (CVE-2019-14559). v3: correct the coding style. v2: correct the commit message & add BZ number. REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1610 This patch is to check the received package length to make sure the package has a valid length field. Cc: Fu Siyuan <siyuan.fu(a)intel.com> Cc: Maciej Rabeda <maciej.rabeda(a)linux.intel.com> Signed-off-by: Wu Jiaxin <jiaxin.wu(a)intel.com> Reviewed-by: Siyuan Fu <siyuan.fu(a)intel.com> (cherry picked from commit 578bcdc2605e3438b9cbdac4e68339f90f5bf8af) --- NetworkPkg/Ip4Dxe/Ip4Input.c | 46 +++++++++++++++++++++++++++++------- 1 file changed, 37 insertions(+), 9 deletions(-) diff --git a/NetworkPkg/Ip4Dxe/Ip4Input.c b/NetworkPkg/Ip4Dxe/Ip4Input.c index 24c584658803..fc1a892f14eb 100644 --- a/NetworkPkg/Ip4Dxe/Ip4Input.c +++ b/NetworkPkg/Ip4Dxe/Ip4Input.c @@ -1,7 +1,7 @@ /** @file IP4 input process. -Copyright (c) 2005 - 2018, Intel Corporation. All rights reserved. +Copyright (c) 2005 - 2020, Intel Corporation. All rights reserved. (C) Copyright 2015 Hewlett-Packard Development Company, L.P. SPDX-License-Identifier: BSD-2-Clause-Patent @@ -711,10 +711,6 @@ Ip4PreProcessPacket ( // // Check if the IP4 header is correctly formatted. // - if ((*Packet)->TotalSize < IP4_MIN_HEADLEN) { - return EFI_INVALID_PARAMETER; - } - HeadLen = (Head->HeadLen << 2); TotalLen = NTOHS (Head->TotalLen); @@ -808,6 +804,30 @@ Ip4PreProcessPacket ( return EFI_SUCCESS; } +/** + This function checks the IPv4 packet length. + + @param[in] Packet Pointer to the IPv4 Packet to be checked. + + @retval TRUE The input IPv4 packet length is valid. + @retval FALSE The input IPv4 packet length is invalid. + +**/ +BOOLEAN +Ip4IsValidPacketLength ( + IN NET_BUF *Packet + ) +{ + // + // Check the IP4 packet length. + // + if (Packet->TotalSize < IP4_MIN_HEADLEN) { + return FALSE; + } + + return TRUE; +} + /** The IP4 input routine. It is called by the IP4_INTERFACE when a IP4 fragment is received from MNP. @@ -844,6 +864,10 @@ Ip4AccpetFrame ( goto DROP; } + if (!Ip4IsValidPacketLength (Packet)) { + goto RESTART; + } + Head = (IP4_HEAD *) NetbufGetByte (Packet, 0, NULL); ASSERT (Head != NULL); OptionLen = (Head->HeadLen << 2) - IP4_MIN_HEADLEN; @@ -890,10 +914,14 @@ Ip4AccpetFrame ( // ZeroMem (&ZeroHead, sizeof (IP4_HEAD)); if (0 == CompareMem (Head, &ZeroHead, sizeof (IP4_HEAD))) { - // Packet may have been changed. Head, HeadLen, TotalLen, and - // info must be reloaded bofore use. The ownership of the packet - // is transfered to the packet process logic. - // + // Packet may have been changed. Head, HeadLen, TotalLen, and + // info must be reloaded before use. The ownership of the packet + // is transferred to the packet process logic. + // + if (!Ip4IsValidPacketLength (Packet)) { + goto RESTART; + } + Head = (IP4_HEAD *) NetbufGetByte (Packet, 0, NULL); ASSERT (Head != NULL); Status = Ip4PreProcessPacket ( -- 2.25.0 >From 03225826203c978146e4067e1d14fe66fcb75e22 Mon Sep 17 00:00:00 2001 From: Siyuan Fu <siyuan.fu(a)intel.com> Date: Fri, 21 Feb 2020 10:14:18 +0800 Subject: [PATCH 2/2] NetworkPkg/ArpDxe: Recycle invalid ARP packets (CVE-2019-14559) REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2031 This patch triggers the RecycleEvent for invalid ARP packets. Prior to this, we would just ignore invalid ARP packets, and never free them. Cc: Jiaxin Wu <jiaxin.wu(a)intel.com> Cc: Maciej Rabeda <maciej.rabeda(a)linux.intel.com> Cc: Siyuan Fu <siyuan.fu(a)intel.com> Signed-off-by: Nicholas Armour <nicholas.armour(a)intel.com> Reviewed-by: Siyuan Fu <siyuan.fu(a)intel.com> (cherry picked from commit 1d3215fd24f47eaa4877542a59b4bbf5afc0cfe8) --- NetworkPkg/ArpDxe/ArpImpl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/NetworkPkg/ArpDxe/ArpImpl.c b/NetworkPkg/ArpDxe/ArpImpl.c index 0e9ef103eff9..c7f770db0734 100644 --- a/NetworkPkg/ArpDxe/ArpImpl.c +++ b/NetworkPkg/ArpDxe/ArpImpl.c @@ -1,7 +1,7 @@ /** @file The implementation of the ARP protocol. -Copyright (c) 2006 - 2018, Intel Corporation. All rights reserved. +Copyright (c) 2006 - 2020, Intel Corporation. All rights reserved. SPDX-License-Identifier: BSD-2-Clause-Patent **/ @@ -113,7 +113,7 @@ ArpOnFrameRcvdDpc ( // // Restart the receiving if packet size is not correct. // - goto RESTART_RECEIVE; + goto RECYCLE_RXDATA; } // @@ -125,7 +125,7 @@ ArpOnFrameRcvdDpc ( Head->OpCode = NTOHS (Head->OpCode); if (RxData->DataLength < (sizeof (ARP_HEAD) + 2 * Head->HwAddrLen + 2 * Head->ProtoAddrLen)) { - goto RESTART_RECEIVE; + goto RECYCLE_RXDATA; } if ((Head->HwType != ArpService->SnpMode.IfType) || -- 2.25.0 ++++++ ovmf-bsc1163969-fix-DxeImageVerificationHandler.patch ++++++ ++++ 1870 lines (skipped)

1 0

commit plasma-browser-integration for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package plasma-browser-integration for openSUSE:Factory checked in at 2020-02-29 21:21:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma-browser-integration (Old) and /work/SRC/openSUSE:Factory/.plasma-browser-integration.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "plasma-browser-integration" Sat Feb 29 21:21:19 2020 rev:35 rq:779219 version:5.18.2 Changes: -------- --- /work/SRC/openSUSE:Factory/plasma-browser-integration/plasma-browser-integration.changes 2020-02-22 19:06:14.130322378 +0100 +++ /work/SRC/openSUSE:Factory/.plasma-browser-integration.new.26092/plasma-browser-integration.changes 2020-02-29 21:21:36.746171914 +0100 @@ -1,0 +2,9 @@ +Tue Feb 25 14:07:19 UTC 2020 - Fabian Vogt <fabian(a)ritter-vogt.de> + +- Update to 5.18.2 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.18.2.php +- No code changes since 5.18.1 + +------------------------------------------------------------------- Old: ---- plasma-browser-integration-5.18.1.tar.xz plasma-browser-integration-5.18.1.tar.xz.sig New: ---- plasma-browser-integration-5.18.2.tar.xz plasma-browser-integration-5.18.2.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma-browser-integration.spec ++++++ --- /var/tmp/diff_new_pack.dC2AKA/_old 2020-02-29 21:21:37.334173077 +0100 +++ /var/tmp/diff_new_pack.dC2AKA/_new 2020-02-29 21:21:37.334173077 +0100 @@ -21,7 +21,7 @@ %bcond_with browser_extension %bcond_without lang Name: plasma-browser-integration -Version: 5.18.1 +Version: 5.18.2 Release: 0 Summary: Helper for the KDE Plasma Browser Integration License: GPL-3.0-or-later ++++++ plasma-browser-integration-5.18.1.tar.xz -> plasma-browser-integration-5.18.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/plasma-browser-integration-5.18.1/CMakeLists.txt new/plasma-browser-integration-5.18.2/CMakeLists.txt --- old/plasma-browser-integration-5.18.1/CMakeLists.txt 2020-02-18 14:14:22.000000000 +0100 +++ new/plasma-browser-integration-5.18.2/CMakeLists.txt 2020-02-25 14:20:06.000000000 +0100 @@ -1,7 +1,7 @@ cmake_minimum_required(VERSION 3.0) project(plasma-browser-integration) -set(PROJECT_VERSION "5.18.1") +set(PROJECT_VERSION "5.18.2") set(PROJECT_VERSION_MAJOR 5) set(QT_MIN_VERSION "5.9.0")

1 0

commit zypper for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at 2020-02-29 21:21:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/zypper (Old) and /work/SRC/openSUSE:Factory/.zypper.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "zypper" Sat Feb 29 21:21:16 2020 rev:305 rq:778026 version:1.14.34 Changes: -------- --- /work/SRC/openSUSE:Factory/zypper/zypper.changes 2019-12-07 15:22:32.571735832 +0100 +++ /work/SRC/openSUSE:Factory/.zypper.new.26092/zypper.changes 2020-02-29 21:21:32.094162708 +0100 @@ -1,0 +2,9 @@ +Fri Feb 21 16:19:13 CET 2020 - ma(a)suse.de + +- Do not allow the abbreviation of cli arguments (bsc#1164543) +- accoring to according in all translation files. +- Always show exception history if available. +- Use default package cache location for temporary repos (bsc#1130873) +- version 1.14.34 + +------------------------------------------------------------------- Old: ---- zypper-1.14.33.tar.bz2 New: ---- zypper-1.14.34.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.9HjcHh/_old 2020-02-29 21:21:33.882166246 +0100 +++ /var/tmp/diff_new_pack.9HjcHh/_new 2020-02-29 21:21:33.886166254 +0100 @@ -1,7 +1,7 @@ # # spec file for package zypper # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -50,11 +50,11 @@ Summary: Command line software manager using libzypp License: GPL-2.0-or-later Group: System/Packages -Version: 1.14.33 +Version: 1.14.34 Release: 0 Source: %{name}-%{version}.tar.bz2 Source1: %{name}-rpmlintrc -Url: https://github.com/openSUSE/zypper +URL: https://github.com/openSUSE/zypper Provides: y2pmsh Obsoletes: y2pmsh ++++++ zypper-1.14.33.tar.bz2 -> zypper-1.14.34.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/zypper/zypper-1.14.33.tar.bz2 /work/SRC/openSUSE:Factory/.zypper.new.26092/zypper-1.14.34.tar.bz2 differ: char 11, line 1

1 0

commit libzypp for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package libzypp for openSUSE:Factory checked in at 2020-02-29 21:21:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libzypp (Old) and /work/SRC/openSUSE:Factory/.libzypp.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libzypp" Sat Feb 29 21:21:13 2020 rev:423 rq:778025 version:17.23.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libzypp/libzypp.changes 2020-02-19 12:39:33.583511326 +0100 +++ /work/SRC/openSUSE:Factory/.libzypp.new.26092/libzypp.changes 2020-02-29 21:21:21.246141240 +0100 @@ -1,0 +2,10 @@ +Fri Feb 21 16:06:57 CET 2020 - ma(a)suse.de + +- Log patch status changes to history (jsc#SLE-5116) +- Allow to disable all WebServer dependent tests when building. OBS + wants to be able to get rid of the nginx/FastCGI-devel build + requirement. Use 'rpmbuild --without mediabackend_tests' or + 'cmake -DDISABLE_MEDIABACKEND_TESTS=1'. +- version 17.23.0 (22) + +------------------------------------------------------------------- Old: ---- libzypp-17.22.1.tar.bz2 New: ---- libzypp-17.23.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libzypp.spec ++++++ --- /var/tmp/diff_new_pack.d11CRO/_old 2020-02-29 21:21:22.570143860 +0100 +++ /var/tmp/diff_new_pack.d11CRO/_new 2020-02-29 21:21:22.574143868 +0100 @@ -22,8 +22,10 @@ %bcond_with zchunk %endif +%bcond_without mediabackend_tests + Name: libzypp -Version: 17.22.1 +Version: 17.23.0 Release: 0 URL: https://github.com/openSUSE/libzypp Summary: Library for package, patch, pattern and product management @@ -89,7 +91,9 @@ BuildRequires: libsigc++2-devel # required for testsuite +%if %{with mediabackend_tests} BuildRequires: nginx +%endif Requires: rpm @@ -109,12 +113,16 @@ %if 0%{?suse_version} BuildRequires: libgpgme-devel #testsuite +%if %{with mediabackend_tests} BuildRequires: FastCGI-devel +%endif %else BuildRequires: gpgme-devel #testsuite +%if %{with mediabackend_tests} BuildRequires: fcgi-devel %endif +%endif %define min_curl_version 7.19.4 %if 0%{?suse_version} @@ -236,6 +244,7 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=1} \ + %{!?with_mediabackend_tests:-DDISABLE_MEDIABACKEND_TESTS=1} \ ${EXTRA_CMAKE_OPTIONS} \ .. make %{?_smp_mflags} VERBOSE=1 ++++++ libzypp-17.22.1.tar.bz2 -> libzypp-17.23.0.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/CMakeLists.txt new/libzypp-17.23.0/CMakeLists.txt --- old/libzypp-17.22.1/CMakeLists.txt 2020-02-03 12:31:09.000000000 +0100 +++ new/libzypp-17.23.0/CMakeLists.txt 2020-02-20 17:31:12.000000000 +0100 @@ -10,6 +10,7 @@ OPTION (ENABLE_BUILD_TESTS "Build and run test suite by default?" OFF) OPTION (ENABLE_USE_THREADS "Enable using threads (NOT being used by threads!)?" OFF) OPTION (ENABLE_ZCHUNK_COMPRESSION "Build with zchunk compression support?" OFF) +OPTION (DISABLE_MEDIABACKEND_TESTS "Disable Tests depending on Nginx and libfcgi?" OFF) OPTION (DISABLE_LIBPROXY "Build without libproxy support even if package is installed?" OFF) OPTION (DISABLE_AUTODOCS "Do not require doxygen being installed (required to build autodocs)?" OFF) @@ -100,7 +101,13 @@ FOREACH( loop_var ${ARGV} ) SET_SOURCE_FILES_PROPERTIES( ${loop_var}_test.cc COMPILE_FLAGS "-DBOOST_TEST_DYN_LINK -DBOOST_TEST_MAIN -DBOOST_AUTO_TEST_MAIN=\"\" " ) ADD_EXECUTABLE( ${loop_var}_test ${loop_var}_test.cc ) - TARGET_LINK_LIBRARIES( ${loop_var}_test zypp-allsym ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} zypp_test_utils) + + SET(TEST_REQ_LIBS zypp-allsym ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ) + IF(NOT DISABLE_MEDIABACKEND_TESTS) + LIST( APPEND TEST_REQ_LIBS zypp_test_utils) + ENDIF() + + TARGET_LINK_LIBRARIES( ${loop_var}_test ${TEST_REQ_LIBS} ) ADD_TEST( ${loop_var}_test ${CMAKE_CURRENT_BINARY_DIR}/${loop_var}_test --catch_system_errors=no) ENDFOREACH( loop_var ) ENDMACRO(ADD_TESTS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/VERSION.cmake new/libzypp-17.23.0/VERSION.cmake --- old/libzypp-17.22.1/VERSION.cmake 2020-02-07 15:06:09.000000000 +0100 +++ new/libzypp-17.23.0/VERSION.cmake 2020-02-21 16:16:12.000000000 +0100 @@ -60,9 +60,9 @@ # SET(LIBZYPP_MAJOR "17") SET(LIBZYPP_COMPATMINOR "22") -SET(LIBZYPP_MINOR "22") -SET(LIBZYPP_PATCH "1") +SET(LIBZYPP_MINOR "23") +SET(LIBZYPP_PATCH "0") # -# LAST RELEASED: 17.22.1 (22) +# LAST RELEASED: 17.23.0 (22) # (The number in parenthesis is LIBZYPP_COMPATMINOR) #======= diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/libzypp.spec.cmake new/libzypp-17.23.0/libzypp.spec.cmake --- old/libzypp-17.22.1/libzypp.spec.cmake 2020-02-03 12:31:09.000000000 +0100 +++ new/libzypp-17.23.0/libzypp.spec.cmake 2020-02-20 17:31:12.000000000 +0100 @@ -21,6 +21,8 @@ %bcond_with zchunk %endif +%bcond_without mediabackend_tests + Name: libzypp Version: @VERSION@ Release: 0 @@ -88,7 +90,9 @@ BuildRequires: libsigc++2-devel # required for testsuite +%if %{with mediabackend_tests} BuildRequires: nginx +%endif Requires: rpm @@ -108,12 +112,16 @@ %if 0%{?suse_version} BuildRequires: libgpgme-devel #testsuite +%if %{with mediabackend_tests} BuildRequires: FastCGI-devel +%endif %else BuildRequires: gpgme-devel #testsuite +%if %{with mediabackend_tests} BuildRequires: fcgi-devel %endif +%endif %define min_curl_version 7.19.4 %if 0%{?suse_version} @@ -235,6 +243,7 @@ -DCMAKE_BUILD_TYPE=Release \ -DCMAKE_SKIP_RPATH=1 \ %{?with_zchunk:-DENABLE_ZCHUNK_COMPRESSION=1} \ + %{!?with_mediabackend_tests:-DDISABLE_MEDIABACKEND_TESTS=1} \ ${EXTRA_CMAKE_OPTIONS} \ .. make %{?_smp_mflags} VERBOSE=1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/package/libzypp.changes new/libzypp-17.23.0/package/libzypp.changes --- old/libzypp-17.22.1/package/libzypp.changes 2020-02-07 15:06:09.000000000 +0100 +++ new/libzypp-17.23.0/package/libzypp.changes 2020-02-21 16:16:12.000000000 +0100 @@ -1,4 +1,14 @@ ------------------------------------------------------------------- +Fri Feb 21 16:06:57 CET 2020 - ma(a)suse.de + +- Log patch status changes to history (jsc#SLE-5116) +- Allow to disable all WebServer dependent tests when building. OBS + wants to be able to get rid of the nginx/FastCGI-devel build + requirement. Use 'rpmbuild --without mediabackend_tests' or + 'cmake -DDISABLE_MEDIABACKEND_TESTS=1'. +- version 17.23.0 (22) + +------------------------------------------------------------------- Fri Feb 7 14:56:40 CET 2020 - ma(a)suse.de - update translations diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/po/es.po new/libzypp-17.23.0/po/es.po --- old/libzypp-17.22.1/po/es.po 2019-12-05 14:41:26.000000000 +0100 +++ new/libzypp-17.23.0/po/es.po 2020-02-20 00:56:10.000000000 +0100 @@ -17,7 +17,7 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-23 20:19+0000\n" +"PO-Revision-Date: 2020-02-19 23:54+0000\n" "Last-Translator: Juan Sarria <juansarriam(a)gmail.com>\n" "Language-Team: Spanish <https://l10n.opensuse.org/projects/libzypp/master/es/" ">\n" @@ -26,7 +26,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4640,19 +4640,19 @@ #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "instalar %1% aunque se haya retraído" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "permitir la instalación de PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "instalar %1% aunque esté en la lista negra" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/po/fr.po new/libzypp-17.23.0/po/fr.po --- old/libzypp-17.22.1/po/fr.po 2019-12-05 14:41:26.000000000 +0100 +++ new/libzypp-17.23.0/po/fr.po 2020-02-20 19:56:11.000000000 +0100 @@ -20,16 +20,16 @@ "Project-Id-Version: zypp.fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-23 20:19+0000\n" +"PO-Revision-Date: 2020-02-20 18:54+0000\n" "Last-Translator: Christine Gabriel <christine(a)stoquart.com>\n" -"Language-Team: French <https://l10n.opensuse.org/projects/libzypp/master/fr/" -">\n" +"Language-Team: French <https://l10n.opensuse.org/projects/libzypp/master/fr/>" +"\n" "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -124,7 +124,7 @@ #. :ABW:533: #: zypp/CountryCode.cc:173 msgid "Aland Islands" -msgstr "Îles Aland" +msgstr "Îles Åland" #. :ALA:248: #: zypp/CountryCode.cc:174 @@ -4642,19 +4642,19 @@ #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "installer %1% bien qu'il ait été retiré" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "autoriser l'installation du PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "installer %1% bien qu'il ait été placé en liste noire" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/po/it.po new/libzypp-17.23.0/po/it.po --- old/libzypp-17.22.1/po/it.po 2019-12-05 14:41:26.000000000 +0100 +++ new/libzypp-17.23.0/po/it.po 2020-02-19 18:56:07.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-23 20:19+0000\n" +"PO-Revision-Date: 2020-02-19 17:54+0000\n" "Last-Translator: Davide Aiello <davidea(a)novilinguists.com>\n" "Language-Team: Italian <https://l10n.opensuse.org/projects/libzypp/master/it/" ">\n" @@ -24,7 +24,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" "X-Poedit-Bookmarks: 370,-1,-1,-1,-1,-1,-1,-1,-1,-1\n" #. dubious: Throw on malformed known types, otherwise log a warning. @@ -4624,19 +4624,19 @@ #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "installare %1% anche se è stato ritirato" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "consentire installazione di PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "Installare %1% anche se è nella black list" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/po/zh_CN.po new/libzypp-17.23.0/po/zh_CN.po --- old/libzypp-17.22.1/po/zh_CN.po 2019-12-05 14:41:26.000000000 +0100 +++ new/libzypp-17.23.0/po/zh_CN.po 2020-02-17 06:56:09.000000000 +0100 @@ -12,8 +12,8 @@ "Project-Id-Version: YaST (@memory@)\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-03-14 18:32+0000\n" -"Last-Translator: Marguerite Su <i(a)marguerite.su>\n" +"PO-Revision-Date: 2020-02-17 05:54+0000\n" +"Last-Translator: Grace Yu <grace.yu(a)excel-gits.com>\n" "Language-Team: Chinese (China) <https://l10n.opensuse.org/projects/libzypp/" "master/zh_CN/>\n" "Language: zh_CN\n" @@ -21,7 +21,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4601,19 +4601,19 @@ #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "尽管 %1% 已收回，仍予以安装" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "允许安装 PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "尽管 %1% 已列入黑名单，仍予以安装" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/po/zh_TW.po new/libzypp-17.23.0/po/zh_TW.po --- old/libzypp-17.22.1/po/zh_TW.po 2019-12-05 14:41:26.000000000 +0100 +++ new/libzypp-17.23.0/po/zh_TW.po 2020-02-17 15:56:16.000000000 +0100 @@ -11,8 +11,8 @@ "Project-Id-Version: zypp\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-12-05 14:22+0100\n" -"PO-Revision-Date: 2019-05-03 09:49+0000\n" -"Last-Translator: Ramax Lo <ramaxlo(a)gmail.com>\n" +"PO-Revision-Date: 2020-02-17 14:54+0000\n" +"Last-Translator: Grace Yu <grace.yu(a)excel-gits.com>\n" "Language-Team: Chinese (Taiwan) <https://l10n.opensuse.org/projects/libzypp/" "master/zh_TW/>\n" "Language: zh_TW\n" @@ -20,7 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 3.3\n" +"X-Generator: Weblate 3.6.1\n" #. dubious: Throw on malformed known types, otherwise log a warning. #: zypp/CheckSum.cc:136 @@ -4592,19 +4592,19 @@ #: zypp/solver/detail/SATResolver.cc:1386 #, boost-format msgid "install %1% although it has been retracted" -msgstr "" +msgstr "儘管 %1% 已收回，仍予以安裝" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1389 #, boost-format msgid "allow to install the PTF %1%" -msgstr "" +msgstr "允許安裝 PTF %1%" #. translator: %1% is a package name #: zypp/solver/detail/SATResolver.cc:1392 #, boost-format msgid "install %1% although it is blacklisted" -msgstr "" +msgstr "儘管 %1% 已列入黑名單，仍予以安裝" #: zypp/solver/detail/SATResolver.cc:1412 #, c-format, boost-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/tests/CMakeLists.txt new/libzypp-17.23.0/tests/CMakeLists.txt --- old/libzypp-17.22.1/tests/CMakeLists.txt 2020-02-03 12:31:09.000000000 +0100 +++ new/libzypp-17.23.0/tests/CMakeLists.txt 2020-02-20 17:31:12.000000000 +0100 @@ -1,8 +1,9 @@ ADD_DEFINITIONS( -DTESTS_SRC_DIR="${CMAKE_CURRENT_SOURCE_DIR}" -DTESTS_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}" ) - +IF( NOT DISABLE_MEDIABACKEND_TESTS ) ADD_SUBDIRECTORY(lib) +ENDIF() ENABLE_TESTING() INCLUDE_DIRECTORIES( ${LIBZYPP_SOURCE_DIR}/tests/lib ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/tests/parser/HistoryLogReader_test.dat new/libzypp-17.23.0/tests/parser/HistoryLogReader_test.dat --- old/libzypp-17.22.1/tests/parser/HistoryLogReader_test.dat 2019-12-10 15:46:12.000000000 +0100 +++ new/libzypp-17.23.0/tests/parser/HistoryLogReader_test.dat 2020-02-21 13:16:14.000000000 +0100 @@ -11,4 +11,4 @@ discard\|one field discard|to fields but bad date 2015-08-11 18:42:49|command|root@fibonacci|'/Local/ma/zypp/BUILD/zypper/src/zypper' 'in' '-f' 'xteddy'| -2011-07-18 18:08:09|pstate|patch-name|2.6.37.6-0.5.1|noarch|repo-update|moderate|security|needed|satisfied +2011-07-18 18:08:09|patch|patch-name|2.6.37.6-0.5.1|noarch|repo-update|moderate|security|needed|applied| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/tests/repo/CMakeLists.txt new/libzypp-17.23.0/tests/repo/CMakeLists.txt --- old/libzypp-17.22.1/tests/repo/CMakeLists.txt 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.23.0/tests/repo/CMakeLists.txt 2020-02-20 17:31:12.000000000 +0100 @@ -7,9 +7,14 @@ ADD_TESTS( DUdata ExtendedMetadata - MirrorList PluginServices RepoLicense RepoSigcheck RepoVariables ) + +IF( NOT DISABLE_MEDIABACKEND_TESTS ) +ADD_TESTS( + MirrorList +) +ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/tests/zypp/CMakeLists.txt new/libzypp-17.23.0/tests/zypp/CMakeLists.txt --- old/libzypp-17.22.1/tests/zypp/CMakeLists.txt 2020-01-23 08:01:10.000000000 +0100 +++ new/libzypp-17.23.0/tests/zypp/CMakeLists.txt 2020-02-20 17:31:12.000000000 +0100 @@ -18,7 +18,6 @@ Deltarpm Edition ExtendedPool - Fetcher FileChecker Flags GZStream @@ -26,7 +25,6 @@ KeyRing Locale Locks - MediaSetAccess PathInfo Pathname PluginFrame @@ -37,7 +35,6 @@ PublicKey PurgeKernels RWPtr - RepoInfo RepoManager RepoStatus ResKind @@ -61,3 +58,11 @@ ) ENDIF(ENABLE_ZCHUNK_COMPRESSION) +IF( NOT DISABLE_MEDIABACKEND_TESTS ) + ADD_TESTS( + Fetcher + MediaSetAccess + RepoInfo + ) +ENDIF() + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/tests/zyppng/EventLoop_test.cc new/libzypp-17.23.0/tests/zyppng/EventLoop_test.cc --- old/libzypp-17.22.1/tests/zyppng/EventLoop_test.cc 2020-02-06 18:56:11.000000000 +0100 +++ new/libzypp-17.23.0/tests/zyppng/EventLoop_test.cc 2020-02-13 14:16:13.000000000 +0100 @@ -48,7 +48,8 @@ hitT4++; //timer deviation should not be too big, can only be tested on a singleShot timer - BOOST_REQUIRE_LE( t.now() - t.expires(), 3 ); + // ma: disabled as OBS builder have quite big deviation >15 + // BOOST_REQUIRE_LE( t.now() - t.expires(), 3 ); }); //convenience function to execute a function later diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/tests/zyppng/media/CMakeLists.txt new/libzypp-17.23.0/tests/zyppng/media/CMakeLists.txt --- old/libzypp-17.22.1/tests/zyppng/media/CMakeLists.txt 2020-02-03 12:31:09.000000000 +0100 +++ new/libzypp-17.23.0/tests/zyppng/media/CMakeLists.txt 2020-02-20 17:31:12.000000000 +0100 @@ -1,4 +1,6 @@ -ADD_TESTS( - NetworkRequestDispatcher - EvDownloader -) +IF( NOT DISABLE_MEDIABACKEND_TESTS) + ADD_TESTS( + NetworkRequestDispatcher + EvDownloader + ) +ENDIF() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/HistoryLog.cc new/libzypp-17.23.0/zypp/HistoryLog.cc --- old/libzypp-17.22.1/zypp/HistoryLog.cc 2019-12-10 15:46:12.000000000 +0100 +++ new/libzypp-17.23.0/zypp/HistoryLog.cc 2020-02-21 13:16:14.000000000 +0100 @@ -332,7 +332,7 @@ } } - void HistoryLog::patchStateChange( const PoolItem & pi, const std::string &oldstate ) + void HistoryLog::patchStateChange( const PoolItem & pi, ResStatus::ValidateValue oldstate ) { if ( ! pi.isKind<Patch>() ) return; const Patch::constPtr p = asKind<Patch>(pi.resolvable()); @@ -346,8 +346,8 @@ << _sep << p->repoInfo().alias() // 6 repo alias << _sep << p->severity() // 7 severity << _sep << p->category() // 8 category - << _sep << oldstate // 9 old state - << _sep << pi.patchStatusAsString() // 10 new state + << _sep << ResStatus::validateValueAsString( oldstate ) // 9 old state + << _sep << pi.status().validateValueAsString() // 10 new state << _sep << str::escape(ZConfig::instance().userData(), _sep) // 11 userdata << endl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/HistoryLog.h new/libzypp-17.23.0/zypp/HistoryLog.h --- old/libzypp-17.22.1/zypp/HistoryLog.h 2019-12-10 15:46:12.000000000 +0100 +++ new/libzypp-17.23.0/zypp/HistoryLog.h 2020-02-21 13:16:14.000000000 +0100 @@ -15,6 +15,7 @@ #include <iosfwd> #include "zypp/Pathname.h" +#include "zypp/ResStatus.h" namespace zypp { @@ -128,7 +129,7 @@ * * \param oldstate info about the old state */ - void patchStateChange ( const PoolItem & pi, const std::string &oldstate ); + void patchStateChange( const PoolItem & pi, ResStatus::ValidateValue oldstate ); }; /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/HistoryLogData.cc new/libzypp-17.23.0/zypp/HistoryLogData.cc --- old/libzypp-17.22.1/zypp/HistoryLogData.cc 2019-12-10 15:46:12.000000000 +0100 +++ new/libzypp-17.23.0/zypp/HistoryLogData.cc 2020-02-21 13:16:14.000000000 +0100 @@ -60,7 +60,7 @@ _table["ralias"] = REPO_CHANGE_ALIAS_e; _table["rurl"] = REPO_CHANGE_URL_e; _table["command"] = STAMP_COMMAND_e; - _table["pstate"] = PATCH_STATE_CHANGE_e; + _table["patch"] = PATCH_STATE_CHANGE_e; _table["NONE"] = _table["none"] = NONE_e; } @@ -88,7 +88,7 @@ _table[REPO_CHANGE_ALIAS_e] = PairType( "ralias" , "ralias " ); _table[REPO_CHANGE_URL_e] = PairType( "rurl" , "rurl " ); _table[STAMP_COMMAND_e] = PairType( "command" , "command" ); - _table[PATCH_STATE_CHANGE_e]= PairType( "pstate" , "pstate " ); + _table[PATCH_STATE_CHANGE_e]= PairType( "patch" , "patch " ); _table[NONE_e] = PairType( "NONE" , "NONE " ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/PoolItem.cc new/libzypp-17.23.0/zypp/PoolItem.cc --- old/libzypp-17.22.1/zypp/PoolItem.cc 2019-12-10 15:46:12.000000000 +0100 +++ new/libzypp-17.23.0/zypp/PoolItem.cc 2020-02-21 13:16:14.000000000 +0100 @@ -100,17 +100,6 @@ return isBroken() && status().isLocked(); } - std::string patchStatusAsString() const - { - if ( isUndetermined() ) return "undetermined"; - if ( isRelevant() ) return "relevant"; - if ( isSatisfied() ) return "satisfied"; - if ( isBroken() ) return "broken"; - if ( isNeeded() ) return "needed"; - if ( isUnwanted() ) return "unwanted"; - return "none"; - } - private: mutable ResStatus _status; ResObject::constPtr _resolvable; @@ -222,7 +211,6 @@ bool PoolItem::isBroken() const { return _pimpl->isBroken(); } bool PoolItem::isNeeded() const { return _pimpl->isNeeded(); } bool PoolItem::isUnwanted() const { return _pimpl->isUnwanted(); } - std::string PoolItem::patchStatusAsString() const { return _pimpl->patchStatusAsString(); } void PoolItem::saveState() const { _pimpl->saveState(); } void PoolItem::restoreState() const { _pimpl->restoreState(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/PoolItem.h new/libzypp-17.23.0/zypp/PoolItem.h --- old/libzypp-17.22.1/zypp/PoolItem.h 2019-12-10 15:46:12.000000000 +0100 +++ new/libzypp-17.23.0/zypp/PoolItem.h 2020-02-21 13:16:14.000000000 +0100 @@ -77,6 +77,7 @@ /** Reset status. */ ResStatus & statusReset() const; + //@} /** \name Status validation. @@ -104,12 +105,8 @@ /** Broken (needed) but locked patches. */ bool isUnwanted() const; - - std::string patchStatusAsString () const; - //@} - //@} public: /** Return the \ref ResPool the item belongs to. */ ResPool pool() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/ResPool.cc new/libzypp-17.23.0/zypp/ResPool.cc --- old/libzypp-17.22.1/zypp/ResPool.cc 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.23.0/zypp/ResPool.cc 2020-02-21 13:16:14.000000000 +0100 @@ -26,6 +26,10 @@ { ///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////// + // class ResPool + /////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////// // // METHOD NAME : ResPool::instance // METHOD TYPE : ResPool @@ -66,10 +70,11 @@ ResPool::size_type ResPool::size() const { return _pimpl->size(); } - PoolItem ResPool::find( const sat::Solvable & slv_r ) const { return _pimpl->find( slv_r ); } + ResPool::EstablishedStates ResPool::establishedStates() const + { return _pimpl->establishedStates(); } ResPool::size_type ResPool::knownRepositoriesSize() const { return _pimpl->knownRepositoriesSize(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/ResPool.h new/libzypp-17.23.0/zypp/ResPool.h --- old/libzypp-17.22.1/zypp/ResPool.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.23.0/zypp/ResPool.h 2020-02-21 13:16:14.000000000 +0100 @@ -297,9 +297,57 @@ //@} public: - /** \name Special iterators. */ + /** \name Misc Data. */ //@{ + /////////////////////////////////////////////////////////////////// + /// A copy of the Pools initial ValidateValues of pseudo installed items. + /// + /// AKA Patch status. Whenever the Pools content changes, the status + /// of pseudo installed items (like Patches) is computed (roughly whether + /// their dependencies are broken or satisfied) and remembered. + /// + /// Comparing the items established state against it's current state + /// tells how the current transaction would influence the item (break + /// or repair a Patch). + /// + class EstablishedStates + { + public: + ~EstablishedStates(); + /** Map holding pseudo installed items where current and established status differ. */ + typedef std::map<PoolItem,ResStatus::ValidateValue> ChangedPseudoInstalled; + /** Return all pseudo installed items whose current state differs from the established one */ + ChangedPseudoInstalled changedPseudoInstalled() const; + private: + class Impl; + RW_pointer<Impl> _pimpl; + private: + friend class pool::PoolImpl; + /** Factory: \ref ResPool::establishedStates */ + EstablishedStates( shared_ptr<Impl> pimpl_r ) + : _pimpl { pimpl_r } + {} + }; + /////////////////////////////////////////////////////////////////// + /** Factory for \ref EstablishedStates. + * A few internal algorithms benefit from keeping an instance across pool + * content changes. User code usually want's to call \ref changedPseudoInstalled + * directly. + */ + EstablishedStates establishedStates() const; + + /** Map holding pseudo installed items where current and established status differ. */ + typedef EstablishedStates::ChangedPseudoInstalled ChangedPseudoInstalled; + + /** Return all pseudo installed items whose current state differs from their initial one. + * E.g. a Patch may become SATISFIED by updating the packages it refers to. + * For this to happen it does not matter whether you selected the Patch or + * whether you selected the individual Packages. + * A Patches status is computed and updated with every solver run. + */ + ChangedPseudoInstalled changedPseudoInstalled() const + { return establishedStates().changedPseudoInstalled(); } //@} public: /** \name Iterate over all Repositories that contribute ResObjects. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/ResStatus.cc new/libzypp-17.23.0/zypp/ResStatus.cc --- old/libzypp-17.22.1/zypp/ResStatus.cc 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.23.0/zypp/ResStatus.cc 2020-02-21 13:16:14.000000000 +0100 @@ -62,6 +62,37 @@ } } + namespace + { + // NOTE: Strings defined here are written to the history file + // and used by zypper. Do not change them! + static const char* strBROKEN = "needed"; + static const char* strSATISFIED = "applied"; + static const char* strNONRELEVANT = "not-needed"; + static const char* strUNDETERMINED = "undetermined"; + } + + std::string ResStatus::validateValueAsString( ValidateValue val_r ) + { + const char* ret = strUNDETERMINED; + switch ( val_r ) + { + case BROKEN: ret = strBROKEN; break; + case SATISFIED: ret = strSATISFIED; break; + case NONRELEVANT: ret = strNONRELEVANT; break; + case UNDETERMINED:break;// to avoid default: + } + return ret; + } + + ResStatus::ValidateValue ResStatus::stringToValidateValue( const std::string & str_r ) + { + ValidateValue ret = UNDETERMINED; + if ( str_r == strBROKEN ) ret = BROKEN; + else if ( str_r == strSATISFIED ) ret = SATISFIED; + else if ( str_r == strNONRELEVANT ) ret = NONRELEVANT; + return ret; + } /****************************************************************** ** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/ResStatus.h new/libzypp-17.23.0/zypp/ResStatus.h --- old/libzypp-17.22.1/zypp/ResStatus.h 2019-07-31 12:41:19.000000000 +0200 +++ new/libzypp-17.23.0/zypp/ResStatus.h 2020-02-21 13:16:14.000000000 +0100 @@ -225,6 +225,15 @@ bool isNonRelevant() const { return fieldValueIs<ValidateField>( NONRELEVANT ); } + std::string validateValueAsString() const + { return validateValueAsString( validate() ); } + + /** ValidateValue to string used in the history file. */ + static std::string validateValueAsString( ValidateValue val_r ); + + /** ValidateValue from string used in the history file. */ + static ValidateValue stringToValidateValue( const std::string & str_r ); + public: // These two are IMMUTABLE! diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/base/LogControl.h new/libzypp-17.23.0/zypp/base/LogControl.h --- old/libzypp-17.22.1/zypp/base/LogControl.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.23.0/zypp/base/LogControl.h 2020-02-20 17:31:12.000000000 +0100 @@ -13,6 +13,7 @@ #define ZYPP_BASE_LOGCONTROL_H #include <iosfwd> +#include <ostream> //for std::endl #include "zypp/base/Logger.h" #include "zypp/base/PtrTypes.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/pool/PoolImpl.cc new/libzypp-17.23.0/zypp/pool/PoolImpl.cc --- old/libzypp-17.22.1/zypp/pool/PoolImpl.cc 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.23.0/zypp/pool/PoolImpl.cc 2020-02-21 13:16:14.000000000 +0100 @@ -20,6 +20,12 @@ namespace zypp { ///////////////////////////////////////////////////////////////// + ResPool::EstablishedStates::~EstablishedStates() + {} + + ResPool::EstablishedStates::ChangedPseudoInstalled ResPool::EstablishedStates::changedPseudoInstalled() const + { return _pimpl->changedPseudoInstalled(); } + /////////////////////////////////////////////////////////////////// namespace pool { ///////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/pool/PoolImpl.h new/libzypp-17.23.0/zypp/pool/PoolImpl.h --- old/libzypp-17.22.1/zypp/pool/PoolImpl.h 2018-10-01 14:31:07.000000000 +0200 +++ new/libzypp-17.23.0/zypp/pool/PoolImpl.h 2020-02-21 13:16:14.000000000 +0100 @@ -105,6 +105,57 @@ } /////////////////////////////////////////////////////////////////// + namespace solver { + namespace detail { + void establish( sat::Queue & pseudoItems_r, sat::Queue & pseudoFlags_r ); // in solver/detail/SATResolver.cc + } + } + /////////////////////////////////////////////////////////////////// + /// Store initial establish status of pseudo installed items. + /// + class ResPool::EstablishedStates::Impl + { + public: + Impl() + { solver::detail::establish( _pseudoItems, _pseudoFlags ); } + + /** Return all pseudo installed items whose current state differs from their initial one. */ + ResPool::EstablishedStates::ChangedPseudoInstalled changedPseudoInstalled() const + { + ChangedPseudoInstalled ret; + + if ( ! _pseudoItems.empty() ) + { + for ( sat::Queue::size_type i = 0; i < _pseudoItems.size(); ++i ) + { + PoolItem pi { sat::Solvable(_pseudoItems[i]) }; + ResStatus::ValidateValue vorig { validateValue( i ) }; + if ( pi.status().validate() != vorig ) + ret[pi] = vorig; + } + } + return ret; + } + + private: + ResStatus::ValidateValue validateValue( sat::Queue::size_type i ) const + { + ResStatus::ValidateValue ret { ResStatus::UNDETERMINED }; + switch ( _pseudoFlags[i] ) + { + case 0: ret = ResStatus::BROKEN /*2*/; break; + case 1: ret = ResStatus::SATISFIED /*4*/; break; + case -1: ret = ResStatus::NONRELEVANT /*6*/; break; + } + return ret; + } + + private: + sat::Queue _pseudoItems; + sat::Queue _pseudoFlags; + }; + + /////////////////////////////////////////////////////////////////// namespace pool { ///////////////////////////////////////////////////////////////// @@ -128,6 +179,8 @@ typedef sat::detail::SolvableIdType SolvableIdType; + typedef ResPool::EstablishedStates::Impl EstablishedStatesImpl; + public: /** Default ctor */ PoolImpl(); @@ -198,6 +251,14 @@ return *_poolProxy; } + /** True factory for \ref ResPool::EstablishedStates. + * Internally we maintain the ResPool::EstablishedStates::Impl + * reference shared_ptr. Updated whenever the pool content changes. + * On demand hand it out as ResPool::EstablishedStates Impl. + */ + ResPool::EstablishedStates establishedStates() const + { store(); return ResPool::EstablishedStates( _establishedStates ); } + public: /** Forward list of Repositories that contribute ResObjects from \ref sat::Pool */ size_type knownRepositoriesSize() const @@ -352,6 +413,10 @@ { reapplyHardLocks(); } + + // Compute the initial status of Patches etc. + if ( !_establishedStates ) + _establishedStates.reset( new EstablishedStatesImpl ); } return _store; } @@ -394,6 +459,7 @@ _id2itemDirty = true; _id2item.clear(); _poolProxy.reset(); + _establishedStates.reset(); } private: @@ -408,6 +474,7 @@ private: mutable shared_ptr<ResPoolProxy> _poolProxy; + mutable shared_ptr<EstablishedStatesImpl> _establishedStates; private: /** Set of queries that define hardlocks. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/sat/Transaction.h new/libzypp-17.23.0/zypp/sat/Transaction.h --- old/libzypp-17.22.1/zypp/sat/Transaction.h 2019-07-31 12:41:19.000000000 +0200 +++ new/libzypp-17.23.0/zypp/sat/Transaction.h 2020-02-21 13:16:14.000000000 +0100 @@ -165,6 +165,8 @@ /** Pointer behind the last action step in transaction. */ action_iterator actionEnd() const; + /** Iterate the [filtered] transaction steps. */ + Iterable<action_iterator> action( StepStages filter_r = StepStages() ) const; //@} public: @@ -392,6 +394,9 @@ return cnt; } + inline Iterable<Transaction::action_iterator> Transaction::action( StepStages filter_r ) const + { return makeIterable( actionBegin( filter_r ), actionEnd() ); } + ///////////////////////////////////////////////////////////////// } // namespace sat /////////////////////////////////////////////////////////////////// diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/solver/detail/SATResolver.cc new/libzypp-17.23.0/zypp/solver/detail/SATResolver.cc --- old/libzypp-17.22.1/zypp/solver/detail/SATResolver.cc 2020-01-24 09:06:07.000000000 +0100 +++ new/libzypp-17.23.0/zypp/solver/detail/SATResolver.cc 2020-02-21 13:16:14.000000000 +0100 @@ -37,6 +37,7 @@ #include "zypp/ZConfig.h" #include "zypp/Product.h" +#include "zypp/AutoDispose.h" #include "zypp/sat/WhatProvides.h" #include "zypp/sat/WhatObsoletes.h" #include "zypp/sat/detail/PoolImpl.h" @@ -90,6 +91,74 @@ } } + /** Helper collecting pseudo installed items from the pool. + * \todo: pseudoItems are cachable as long as pool content does not change + */ + inline sat::Queue collectPseudoInstalled( const ResPool & pool_r ) + { + sat::Queue ret; + for ( const PoolItem & pi : pool_r ) + if ( traits::isPseudoInstalled( pi.kind() ) ) ret.push( pi.id() ); + return ret; + } + + /** Copy back new \ref WeakValue to \ref PoolItem after solving. + * On the fly collect orphaned items (cached by the solver for the UI) + */ + inline void solverCopyBackWeak( sat::detail::CSolver & satSolver_r, PoolItemList & orphanedItems_r ) + { + // NOTE: assert all items weak stati are reset (resetWeak was called) + { + sat::Queue recommendations; + sat::Queue suggestions; + ::solver_get_recommendations( &satSolver_r, recommendations, suggestions, 0 ); + for ( sat::Queue::size_type i = 0; i < recommendations.size(); ++i ) + PoolItem(sat::Solvable(i)).status().setRecommended( true ); + for ( sat::Queue::size_type i = 0; i < suggestions.size(); ++i ) + PoolItem(sat::Solvable(i)).status().setSuggested( true ); + } + { + orphanedItems_r.clear(); // cached on the fly + sat::Queue orphaned; + ::solver_get_orphaned( &satSolver_r, orphaned ); + for ( sat::Queue::size_type i = 0; i < orphaned.size(); ++i ) + { + PoolItem pi { sat::Solvable(i) }; + pi.status().setOrphaned( true ); + orphanedItems_r.push_back( pi ); + } + } + { + sat::Queue unneeded; + ::solver_get_unneeded( &satSolver_r, unneeded, 1 ); + for ( sat::Queue::size_type i = 0; i < unneeded.size(); ++i ) + PoolItem(sat::Solvable(i)).status().setUnneeded( true ); + } + } + + /** Copy back new \ref ValidateValue to \ref PoolItem after solving. */ + inline void solverCopyBackValidate( sat::detail::CSolver & satSolver_r, const ResPool & pool_r ) + { + sat::Queue pseudoItems { collectPseudoInstalled( pool_r ) }; + if ( ! pseudoItems.empty() ) + { + sat::Queue pseudoFlags; + ::solver_trivial_installable( &satSolver_r, pseudoItems, pseudoFlags ); + + for ( sat::Queue::size_type i = 0; i < pseudoItems.size(); ++i ) + { + PoolItem pi { sat::Solvable(pseudoItems[i]) }; + switch ( pseudoFlags[i] ) + { + case 0: pi.status().setBroken(); break; + case 1: pi.status().setSatisfied(); break; + case -1: pi.status().setNonRelevant(); break; + default: pi.status().setUndetermined(); break; + } + } + } + } + } //namespace /////////////////////////////////////////////////////////////////////// @@ -110,6 +179,50 @@ IdString(solvable2->vendor) ) ? 0 : 1; } +/** ResPool helper to compute the initial status of Patches etc. + * An empty solver run (no jobs) just to compute the initial status + * of pseudo installed items (patches). + */ +void establish( sat::Queue & pseudoItems_r, sat::Queue & pseudoFlags_r ) +{ + pseudoItems_r = collectPseudoInstalled( ResPool::instance() ); + if ( ! pseudoItems_r.empty() ) + { + MIL << "Establish..." << endl; + sat::detail::CPool * cPool { sat::Pool::instance().get() }; + ::pool_set_custom_vendorcheck( cPool, &vendorCheck ); + + sat::Queue jobQueue; + // Add rules for parallel installable resolvables with different versions + for ( const sat::Solvable & solv : sat::Pool::instance().multiversion() ) + { + jobQueue.push( SOLVER_NOOBSOLETES | SOLVER_SOLVABLE ); + jobQueue.push( solv.id() ); + } + + AutoDispose<sat::detail::CSolver*> cSolver { ::solver_create( cPool ), ::solver_free }; + sat::Pool::instance().prepare(); + if ( ::solver_solve( cSolver, jobQueue ) != 0 ) + INT << "How can establish fail?" << endl; + + ::solver_trivial_installable( cSolver, pseudoItems_r, pseudoFlags_r ); + + for ( sat::Queue::size_type i = 0; i < pseudoItems_r.size(); ++i ) + { + PoolItem pi { sat::Solvable(pseudoItems_r[i]) }; + switch ( pseudoFlags_r[i] ) + { + case 0: pi.status().setBroken(); break; + case 1: pi.status().setSatisfied(); break; + case -1: pi.status().setNonRelevant(); break; + default: pi.status().setUndetermined(); break; + } + } + MIL << "Establish DONE" << endl; + } + else + MIL << "Establish not needed." << endl; +} inline std::string itemToString( const PoolItem & item ) { @@ -127,14 +240,6 @@ return ret; } -inline PoolItem getPoolItem( Id id_r ) -{ - PoolItem ret( (sat::Solvable( id_r )) ); - if ( !ret && id_r ) - INT << "id " << id_r << " not found in ZYPP pool." << endl; - return ret; -} - //--------------------------------------------------------------------------- std::ostream & @@ -358,24 +463,6 @@ }; -class CollectPseudoInstalled : public resfilter::PoolItemFilterFunctor -{ - public: - Queue *solvableQueue; - - CollectPseudoInstalled( Queue *queue ) - :solvableQueue (queue) - {} - - // collecting PseudoInstalled items - bool operator()( PoolItem item ) - { - if ( traits::isPseudoInstalled( item.satSolvable().kind() ) ) - queue_push( solvableQueue, item.satSolvable().id() ); - return true; - } -}; - bool SATResolver::solving(const CapabilitySet & requires_caps, const CapabilitySet & conflict_caps) @@ -441,7 +528,7 @@ { if ( id < 0 ) continue; - sat::Solvable slv { id }; + sat::Solvable slv { (sat::detail::SolvableIdType)id }; // get product buddies (they carry the weakremover)... static const Capability productCap { "product()" }; if ( slv && slv.provides().matches( productCap ) ) @@ -484,7 +571,7 @@ if ( p < 0 ) continue; - sat::Solvable slv { p }; + sat::Solvable slv { (sat::detail::SolvableIdType)p }; if ( ! slv || slv.isSystem() ) continue; @@ -534,81 +621,10 @@ } } - Queue recommendations; - Queue suggestions; - Queue orphaned; - Queue unneeded; - queue_init(&recommendations); - queue_init(&suggestions); - queue_init(&orphaned); - queue_init(&unneeded); - solver_get_recommendations(_satSolver, &recommendations, &suggestions, 0); - solver_get_orphaned(_satSolver, &orphaned); - solver_get_unneeded(_satSolver, &unneeded, 1); - /* solvables which are recommended */ - for ( int i = 0; i < recommendations.count; ++i ) - { - PoolItem poolItem( getPoolItem( recommendations.elements[i] ) ); - poolItem.status().setRecommended( true ); - } - - /* solvables which are suggested */ - for ( int i = 0; i < suggestions.count; ++i ) - { - PoolItem poolItem( getPoolItem( suggestions.elements[i] ) ); - poolItem.status().setSuggested( true ); - } - - _problem_items.clear(); - /* solvables which are orphaned */ - for ( int i = 0; i < orphaned.count; ++i ) - { - PoolItem poolItem( getPoolItem( orphaned.elements[i] ) ); - poolItem.status().setOrphaned( true ); - _problem_items.push_back( poolItem ); - } - - /* solvables which are unneeded */ - for ( int i = 0; i < unneeded.count; ++i ) - { - PoolItem poolItem( getPoolItem( unneeded.elements[i] ) ); - poolItem.status().setUnneeded( true ); - } - - queue_free(&recommendations); - queue_free(&suggestions); - queue_free(&orphaned); - queue_free(&unneeded); - - /* Write validation state back to pool */ - Queue flags, solvableQueue; - - queue_init(&flags); - queue_init(&solvableQueue); - - CollectPseudoInstalled collectPseudoInstalled(&solvableQueue); - invokeOnEach( _pool.begin(), - _pool.end(), - functor::functorRef<bool,PoolItem> (collectPseudoInstalled) ); - solver_trivial_installable(_satSolver, &solvableQueue, &flags ); - for (int i = 0; i < solvableQueue.count; i++) { - PoolItem item = _pool.find (sat::Solvable(solvableQueue.elements[i])); - item.status().setUndetermined(); - - if (flags.elements[i] == -1) { - item.status().setNonRelevant(); - XDEBUG("SATSolutionToPool(" << item << " ) nonRelevant !"); - } else if (flags.elements[i] == 1) { - item.status().setSatisfied(); - XDEBUG("SATSolutionToPool(" << item << " ) satisfied !"); - } else if (flags.elements[i] == 0) { - item.status().setBroken(); - XDEBUG("SATSolutionToPool(" << item << " ) broken !"); - } - } - queue_free(&(solvableQueue)); - queue_free(&flags); - + // copy back computed status values to pool + // (on the fly cache orphaned items for the UI) + solverCopyBackWeak( *_satSolver, _problem_items ); + solverCopyBackValidate( *_satSolver, _pool ); // Solvables which were selected due requirements which have been made by the user will // be selected by APPL_LOW. We can't use any higher level, because this setting must @@ -895,7 +911,7 @@ if ( p < 0 ) continue; - sat::Solvable solv { p }; + sat::Solvable solv { (sat::detail::SolvableIdType)p }; if ( ! solv || solv.isSystem() ) continue; @@ -927,6 +943,12 @@ ERR << "id " << i << " not found in ZYPP pool." << endl; } } + + // copy back computed status values to pool + // (on the fly cache orphaned items for the UI) + solverCopyBackWeak( *_satSolver, _problem_items ); + solverCopyBackValidate( *_satSolver, _pool ); + MIL << "SATResolver::doUpdate() done" << endl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libzypp-17.22.1/zypp/target/TargetImpl.cc new/libzypp-17.23.0/zypp/target/TargetImpl.cc --- old/libzypp-17.22.1/zypp/target/TargetImpl.cc 2019-12-19 12:41:16.000000000 +0100 +++ new/libzypp-17.23.0/zypp/target/TargetImpl.cc 2020-02-21 13:16:14.000000000 +0100 @@ -698,6 +698,31 @@ sendNotification( root_r, result_r.updateMessages() ); } + /** jsc#SLE-5116: Log patch status changes to history. + * Adjust precomputed set if transaction is incomplete. + */ + void logPatchStatusChanges( const sat::Transaction & transaction_r, TargetImpl & target_r ) + { + ResPool::ChangedPseudoInstalled changedPseudoInstalled { ResPool::instance().changedPseudoInstalled() }; + if ( changedPseudoInstalled.empty() ) + return; + + if ( ! transaction_r.actionEmpty( ~sat::Transaction::STEP_DONE ) ) + { + // Need to recompute the patch list if commit is incomplete! + // We remember the initially established status, then reload the + // Target to get the current patch status. Then compare. + WAR << "Need to recompute the patch status changes as commit is incomplete!" << endl; + ResPool::EstablishedStates establishedStates{ ResPool::instance().establishedStates() }; + target_r.load(); + changedPseudoInstalled = establishedStates.changedPseudoInstalled(); + } + + HistoryLog historylog; + for ( const auto & el : changedPseudoInstalled ) + historylog.patchStateChange( el.first, el.second ); + } + ///////////////////////////////////////////////////////////////// } // namespace /////////////////////////////////////////////////////////////////// @@ -1711,8 +1736,14 @@ result_r ); } + // jsc#SLE-5116: Log patch status changes to history + // NOTE: Should be the last action as it may need to reload + // the Target in case of an incomplete transaction. + logPatchStatusChanges( result_r.transaction(), *this ); + if ( abort ) { + HistoryLog().comment( "Commit was aborted." ); ZYPP_THROW( TargetAbortedException( ) ); } }

1 0

commit xfsprogs for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package xfsprogs for openSUSE:Factory checked in at 2020-02-29 21:21:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xfsprogs (Old) and /work/SRC/openSUSE:Factory/.xfsprogs.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "xfsprogs" Sat Feb 29 21:21:11 2020 rev:58 rq:764773 version:5.4.0 Changes: -------- --- /work/SRC/openSUSE:Factory/xfsprogs/xfsprogs.changes 2019-05-06 21:14:59.080710008 +0200 +++ /work/SRC/openSUSE:Factory/.xfsprogs.new.26092/xfsprogs.changes 2020-02-29 21:21:16.142131139 +0100 @@ -1,0 +2,92 @@ +Tue Jan 14 15:37:43 UTC 2020 - Anthony Iliopoulos <ailiopoulos(a)suse.com> + +- split xfs scrubbing scripts and service files into a separate optional + package, in order to avoid having python as a dependency in the main + xfsprogs rpm (bsc#1157438). + +------------------------------------------------------------------- +Tue Jan 14 13:35:29 UTC 2020 - Anthony Iliopoulos <ailiopoulos(a)suse.com> + +- update to v5.4.0: + * xfsprogs: Release v5.4.0 + * xfsprogs: Release v5.4.0-rc1 + * mkfs: tidy up discard notifications + * mkfs: Break block discard into chunks of 2 GB + * xfs_admin: enable online label getting and setting + * xfs_admin: support external log devices + * xfsprogs: add missing line feeds in libxfs/rdwr.c + * xfsprogs: remove stray libxfs whitespace + * xfsprogs: Release v5.4.0-rc0 + * xfs: change the seconds fields in xfs_bulkstat to signed + * xfs: move local to extent inode logging into bmap helper + * xfs: remove broken error handling on failed attr sf to leaf change + * xfs: log the inode on directory sf to block format change + * xfs: remove unused flags arg from xfs_get_aghdr_buf() + * xfs: log proper length of superblock + * xfs: revert 1baa2800e62d ("xfs: remove the unused XFS_ALLOC_USERDATA flag") + * xfs: convert inode to extent format after extent merge due to shift + * xfs: define a flags field for the AG geometry ioctl structure + * xfs: add a xfs_valid_startblock helper + * xfs: remove the unused XFS_ALLOC_USERDATA flag + * xfs: allocate xattr buffer on demand + * xfs: consolidate attribute value copying + * xfs: move remote attr retrieval into xfs_attr3_leaf_getvalue + * xfs: remove unnecessary indenting from xfs_attr3_leaf_getvalue + * xfs: make attr lookup returns consistent + * xfs: reverse search directory freespace indexes + * xfs: speed up directory bestfree block scanning + * xfs: factor free block index lookup from xfs_dir2_node_addname_int() + * xfs: factor data block addition from xfs_dir2_node_addname_int() + * xfs: move xfs_dir2_addname() + * xfs: remove all *_ITER_CONTINUE values + * xfs: remove all *_ITER_ABORT values + * xfs: reinitialize rm_flags when unpacking an offset into an rmap irec + * xfs: remove unnecessary int returns from deferred bmap functions + * xfs: remove unnecessary int returns from deferred refcount functions + * xfs: remove unnecessary int returns from deferred rmap functions + * xfs: remove unnecessary parameter from xfs_iext_inc_seq + * xfs: fix sign handling problem in xfs_bmbt_diff_two_keys + * xfs: don't return _QUERY_ABORT from xfs_rmap_has_other_keys + * xfs: fix maxicount division by zero error + * xfs: remove excess function parameter description in 'xfs_btree_sblock_v5hdr_verify' + * xfs: add kmem allocation trace points + * fs: xfs: Remove KM_NOSLEEP and KM_SLEEP. + +------------------------------------------------------------------- +Thu Dec 05 00:53:15 UTC 2019 - seanlew(a)opensuse.org + +- update to v.5.3.0 + * mkfs.xfs: use libfx to write out AGs versus open coding + * mkfs.xfs: fix incorrect error message during AG init + * xfs_repair: better info when metadata updates fail + * xfs_growfs: allow mounted device node as argument + * xfs_spaceman: always report sick metadata + * xfs_io: add a bulkstat command + * xfs_io: encrypt command enhancements + * xfs_io: copy_file_range fixes + * man: document several new ioctls + * xfs_scrub: copious rewriting + * libfrog: header moves, refactoring, updates + * libxfs: fix buffer refcounting + +------------------------------------------------------------------- +Sat Aug 17 20:21:35 UTC 2019 - Stephan Kulow <coolo(a)suse.com> + +- update to v5.2.0 + - libxfs: cosmetic changes to trans.c to match kernel (Eric Sandeen) + - libxfs changes merged from kernel 5.2 + - mkfs: enable reflink by default (Darrick Wong) + - mkfs: fix stripe unit handling (Allison Collins) + - mkfs: remove useless log options in usage() (Yang Xu) + - mkfs: validate start and end of aligned logs (Darrick Wong) + - xfs_quota: fix built-in help for project setup (Eric Sandeen) + - xfs_io: allow passing an open file to copy_range (Amir Goldstein) + - xfs_info: limit findmnt to mounted xfs filesystems (Amir Goldstein) + - man: break out several ioctl man pages (Darrick Wong) + - man: Fix an inconsistency in the mkfs man page (Alvin Zheng) + - xfs_scrub: fix background-mode sleep throttling (Darrick Wong) + - libxfs: sync up xfs_trans_inode.c with the kernel (Eric Sandeen) + - libfrog: fix bitmap return values (Darrick Wong) + - libfrog: don't set negative errno in conversion f'ns (Darrick Wong) + +------------------------------------------------------------------- Old: ---- xfsprogs-5.0.0.tar.sign xfsprogs-5.0.0.tar.xz New: ---- xfsprogs-5.4.0.tar.sign xfsprogs-5.4.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xfsprogs.spec ++++++ --- /var/tmp/diff_new_pack.n6jKj5/_old 2020-02-29 21:21:17.230133292 +0100 +++ /var/tmp/diff_new_pack.n6jKj5/_new 2020-02-29 21:21:17.238133308 +0100 @@ -1,7 +1,7 @@ # # spec file for package xfsprogs # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,12 +26,12 @@ %define libname libhandle1 Name: xfsprogs -Version: 5.0.0 +Version: 5.4.0 Release: 0 Summary: Utilities for managing the XFS file system License: GPL-2.0-or-later Group: System/Filesystems -URL: http://xfs.org +URL: https://xfs.wiki.kernel.org/ Source0: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-%{version}.… Source1: https://www.kernel.org/pub/linux/utils/fs/xfs/xfsprogs/xfsprogs-%{version}.… Source2: %{name}.keyring @@ -56,6 +56,7 @@ %if %{with systemd} BuildRequires: pkgconfig(systemd) %endif +Suggests: xfsprogs-scrub %description A set of commands to use the XFS file system, including mkfs.xfs. @@ -67,9 +68,9 @@ (directories, extents, and free space) to aid both performance and scalability. -Refer to the documentation at http://oss.sgi.com/projects/xfs/ for -complete details. This implementation is on-disk compatible with the -IRIX version of XFS. +Refer to the documentation at https://xfs.wiki.kernel.org/ for complete +details. This implementation is on-disk compatible with the IRIX +version of XFS. %package -n %{libname} Summary: XFS Filesystem-specific Shared library @@ -97,6 +98,16 @@ system-specific programs. If you install xfsprogs-devel, you will also want to install xfsprogs. +%package -n xfsprogs-scrub +Summary: XFS scrubbing scripts and service files +License: GPL-2.0-or-later +Group: System/Filesystems +Requires: xfsprogs + +%description -n xfsprogs-scrub +Scripts and systemd service files for background scrubbing of metadata +on xfs filesystems. + %prep %setup -q %patch0 -p1 @@ -138,16 +149,16 @@ install -m 0644 %{SOURCE4} %{buildroot}/%{_dracutmodulesdir}/95suse-xfs/ %if %{with systemd} -%pre +%pre -n xfsprogs-scrub %service_add_pre xfs_scrub_all.service xfs_scrub_all.timer -%post +%post -n xfsprogs-scrub %service_add_post xfs_scrub_all.service xfs_scrub_all.timer -%preun +%preun -n xfsprogs-scrub %service_del_preun xfs_scrub_all.service xfs_scrub_all.timer -%postun +%postun -n xfsprogs-scrub %service_del_postun xfs_scrub_all.service xfs_scrub_all.timer %endif @@ -168,15 +179,7 @@ /sbin/* #EndUsrMerge %{_sbindir}/* -%dir %{_libdir}/xfsprogs/ -%{_libdir}/xfsprogs/xfs_scrub_all.cron -%if %{with systemd} -%{_libdir}/xfsprogs/xfs_scrub_fail -%{_unitdir}/xfs_scrub@.service -%{_unitdir}/xfs_scrub_all.service -%{_unitdir}/xfs_scrub_all.timer -%{_unitdir}/xfs_scrub_fail@.service -%endif +%exclude %{_sbindir}/xfs_scrub_all %{_mandir}/man[258]/* %doc %{_defaultdocdir}/%{name} %if 0%{?suse_version} >= 1315 @@ -201,4 +204,17 @@ %{_libdir}/libhandle.so %{_mandir}/man3/* +%files -n xfsprogs-scrub +%defattr(-,root,root,755) +%dir %{_libdir}/xfsprogs/ +%{_libdir}/xfsprogs/xfs_scrub_all.cron +%{_sbindir}/xfs_scrub_all +%if %{with systemd} +%{_libdir}/xfsprogs/xfs_scrub_fail +%{_unitdir}/xfs_scrub@.service +%{_unitdir}/xfs_scrub_all.service +%{_unitdir}/xfs_scrub_all.timer +%{_unitdir}/xfs_scrub_fail@.service +%endif + %changelog ++++++ xfsprogs-5.0.0.tar.xz -> xfsprogs-5.4.0.tar.xz ++++++ ++++ 49196 lines of diff (skipped)

1 0

commit mailutils for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package mailutils for openSUSE:Factory checked in at 2020-02-29 21:21:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mailutils (Old) and /work/SRC/openSUSE:Factory/.mailutils.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "mailutils" Sat Feb 29 21:21:09 2020 rev:8 rq:779936 version:3.8 Changes: -------- --- /work/SRC/openSUSE:Factory/mailutils/mailutils.changes 2019-12-11 12:02:40.240802300 +0100 +++ /work/SRC/openSUSE:Factory/.mailutils.new.26092/mailutils.changes 2020-02-29 21:21:13.674126255 +0100 @@ -1,0 +2,7 @@ +Thu Feb 27 10:51:15 UTC 2020 - Dr. Werner Fink <werner(a)suse.de> + +- Add patch silent-common-mu_tcp_wrapper_daemon.patch + * Add extern in header file declaration of variable + mu_tcp_wrapper_daemon (boo#1164444) + +------------------------------------------------------------------- New: ---- silent-common-mu_tcp_wrapper_daemon.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mailutils.spec ++++++ --- /var/tmp/diff_new_pack.SKtkmk/_old 2020-02-29 21:21:14.570128028 +0100 +++ /var/tmp/diff_new_pack.SKtkmk/_new 2020-02-29 21:21:14.578128044 +0100 @@ -1,7 +1,7 @@ # # spec file for package mailutils # -# Copyright (c) 2019 SUSE LLC +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,6 +37,8 @@ # PATCH-FIX-UPSTREAM python38-compat.patch http://savannah.gnu.org/bugs/index.php?57318 mcepl(a)suse.com # Remove incompatibility with Python 3.8+ Patch4: python38-compat.patch +# PATCH-FIX-SUSE add extern in header file declaration of variable mu_tcp_wrapper_daemon (boo#1164444) +Patch5: silent-common-mu_tcp_wrapper_daemon.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: bison @@ -179,6 +181,7 @@ %patch0 %patch2 %patch4 -p1 +%patch5 set -- %(rpm -q --queryformat '%%{VERSION}' guile-devel | sed -r 's@\.@ @g') (cat > guile.list)<<-EOF %dir %{_datadir}/guile/site/$1.$2/ ++++++ silent-common-mu_tcp_wrapper_daemon.patch ++++++ --- lib/tcpwrap.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- lib/tcpwrap.h +++ lib/tcpwrap.h 2020-02-27 10:47:52.529084180 +0000 @@ -17,7 +17,7 @@ #include <mailutils/types.h> extern int mu_tcp_wrapper_enable; -const char *mu_tcp_wrapper_daemon; +extern const char *mu_tcp_wrapper_daemon; extern int mu_tcpwrapper_access (int fd); extern void mu_tcpwrapper_cfg_init (void); extern int mu_tcp_wrapper_prefork (int fd,

1 0

commit gdk-pixbuf for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package gdk-pixbuf for openSUSE:Factory checked in at 2020-02-29 21:21:00 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/gdk-pixbuf (Old) and /work/SRC/openSUSE:Factory/.gdk-pixbuf.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "gdk-pixbuf" Sat Feb 29 21:21:00 2020 rev:78 rq:779892 version:2.40.0 Changes: -------- --- /work/SRC/openSUSE:Factory/gdk-pixbuf/gdk-pixbuf.changes 2020-02-03 11:26:55.534138004 +0100 +++ /work/SRC/openSUSE:Factory/.gdk-pixbuf.new.26092/gdk-pixbuf.changes 2020-02-29 21:21:09.894118774 +0100 @@ -1,0 +2,17 @@ +Mon Feb 24 01:29:03 UTC 2020 - Yifan Jiang <yfjiang(a)suse.com> + +- A file tests/test-images/gif-test-suite/max-width.gif from the + test suite is correctly identified by clamav to be a malicious + BC.Gif.Exploit.Agent-1425366.Agent. This is an intentional part + of the test suite to ensure it has no negative side effects. + + On SLE, the package is built with clamav scanning, which then + prevents a successful build. This change repacks the source + package to a password-protected zip to bypass the clamav scanning + for SLE (bsc#1159337), with following update: + + + Download upstream tarball through source service + + Add pre_checkin.sh to convert tarball to zip file + + Update spec-file to use the zip file as main source + +------------------------------------------------------------------- Old: ---- gdk-pixbuf-2.40.0.tar.xz New: ---- _service gdk-pixbuf-2.40.0.zip pre_checkin.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdk-pixbuf.spec ++++++ --- /var/tmp/diff_new_pack.udetm4/_old 2020-02-29 21:21:11.774122495 +0100 +++ /var/tmp/diff_new_pack.udetm4/_new 2020-02-29 21:21:11.798122542 +0100 @@ -1,7 +1,7 @@ # # spec file for package gdk-pixbuf # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,11 @@ Group: Development/Libraries/GNOME URL: https://www.gnome.org/ -Source0: https://download.gnome.org/sources/gdk-pixbuf/2.40/%{name}-%{version}.tar.xz +# A filefrom the test suite is correctly identified by clamav to be a +# malicious BC.Gif.Exploit.Agent-1425366.Agent. This is an intentional part of +# the test suite to ensure it has no negative side effects. Change the Source0 +# from tar.xz to zip to bypass clamav scanning on SLE. +Source0: %{name}-%{version}.zip Source1: macros.gdk-pixbuf Source2: README.SUSE Source3: gdk-pixbuf-rpmlintrc @@ -40,6 +44,7 @@ BuildRequires: meson BuildRequires: pkgconfig BuildRequires: translation-update-upstream +BuildRequires: unzip BuildRequires: xsltproc BuildRequires: pkgconfig(glib-2.0) >= 2.48.0 BuildRequires: pkgconfig(gobject-introspection-1.0) @@ -127,7 +132,8 @@ %lang_package %prep -%autosetup -p1 +%setup -c -T -q +unzip -P gecko %{SOURCE0} translation-update-upstream %if "%{_lib}" == "lib64" cp -a %{SOURCE2} . ++++++ _service ++++++ <services> <service name="download_url" mode="disabled"> <param name="protocol">https</param> <param name="host">download.gnome.org</param> <param name="path">sources/gdk-pixbuf/2.40/gdk-pixbuf-2.40.0.tar.xz</param> </service> <service name="set_version" mode="disabled" /> </services> ++++++ pre_checkin.sh ++++++ #!/bin/sh # To update the package: ## 1. update the version tags in _service ## 2. run `osc service ra`; # get the upstream release, and set the version string in spec ## 3. run `./pre_checkin.sh`; # generate the zip file ## 4. edit changelog and commit the change # the tar.xz file generated by the step 2 is not necessarily to commit EXTRACTDIR=$(mktemp -d); BASENAME=$(grep ^Name\: gdk-pixbuf.spec | cut -d: -f2 | sed 's/[[:space:]]//g'); VERSION=$(grep ^Version\: gdk-pixbuf.spec | cut -d: -f2 | sed 's/[[:space:]]//g'); tar xvfJ $BASENAME-$VERSION.tar.xz -C $EXTRACTDIR; pushd $EXTRACTDIR/$BASENAME-$VERSION && zip -r -P gecko $BASENAME-$VERSION.zip * && popd && mv $EXTRACTDIR/$BASENAME-$VERSION/$BASENAME-$VERSION.zip .; rm -fr $EXTRACTDIR && rm -fr $BASENAME-$VERSION.tar.xz;

1 0

commit MozillaFirefox for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2020-02-29 21:20:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "MozillaFirefox" Sat Feb 29 21:20:30 2020 rev:306 rq:779878 version:73.0.1 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2020-02-25 16:03:34.948260568 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new.26092/MozillaFirefox.changes 2020-02-29 21:20:44.490068501 +0100 @@ -1,0 +2,11 @@ +Wed Feb 26 08:12:00 UTC 2020 - Wolfgang Rosenauer <wr(a)rosenauer.org> + +- big endian fixes + +------------------------------------------------------------------- +Tue Feb 25 14:17:00 UTC 2020 - Guillaume GARDET <guillaume.gardet(a)opensuse.org> + +- Fix build on aarch64/armv7 with: + * mozilla-bmo1610814.patch (boo#1164845, bmo#1610814) + +------------------------------------------------------------------- @@ -10 +21 @@ - (bmo#1614535) + (bmo#1614535, boo#1164646) New: ---- mozilla-bmo1610814.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.jw9xvH/_old 2020-02-29 21:21:03.994107098 +0100 +++ /var/tmp/diff_new_pack.jw9xvH/_new 2020-02-29 21:21:03.994107098 +0100 @@ -186,6 +186,7 @@ Patch20: mozilla-fix-top-level-asm.patch Patch21: mozilla-bmo1504834-part4.patch Patch22: mozilla-bmo849632.patch +Patch23: mozilla-bmo1610814.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -321,6 +322,7 @@ %patch20 -p1 %patch21 -p1 %patch22 -p1 +%patch23 -p1 # Firefox %patch101 -p1 %patch102 -p1 ++++++ mozilla-bmo1504834-part2.patch ++++++ --- /var/tmp/diff_new_pack.jw9xvH/_old 2020-02-29 21:21:05.850110771 +0100 +++ /var/tmp/diff_new_pack.jw9xvH/_new 2020-02-29 21:21:05.850110771 +0100 @@ -23,7 +23,7 @@ + void ConvolutionFilter::ConvolveHorizontally(const uint8_t* aSrc, uint8_t* aDst, bool aHasAlpha) { -+#if MOZ_BIG_ENDIAN ++#if MOZ_BIG_ENDIAN() + int outputSize = mFilter->numValues(); + + // Input size isn't handed in, so we have to calculate it quickly @@ -40,7 +40,7 @@ + SkOpts::convolve_horizontally(aSrc, *mFilter, aDst, aHasAlpha); + -+#if MOZ_BIG_ENDIAN ++#if MOZ_BIG_ENDIAN() + ByteSwapArray((uint8_t*)aSrc, inputSize); + ByteSwapArray(aDst, outputSize); +#endif @@ -52,7 +52,7 @@ auto filterValues = mFilter->FilterForValue(aRowIndex, &filterOffset, &filterLength); + -+#if MOZ_BIG_ENDIAN ++#if MOZ_BIG_ENDIAN() + for (int filterY = 0; filterY < filterLength; filterY++) { + // Skia only knows LE, so we have to swizzle the input + ByteSwapArray(aSrc[filterY], aRowSize); @@ -62,7 +62,7 @@ SkOpts::convolve_vertically(filterValues, filterLength, aSrc, aRowSize, aDst, aHasAlpha); + -+#if MOZ_BIG_ENDIAN ++#if MOZ_BIG_ENDIAN() + // After skia is finished, we swizzle back to BE, in case + // the input is used again somewhere else + for (int filterY = 0; filterY < filterLength; filterY++) { ++++++ mozilla-bmo1504834-part4.patch ++++++ --- /var/tmp/diff_new_pack.jw9xvH/_old 2020-02-29 21:21:05.858110787 +0100 +++ /var/tmp/diff_new_pack.jw9xvH/_new 2020-02-29 21:21:05.858110787 +0100 @@ -17,7 +17,7 @@ SkCanvas::kPreserveLCDText_SaveLayerFlag | (aCopyBackground ? SkCanvas::kInitWithPrevious_SaveLayerFlag : 0)); -+#if MOZ_BIG_ENDIAN ++#if MOZ_BIG_ENDIAN() + // Pushing a layer where an aMask is defined produces wrong output. + // We _should_ endian swap the data, but I couldn't find a workable way to do so + // Therefore I deactivate those layers in the meantime. ++++++ mozilla-bmo1610814.patch ++++++ # HG changeset patch # User Andrew Osmond <aosmond(a)mozilla.com> # Date 1579706360 0 # Node ID b3d8b08265b800165d684281d19ac845a8ff9a66 # Parent 50c371b37a9fcd994a5866db73bd0d078e19f95d Bug 1610814 - Fix NEON compile error with gcc and RGB unpacking. r=lsalzman This patch makes us use the correct intrinsic for loading a uint8x16 register. It is not entirely clear why clang accepts this without complaint but beyond the types, it should be equivalent. Differential Revision: https://phabricator.services.mozilla.com/D60667 diff --git a/gfx/2d/SwizzleNEON.cpp b/gfx/2d/SwizzleNEON.cpp --- a/gfx/2d/SwizzleNEON.cpp +++ b/gfx/2d/SwizzleNEON.cpp @@ -407,25 +407,25 @@ void UnpackRowRGB24_NEON(const uint8_t* } uint8x16_t alpha = vreinterpretq_u8_u32(vdupq_n_u32(0xFF000000)); // Process all 4-pixel chunks as one vector. src -= 4 * 3; dst -= 4 * 4; while (src >= aSrc) { - uint8x16_t px = vld1q_u16(reinterpret_cast<const uint16_t*>(src)); + uint8x16_t px = vld1q_u8(src); // G2R2B1G1 R1B0G0R0 -> X1R1G1B1 X0R0G0B0 uint8x8_t pxlo = vtbl1_u8(vget_low_u8(px), masklo); // B3G3R3B2 G2R2B1G1 -> X3R3G3B3 X2R2G2B2 uint8x8_t pxhi = vtbl1_u8(vext_u8(vget_low_u8(px), vget_high_u8(px), 4), maskhi); px = vcombine_u8(pxlo, pxhi); px = vorrq_u8(px, alpha); - vst1q_u16(reinterpret_cast<uint16_t*>(dst), px); + vst1q_u8(dst, px); src -= 4 * 3; dst -= 4 * 4; } } // Force instantiation of swizzle variants here. template void UnpackRowRGB24_NEON<false>(const uint8_t*, uint8_t*, int32_t); template void UnpackRowRGB24_NEON<true>(const uint8_t*, uint8_t*, int32_t); ++++++ mozilla-bmo849632.patch ++++++ --- /var/tmp/diff_new_pack.jw9xvH/_old 2020-02-29 21:21:05.882110835 +0100 +++ /var/tmp/diff_new_pack.jw9xvH/_new 2020-02-29 21:21:05.882110835 +0100 @@ -10,7 +10,7 @@ BEFORE_GL_CALL; mSymbols.fReadPixels(x, y, width, height, format, type, pixels); OnSyncCall(); -+#if MOZ_BIG_ENDIAN ++#if MOZ_BIG_ENDIAN() + uint8_t* itr = (uint8_t*)pixels; + for (GLsizei i = 0; i < width * height; i++) { + NativeEndian::swapToLittleEndianInPlace((uint32_t*)itr, 1);

1 0

commit libqmi for openSUSE:Factory
by root 29 Feb '20

29 Feb '20

Hello community, here is the log from the commit of package libqmi for openSUSE:Factory checked in at 2020-02-29 21:20:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqmi (Old) and /work/SRC/openSUSE:Factory/.libqmi.new.26092 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "libqmi" Sat Feb 29 21:20:28 2020 rev:28 rq:779868 version:1.24.6 Changes: -------- --- /work/SRC/openSUSE:Factory/libqmi/libqmi.changes 2020-01-19 20:53:37.791930243 +0100 +++ /work/SRC/openSUSE:Factory/.libqmi.new.26092/libqmi.changes 2020-02-29 21:20:30.286040391 +0100 @@ -1,0 +2,19 @@ +Thu Feb 27 10:06:34 UTC 2020 - Martin Hauke <mardnh(a)gmx.de> + +- Update to version 1.24.6: + libqmi-glib: + * Fixed the close operation logic to make sure that a reopen done + right away doesn't close the wrong endpoint. + * Updated string reading logic to make sure that all strings are + valid UTF-8. + * Updated string reading logic to attempt parsing as GSM7 or UCS2 + if the initial UTF-8 validation fails. + * Renamed TLV 0x15 in the "WDA Get Data Format" message, and added + new compat methods for the old name. + * Fixed the format of the NITZ information TLV, and added new + compat methods for the old name. + * Fixed the format of the Home Network 3GPP2 TLV, and added new + compat methods for the old name. + * Several other minor improvements and fixes. + +------------------------------------------------------------------- Old: ---- libqmi-1.24.4.tar.xz New: ---- libqmi-1.24.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqmi.spec ++++++ --- /var/tmp/diff_new_pack.3yB05y/_old 2020-02-29 21:20:30.966041737 +0100 +++ /var/tmp/diff_new_pack.3yB05y/_new 2020-02-29 21:20:30.966041737 +0100 @@ -20,7 +20,7 @@ %define _soname libqmi-glib5 Name: libqmi -Version: 1.24.4 +Version: 1.24.6 Release: 0 # NOTE: The file headers state LESSER GPL, which is a mistake. The upstream intended license is LIBRARY GPL 2.0+ Summary: Library to control QMI devices ++++++ libqmi-1.24.4.tar.xz -> libqmi-1.24.6.tar.xz ++++++ ++++ 5863 lines of diff (skipped)

1 0