Hello community, here is the log from the commit of package scap-workbench for openSUSE:Factory checked in at 2020-03-26 23:37:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scap-workbench (Old) and /work/SRC/openSUSE:Factory/.scap-workbench.new.3160 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scap-workbench" Thu Mar 26 23:37:55 2020 rev:13 rq:788638 version:1.2.1 Changes: -------- --- /work/SRC/openSUSE:Factory/scap-workbench/scap-workbench.changes 2019-10-11 15:21:55.211344370 +0200 +++ /work/SRC/openSUSE:Factory/.scap-workbench.new.3160/scap-workbench.changes 2020-03-26 23:37:59.438877223 +0100 @@ -1,0 +2,8 @@ +Wed Mar 25 14:07:11 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 1.2.1. No changelog. +- Rebase 0001-pkexec-avoid-potential-local-root-exploit-by-using-P.patch +- Drop 0002-Qt5-deprecations.patch. Merged upstream +- Add 0001-Port-Qt5-deprecated-methods.patch + +------------------------------------------------------------------- Old: ---- 0002-Qt5-deprecations.patch scap-workbench-1.2.0.tar.bz2 New: ---- 0001-Port-Qt5-deprecated-methods.patch scap-workbench-1.2.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scap-workbench.spec ++++++ --- /var/tmp/diff_new_pack.Jdv5LZ/_old 2020-03-26 23:38:00.446877587 +0100 +++ /var/tmp/diff_new_pack.Jdv5LZ/_new 2020-03-26 23:38:00.454877590 +0100 @@ -1,7 +1,7 @@ # # spec file for package scap-workbench # -# 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 @@ -17,15 +17,16 @@ Name: scap-workbench -Version: 1.2.0 +Version: 1.2.1 Release: 0 Summary: A SCAP scanner and SCAP content editor License: GPL-3.0-only Group: Productivity/Security -Url: https://github.com/OpenSCAP/scap-workbench -Source: https://github.com/OpenSCAP/scap-workbench/releases/download/%version/scap-workbench-%version.tar.bz2 -Patch1: 0001-pkexec-avoid-potential-local-root-exploit-by-using-P.patch -Patch2: 0002-Qt5-deprecations.patch +URL: https://github.com/OpenSCAP/scap-workbench +Source: https://github.com/OpenSCAP/scap-workbench/releases/download/%{version}/scap-workbench-%{version}.tar.bz2 +Patch0: 0001-pkexec-avoid-potential-local-root-exploit-by-using-P.patch +# PATCH-FIX-UPSTREAM +Patch1: 0001-Port-Qt5-deprecated-methods.patch BuildRequires: cmake >= 2.6 BuildRequires: openscap-devel # SLE 11 SP3: libopenscap needs libxslt without requiring it @@ -59,10 +60,8 @@ %prep %setup -q +%patch0 -p1 %patch1 -p1 -%if 0%{?suse_version} > 1510 -%patch2 -p1 -%endif %build %if 0%{?cmake} @@ -90,7 +89,7 @@ popd %if 0%{?suse_version} -%suse_update_desktop_file -i -u %name Utility DesktopUtility +%suse_update_desktop_file -i -u %{name} Utility DesktopUtility %endif %files @@ -98,12 +97,12 @@ %doc README.md COPYING %{_bindir}/%{name} %dir %{_datadir}/appdata/ -%{_datadir}/appdata/%name.appdata.xml -%dir %{_datadir}/%name -%{_datadir}/%name/*.png -%dir %{_datadir}/%name/translations -%{_datadir}/%name/translations/README -%{_datadir}/applications/%name.desktop +%{_datadir}/appdata/%{name}.appdata.xml +%dir %{_datadir}/%{name} +%{_datadir}/%{name}/*.png +%dir %{_datadir}/%{name}/translations +%{_datadir}/%{name}/translations/README +%{_datadir}/applications/%{name}.desktop %{_datadir}/pixmaps/%{name}* %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions ++++++ 0001-Port-Qt5-deprecated-methods.patch ++++++ >From 93441ecc2f2bd3647e005ff8293909a0540b40fd Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Wed, 25 Mar 2020 15:41:22 +0100 Subject: [PATCH] Port Qt5 deprecated methods QSet::toList() is deprecated QSet::fromList() is deprecated --- src/SaveAsRPMDialog.cpp | 2 +- src/TailoringWindow.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/SaveAsRPMDialog.cpp b/src/SaveAsRPMDialog.cpp index 611d15f..e8d0564 100644 --- a/src/SaveAsRPMDialog.cpp +++ b/src/SaveAsRPMDialog.cpp @@ -86,7 +86,7 @@ void SaveAsRPMDialog::slotFinished(int result) closure.remove(mScanningSession->getOpenedFilePath()); QList<QString> closureOrdered; closureOrdered.append(mScanningSession->getOpenedFilePath()); - closureOrdered.append(closure.toList()); + closureOrdered.append(closure.values()); const QDir cwd = ScanningSession::getCommonAncestorDirectory(closure); diff --git a/src/TailoringWindow.cpp b/src/TailoringWindow.cpp index 212416c..5a3677a 100644 --- a/src/TailoringWindow.cpp +++ b/src/TailoringWindow.cpp @@ -645,7 +645,11 @@ QString TailoringWindow::getQSettingsKey() const void TailoringWindow::deserializeCollapsedItems() { const QStringList list = mQSettings->value(getQSettingsKey()).toStringList(); +#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0) + mCollapsedItemIds = QSet<QString>(list.begin(), list.end()); +#else mCollapsedItemIds = QSet<QString>::fromList(list); +#endif } void TailoringWindow::serializeCollapsedItems() @@ -657,7 +661,7 @@ void TailoringWindow::serializeCollapsedItems() } else { - mQSettings->setValue(getQSettingsKey(), QVariant(mCollapsedItemIds.toList())); + mQSettings->setValue(getQSettingsKey(), QVariant(mCollapsedItemIds.values())); mQSettings->setValue(getQSettingsKey() + "_lastUsed", QVariant(QDateTime::currentDateTime())); } } -- 2.25.1 ++++++ 0001-pkexec-avoid-potential-local-root-exploit-by-using-P.patch ++++++ --- /var/tmp/diff_new_pack.Jdv5LZ/_old 2020-03-26 23:38:00.514877611 +0100 +++ /var/tmp/diff_new_pack.Jdv5LZ/_new 2020-03-26 23:38:00.514877611 +0100 @@ -31,7 +31,7 @@ 2 files changed, 26 insertions(+), 13 deletions(-) diff --git a/scap-workbench-oscap.sh b/scap-workbench-oscap.sh -index 216376f2b987..6f720ded54a8 100755 +index 9066444..6f720de 100755 --- a/scap-workbench-oscap.sh +++ b/scap-workbench-oscap.sh @@ -25,14 +25,15 @@ trap "" SIGHUP SIGINT @@ -75,7 +75,7 @@ - # chown only required if wrapper_{uid,gid} differs from real_{uid,gid} - if [ $wrapper_uid -ne $real_uid ] || [ $wrapper_gid -ne $real_gid ]; then -- chown $wrapper_uid:$wrapper_gid $where +- chown $wrapper_uid:$wrapper_gid "$where" + if $do_chown; then + chown $wrapper_uid:$wrapper_gid "$what" + sudo -u "#${wrapper_uid}" cp "$what" "$where" @@ -94,7 +94,7 @@ chown_copy "$TEMP_DIR/results-arf.xml" "$TARGET_RESULTS_ARF" chown_copy "$TEMP_DIR/report.html" "$TARGET_REPORT" diff --git a/scap-workbench-pkexec-oscap.sh b/scap-workbench-pkexec-oscap.sh -index 1ae83296b83b..a8d9b2bd84cb 100755 +index 1ae8329..a8d9b2b 100755 --- a/scap-workbench-pkexec-oscap.sh +++ b/scap-workbench-pkexec-oscap.sh @@ -18,9 +18,6 @@ @@ -126,5 +126,5 @@ fi -- -2.23.0 +2.25.1 ++++++ scap-workbench-1.2.0.tar.bz2 -> scap-workbench-1.2.1.tar.bz2 ++++++ ++++ 32393 lines of diff (skipped)
