Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package p7zip for openSUSE:Factory checked in at 2021-03-24 16:10:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/p7zip (Old) and /work/SRC/openSUSE:Factory/.p7zip.new.2401 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "p7zip" Wed Mar 24 16:10:22 2021 rev:42 rq:880470 version:16.02 Changes: -------- --- /work/SRC/openSUSE:Factory/p7zip/p7zip.changes 2020-03-12 22:58:57.291006244 +0100 +++ /work/SRC/openSUSE:Factory/.p7zip.new.2401/p7zip.changes 2021-03-24 16:10:22.851777102 +0100 @@ -1,0 +2,6 @@ +Mon Mar 15 09:29:45 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Add patch from Debian to fix build with GCC 11 (boo#1181880) + * 0001-Fix-g-warning.patch + +------------------------------------------------------------------- New: ---- 0001-Fix-g-warning.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ p7zip.spec ++++++ --- /var/tmp/diff_new_pack.YQzaJS/_old 2021-03-24 16:10:23.339777614 +0100 +++ /var/tmp/diff_new_pack.YQzaJS/_new 2021-03-24 16:10:23.343777618 +0100 @@ -1,7 +1,7 @@ # # spec file for package p7zip # -# 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 @@ -41,11 +41,13 @@ # Debian gzip-like CLI wrapper for p7zip (the version shipped within the p7zip tarball is too old) Source1: https://salsa.debian.org/debian/p7zip/raw/master/debian/scripts/p7zip Source2: https://salsa.debian.org/debian/p7zip/raw/master/debian/p7zip.1 -Patch1: CVE-2016-9296.patch +Patch0: CVE-2016-9296.patch # PATCH-FIX-SUSE bnc#1077978 [email protected] -- adjust makefile not to use CPP/7zip/Compress/Rar* files -Patch2: p7zip_16.02_norar.patch +Patch1: p7zip_16.02_norar.patch # PATCH-FIX-UPSTREAM bnc#1077725 [email protected] -- fix heap-based buffer overflow in a shrink decoder -Patch3: p7zip-16.02-CVE-2017-17969.patch +Patch2: p7zip-16.02-CVE-2017-17969.patch +# PATCH-FIX-UPSTREAM +Patch3: 0001-Fix-g-warning.patch BuildRequires: fdupes BuildRequires: gcc-c++ Suggests: p7zip-full @@ -118,10 +120,7 @@ This package contains the HTML documentation for 7-Zip. %prep -%setup -q -n %{name}_%{version} -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 +%autosetup -p1 -n %{name}_%{version} %ifarch x86_64 cp makefile.linux_amd64_asm makefile.machine ++++++ 0001-Fix-g-warning.patch ++++++ >From f5f2e895ffad199a0505c72370840c83453348ae Mon Sep 17 00:00:00 2001 From: Robert Luberda <[email protected]> Date: Sun, 28 Jan 2018 22:19:13 +0100 Subject: [PATCH] Fix g++ warning Fix for "use of an operand of type 'bool' in 'operator++' is deprecated [-Wdeprecated]" warning taken from 7zip 18.00.beta package. --- CPP/7zip/Archive/Wim/WimHandler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CPP/7zip/Archive/Wim/WimHandler.cpp b/CPP/7zip/Archive/Wim/WimHandler.cpp index 27d3298..4ff5cfe 100644 --- a/CPP/7zip/Archive/Wim/WimHandler.cpp +++ b/CPP/7zip/Archive/Wim/WimHandler.cpp @@ -298,7 +298,7 @@ STDMETHODIMP CHandler::GetArchiveProperty(PROPID propID, PROPVARIANT *value) AString res; - bool numMethods = 0; + unsigned numMethods = 0; for (unsigned i = 0; i < ARRAY_SIZE(k_Methods); i++) { if (methodMask & ((UInt32)1 << i)) -- 2.30.1
