Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package scap-workbench for openSUSE:Factory checked in at 2023-04-04 21:17:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/scap-workbench (Old) and /work/SRC/openSUSE:Factory/.scap-workbench.new.19717 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "scap-workbench" Tue Apr 4 21:17:52 2023 rev:16 rq:1077142 version:1.2.1+git20221219.10c1929 Changes: -------- --- /work/SRC/openSUSE:Factory/scap-workbench/scap-workbench.changes 2022-01-13 23:22:15.376079469 +0100 +++ /work/SRC/openSUSE:Factory/.scap-workbench.new.19717/scap-workbench.changes 2023-04-04 21:18:11.340336801 +0200 @@ -1,0 +2,12 @@ +Tue Mar 28 07:48:22 UTC 2023 - [email protected] + +- Update to version 1.2.1+git20221219.10c1929: + * Use version 1 of get package for Ubuntu package installation. + * Replace words with "control". + * Use fedora latest to build scap-workbench. + * Switch branch target to main. + * Remove obsoleted sources of SCAP content from the manual + * Update manual with how to obtain content from upstream source + * Fix appdata, desktop and icons for Linux (Freedesktop) + +------------------------------------------------------------------- Old: ---- scap-workbench-1.2.1+git20210604.1fc6def.tar.gz New: ---- _service _servicedata scap-workbench-1.2.1+git20221219.10c1929.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scap-workbench.spec ++++++ --- /var/tmp/diff_new_pack.K2KBrj/_old 2023-04-04 21:18:12.180342157 +0200 +++ /var/tmp/diff_new_pack.K2KBrj/_new 2023-04-04 21:18:12.184342182 +0200 @@ -1,7 +1,7 @@ # # spec file for package scap-workbench # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,18 +17,17 @@ Name: scap-workbench -Version: 1.2.1+git20210604.1fc6def +Version: 1.2.1+git20221219.10c1929 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 -Source: scap-workbench-%{version}.tar.gz +URL: https://github.com/OpenSCAP/%{name} +Source: %{version}/%{name}-%{version}.tar.gz Patch0: 0001-pkexec-avoid-potential-local-root-exploit-by-using-P.patch BuildRequires: asciidoc BuildRequires: cmake >= 2.6 -BuildRequires: openscap-devel +BuildRequires: openscap-devel >= 1.3.7 # buildtime and runtime requires for remote scan detection BuildRequires: openssh Recommends: openssh @@ -68,7 +67,7 @@ This package provides HTML documentation for scap-workbench. %prep -%setup -q -n %{name} +%setup -q %patch0 -p1 %build @@ -94,23 +93,25 @@ %install pushd build %make_install +rm -rf %{buildroot}%{_docdir}/%{name}/COPYING popd %if 0%{?suse_version} -%suse_update_desktop_file -i -u %{name} Utility DesktopUtility +%suse_update_desktop_file -i -u org.open_scap.scap_workbench Utility DesktopUtility %endif %files %defattr(-,root,root,0755) -%doc README.md COPYING +%doc README.md +%license COPYING %{_bindir}/%{name} -%dir %{_datadir}/appdata/ -%{_datadir}/appdata/%{name}.appdata.xml +%dir %{_datadir}/metainfo/ +%{_datadir}/metainfo/*.appdata.xml %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.png %dir %{_datadir}/%{name}/translations %{_datadir}/%{name}/translations/README -%{_datadir}/applications/%{name}.desktop +%{_datadir}/applications/*.desktop %{_datadir}/pixmaps/%{name}* %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -119,6 +120,10 @@ %dir %{_libdir}/%{name} %{_libdir}/%{name}/*sh %exclude %{_docdir}/%{name}/*.html +%dir %{_datadir}/icons/hicolor +%dir %{_datadir}/icons/hicolor/scalable +%dir %{_datadir}/icons/hicolor/scalable/apps +%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg %files doc %defattr(-,root,root,0755) ++++++ _service ++++++ <services> <service name="tar_scm" mode="disabled"> <param name="url">https://github.com/OpenSCAP/scap-workbench.git</param> <param name="scm">git</param> <param name="exclude">.git</param> <param name="versionformat">@PARENT_TAG@+git%cd.%h</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="revision">v1-2</param> <param name="changesgenerate">enable</param> </service> <service name="recompress" mode="disabled"> <param name="file">scap-workbench-*.tar</param> <param name="compression">gz</param> </service> <service name="set_version" mode="disabled"> <param name="basename">scap-workbench</param> </service> </services> ++++++ _servicedata ++++++ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/OpenSCAP/scap-workbench.git</param> <param name="changesrevision">10c1929e157ce2939b650428b17d3440dccc25ab</param></service></servicedata> (No newline at EOF) ++++++ scap-workbench-1.2.1+git20210604.1fc6def.tar.gz -> scap-workbench-1.2.1+git20221219.10c1929.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/.github/workflows/build.yaml new/scap-workbench-1.2.1+git20221219.10c1929/.github/workflows/build.yaml --- old/scap-workbench/.github/workflows/build.yaml 1970-01-01 01:00:00.000000000 +0100 +++ new/scap-workbench-1.2.1+git20221219.10c1929/.github/workflows/build.yaml 2022-12-19 15:04:46.000000000 +0100 @@ -0,0 +1,92 @@ +name: Gating +on: + push: + branches: [ '*' ] + pull_request: + branches: [ main, v1-2 ] +jobs: + build-ubuntu: + name: Build on Ubuntu Latest + runs-on: ubuntu-latest + steps: + - name: Install Deps + uses: mstksg/get-package@v1 + with: + apt-get: build-essential openssh-client libopenscap-dev libqt5xmlpatterns5-dev ssh-askpass asciidoc libpolkit-agent-1-0 + - name: Checkout + uses: actions/checkout@v2 + - name: Build + run: | + mkdir -p build + pushd build + cmake .. + make -j4 + popd + + build-fedora: + name: Build on Fedora Latest (Container) + runs-on: ubuntu-latest + container: + image: fedora:latest + steps: + - name: Install Deps + run: dnf install -y cmake gcc-c++ openssh-clients util-linux openscap-devel qt5-qtbase-devel qt5-qtxmlpatterns-devel openssh-askpass asciidoc polkit-libs + - name: Checkout + uses: actions/checkout@v2 + - name: Build + run: | + mkdir -p build + pushd build + cmake .. + make -j4 + popd + +# Disabled +# build-macos: +# name: Build on MacOS X Latest +# runs-on: macos-latest +# steps: +# - uses: actions/checkout@v2 +# - name: Install Deps +# run: | +# brew install jq +# brew install qt5 +# brew install asciidoc +# brew install pkg-config +# brew install doxygen +# brew install opendbx +# brew install popt +# brew install swig +# brew install upx +# brew install libxmlsec1 +# npm install -g appdmg +# echo "/usr/local/opt/qt/bin" >> $GITHUB_PATH +# echo "Qt5_DIR=/usr/local/opt/qt5/lib/cmake/Qt5" >> $GITHUB_ENV +# - name: Build OpenSCAP +# run: | +# git clone --depth 1 https://github.com/openscap/openscap.git +# pushd openscap/build +# cmake -DENABLE_PROBES=FALSE ../ +# make -j4 +# make install +# popd +# Broken +# - name: Build OSX Image +# run: | +# chmod +x ./build-for-osx.sh +# ./build-for-osx.sh +# REL_TAG=`curl -s "https://github.com/ComplianceAsCode/content/releases/latest"; | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}'` +# REL_TAG_NUM=`echo ${REL_TAG} | cut -d"v" -f2` +# DWN_LINK=https://github.com/ComplianceAsCode/content/releases/download/${REL_TAG}/scap-security-guide-${REL_TAG_NUM}.zip +# if [ -z "${DWN_LINK}" ]; then echo 'Could not get the ZIP URL! It is empty!'; exit 1; fi +# wget "${DWN_LINK}" -O ssg.zip +# mkdir -p `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/ && unzip ssg.zip && cp -a scap-security-guide-*/* `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/ +# cd build-osx && bash osx-create-dmg.sh +# We don't do automatic releases, do we? +# - name: Release +# uses: softprops/action-gh-release@v1 +# if: startsWith(github.ref, 'refs/tags/') +# with: +# files: build-osx/scap-workbench-${{ steps.get_version.outputs.VERSION }}.dmg +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/.github/workflows/main.yml new/scap-workbench-1.2.1+git20221219.10c1929/.github/workflows/main.yml --- old/scap-workbench/.github/workflows/main.yml 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/.github/workflows/main.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,65 +0,0 @@ -name: OpenScap Workbench CI - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch -on: [push, pull_request] - -jobs: - build-macos: - # The type of runner that the job will run on - runs-on: macos-latest - steps: - # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it - - uses: actions/checkout@v2 - - # *before_install* port - - name: Install additional packages - run: | - brew install jq - brew install qt5 - brew install asciidoc - brew install pkg-config - brew install doxygen - brew install opendbx - brew install popt - brew install swig - brew install upx - npm install -g appdmg - echo "::add-path::/usr/local/opt/qt/bin" - - # Runs a set of commands using the runners shell - - name: Run openSCAP build process - run: | - git clone --depth 1 https://github.com/openscap/openscap.git -b master - pushd openscap/build - cmake -DENABLE_PROBES=FALSE ../ - make -j 4 - make install - popd - - # Build OSX image - - name: Build OSX image - run: | - chmod +x ./build-for-osx.sh - ./build-for-osx.sh - REL_TAG=`curl -s "https://github.com/ComplianceAsCode/content/releases/latest"; | grep -o 'tag/[v.0-9]*' | awk -F/ '{print $2}'` - REL_TAG_NUM=`echo ${REL_TAG} | cut -d"v" -f2` - DWN_LINK=https://github.com/ComplianceAsCode/content/releases/download/${REL_TAG}/scap-security-guide-${REL_TAG_NUM}.zip - if [ -z "${DWN_LINK}" ]; then echo 'Could not get the ZIP URL! It is empty!'; exit 1; fi - wget "${DWN_LINK}" -O ssg.zip - mkdir -p `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/ && unzip ssg.zip && cp -a scap-security-guide-*/* `pwd`/build-osx/scap-workbench.app/Contents/Resources/ssg/ - cd build-osx && bash osx-create-dmg.sh - - # Get tag release version (1.2.X etc,.) - - name: Get the release version - id: get_version - run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//} - - # Deploy package to release - - name: Release - uses: softprops/action-gh-release@v1 - if: startsWith(github.ref, 'refs/tags/') - with: - files: build-osx/scap-workbench-${{ steps.get_version.outputs.VERSION }}.dmg - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/.github/workflows/ubuntu.yml new/scap-workbench-1.2.1+git20221219.10c1929/.github/workflows/ubuntu.yml --- old/scap-workbench/.github/workflows/ubuntu.yml 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/.github/workflows/ubuntu.yml 1970-01-01 01:00:00.000000000 +0100 @@ -1,23 +0,0 @@ -name: OpenScap Workbench CI - -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the master branch -on: [push, pull_request] - -jobs: - build-ubuntu: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - - name: Install required dependencies - run: | - sudo apt install -y build-essential openssh-client libopenscap-dev - sudo apt install -y libqt5xmlpatterns5-dev ssh-askpass asciidoc - sudo apt install -y libpolkit-agent-1-0 - - name: Build SCAP Workbench - run: | - mkdir -p build - pushd build - cmake .. - make - popd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/CMakeLists.txt new/scap-workbench-1.2.1+git20221219.10c1929/CMakeLists.txt --- old/scap-workbench/CMakeLists.txt 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/CMakeLists.txt 2022-12-19 15:04:46.000000000 +0100 @@ -128,23 +128,6 @@ Qt5::Widgets Qt5::XmlPatterns ${OPENSCAP_LINK_LIB}) -# ---------- RPATHS for linking - -# see https://gitlab.kitware.com/cmake/community/wikis/doc/cmake/RPATH-handling - -# when building, use the install RPATH -# (but later on when installing) -set(CMAKE_BUILD_WITH_INSTALL_RPATH ON) - -set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) - -# add the automatically determined parts of the RPATH -# which point to directories outside the build tree to the install RPATH -set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - -# Turn on RPATH for OSX -set(CMAKE_MACOSX_RPATH ON) - configure_file("include/Config.h.in" "${CMAKE_CURRENT_BINARY_DIR}/Config.h") # It is not trivial to make the resulting file executable :-( # People will have to `bash runwrapper.sh ...` in the meantime. @@ -280,14 +263,14 @@ install(DIRECTORY "share/scap-workbench" DESTINATION "${CMAKE_INSTALL_DATADIR}") -install(FILES "scap-workbench.desktop" +install(FILES "org.open_scap.scap_workbench.desktop" DESTINATION "${CMAKE_INSTALL_DATADIR}/applications") install(FILES "share/pixmaps/scap-workbench.png" DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps") install(FILES "share/pixmaps/scap-workbench.svg" - DESTINATION "${CMAKE_INSTALL_DATADIR}/pixmaps") -install(FILES "scap-workbench.appdata.xml" - DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata") + DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps") +install(FILES "org.open_scap.scap_workbench.appdata.xml" + DESTINATION "${CMAKE_INSTALL_DATADIR}/metainfo") if (ASCIIDOC_EXECUTABLE) file(GLOB USER_MANUAL_SCREENSHOTS "${CMAKE_CURRENT_SOURCE_DIR}/doc/user_manual/*.png") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/doc/user_manual.adoc new/scap-workbench-1.2.1+git20221219.10c1929/doc/user_manual.adoc --- old/scap-workbench/doc/user_manual.adoc 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/doc/user_manual.adoc 2022-12-19 15:04:46.000000000 +0100 @@ -76,13 +76,7 @@ From the package repository (YUM):: # yum install scap-security-guide From the package repository (APT):: # apt-get install scap-security-guide From upstream source (for advanced users or content developers):: - . $ git clone https://github.com/OpenSCAP/scap-security-guide.git ; cd scap-security-guide - . $ make - -==== Alternative SCAP content (optional) -[[alternative-contents]] - * http://usgcb.nist.gov/usgcb/rhel_content.html[USGCB for RHEL5] - XCCDF and OVAL, only suitable for RHEL5. - * https://github.com/OpenSCAP/sce-community-content[SCE Community Content] - Uses SCE, only suitable for Fedora. +Follow instructions from https://complianceascode.readthedocs.io/en/latest/manual/developer/02_building_complianceascode.html[Building ComplianceAsCode]. === Start SCAP Workbench diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/include/RemoteSsh.h new/scap-workbench-1.2.1+git20221219.10c1929/include/RemoteSsh.h --- old/scap-workbench/include/RemoteSsh.h 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/include/RemoteSsh.h 2022-12-19 15:04:46.000000000 +0100 @@ -50,7 +50,7 @@ void disconnect(); bool isConnected() const; - const QString& _getMasterSocket() const; + const QString& _getControlSocket() const; const QProcessEnvironment& _getEnvironment() const; private: @@ -58,7 +58,7 @@ unsigned short mPort; SpacelessQTemporaryDir* mSocketDir; - QString mMasterSocket; + QString mControlSocket; QProcessEnvironment mEnvironment; bool mConnected; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/org.open_scap.scap_workbench.appdata.xml new/scap-workbench-1.2.1+git20221219.10c1929/org.open_scap.scap_workbench.appdata.xml --- old/scap-workbench/org.open_scap.scap_workbench.appdata.xml 1970-01-01 01:00:00.000000000 +0100 +++ new/scap-workbench-1.2.1+git20221219.10c1929/org.open_scap.scap_workbench.appdata.xml 2022-12-19 15:04:46.000000000 +0100 @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<component type="desktop-application"> + <id>org.open_scap.scap_workbench</id> + <metadata_license>CC0-1.0</metadata_license> + <project_license>GPL-3.0+</project_license> + <name>SCAP Workbench</name> + <summary>A GUI tool that serves as an SCAP scanner and provides tailoring functionality for SCAP content</summary> + <launchable type="desktop-id">org.open_scap.scap_workbench.desktop</launchable> + <description> + <p> + The main goal of this application is to lower the initial barrier of using SCAP. + Therefore, the scope of very narrow - SCAP Workbench only scans a single machine and only with XCCDF/SDS (no direct OVAL evaluation). + The assumption is that this is enough for users who want to scan a few machines and users with huge amount of machines to scan will just use scap-workbench to test or hand-tune their content before deploying it with more advanced (and harder to use) tools like spacewalk. + </p> + <p>Feature highlights:</p> + <ul> + <li>XCCDF 1.1 and 1.2 support</li> + <li>Source Data Stream 1.2 support</li> + <li>XCCDF 1.2 Tailoring file support</li> + <li>Evaluation of local machine</li> + <li>Evaluation of remote machine (using ssh)</li> + <li>Limited tailoring support - selection and unselection</li> + <li>Saving results as XCCDF 1.1 or 1.2 (depending on input) or ARF 1.1</li> + </ul> + </description> + <screenshots> + <screenshot type="default"> + <image type="source" width="1280" height="720">https://github.com/OpenSCAP/scap-workbench/raw/v1-1/doc/user_manual/default_content_opened.png</image> + </screenshot> + <screenshot> + <image type="source" width="1280" height="720">https://github.com/OpenSCAP/scap-workbench/raw/v1-1/doc/user_manual/intro_screenshot.png</image> + </screenshot> + <screenshot> + <image type="source" width="1280" height="720">https://github.com/OpenSCAP/scap-workbench/raw/v1-1/doc/user_manual/tailoring_undo_history.png</image> + </screenshot> + </screenshots> + <url type="homepage">https://www.open-scap.org/tools/scap-workbench</url> + <update_contact>[email protected]</update_contact> +</component> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/org.open_scap.scap_workbench.desktop new/scap-workbench-1.2.1+git20221219.10c1929/org.open_scap.scap_workbench.desktop --- old/scap-workbench/org.open_scap.scap_workbench.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/scap-workbench-1.2.1+git20221219.10c1929/org.open_scap.scap_workbench.desktop 2022-12-19 15:04:46.000000000 +0100 @@ -0,0 +1,11 @@ +[Desktop Entry] +Version=1.0 +Type=Application +Name=SCAP Workbench +GenericName=SCAP Scanner and Profile Editor +Comment=GUI tool that allows scanning both local and remote computers using SCAP content of your choice +TryExec=scap-workbench +Exec=scap-workbench +Icon=scap-workbench +Categories=System;Security; +Keywords=SCAP; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/scap-workbench.appdata.xml new/scap-workbench-1.2.1+git20221219.10c1929/scap-workbench.appdata.xml --- old/scap-workbench/scap-workbench.appdata.xml 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/scap-workbench.appdata.xml 1970-01-01 01:00:00.000000000 +0100 @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<application> - <id type="desktop">scap-workbench.desktop</id> - <metadata_license>CC0-1.0</metadata_license> - <project_license>GPL-3.0+</project_license> - <name>SCAP Workbench</name> - <summary>A GUI tool that serves as an SCAP scanner and provides tailoring functionality for SCAP content</summary> - <description> - <p> - The main goal of this application is to lower the initial barrier of using SCAP. - Therefore, the scope of very narrow - SCAP Workbench only scans a single machine and only with XCCDF/SDS (no direct OVAL evaluation). - The assumption is that this is enough for users who want to scan a few machines and users with huge amount of machines to scan will just use scap-workbench to test or hand-tune their content before deploying it with more advanced (and harder to use) tools like spacewalk. - </p> - <p>Feature highlights:</p> - <ul> - <li>XCCDF 1.1 and 1.2 support</li> - <li>Source Data Stream 1.2 support</li> - <li>XCCDF 1.2 Tailoring file support</li> - <li>Evaluation of local machine</li> - <li>Evaluation of remote machine (using ssh)</li> - <li>Limited tailoring support - selection and unselection</li> - <li>Saving results as XCCDF 1.1 or 1.2 (depending on input) or ARF 1.1</li> - </ul> - </description> - <screenshots> - <screenshot type="default" width="1280" height="720">https://github.com/OpenSCAP/scap-workbench/raw/v1-1/doc/user_manual/default_content_opened.png</screenshot> - <screenshot width="1280" height="720">https://github.com/OpenSCAP/scap-workbench/raw/v1-1/doc/user_manual/intro_screenshot.png</screenshot> - <screenshot width="1280" height="720">https://github.com/OpenSCAP/scap-workbench/raw/v1-1/doc/user_manual/tailoring_undo_history.png</screenshot> - </screenshots> - <url type="homepage">https://www.open-scap.org/tools/scap-workbench</url> - <updatecontact>[email protected]</updatecontact> -</application> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/scap-workbench.desktop new/scap-workbench-1.2.1+git20221219.10c1929/scap-workbench.desktop --- old/scap-workbench/scap-workbench.desktop 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/scap-workbench.desktop 1970-01-01 01:00:00.000000000 +0100 @@ -1,10 +0,0 @@ -[Desktop Entry] -Type=Application -Name=SCAP Workbench -GenericName=SCAP Scanner and Profile Editor -Comment=GUI tool that allows scanning both local and remote computers using SCAP content of your choice. -TryExec=scap-workbench -Exec=scap-workbench -Icon=scap-workbench -Categories=System; -X-Desktop-File-Install-Version=0.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/src/OscapScannerRemoteSsh.cpp new/scap-workbench-1.2.1+git20221219.10c1929/src/OscapScannerRemoteSsh.cpp --- old/scap-workbench/src/OscapScannerRemoteSsh.cpp 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/src/OscapScannerRemoteSsh.cpp 2022-12-19 15:04:46.000000000 +0100 @@ -228,7 +228,7 @@ } QStringList baseArgs; - baseArgs.append("-o"); baseArgs.append(QString("ControlPath=%1").arg(mSshConnection._getMasterSocket())); + baseArgs.append("-o"); baseArgs.append(QString("ControlPath=%1").arg(mSshConnection._getControlSocket())); baseArgs.append(mTarget); QString diagnosticInfo; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scap-workbench/src/RemoteSsh.cpp new/scap-workbench-1.2.1+git20221219.10c1929/src/RemoteSsh.cpp --- old/scap-workbench/src/RemoteSsh.cpp 2021-05-04 14:35:09.000000000 +0200 +++ new/scap-workbench-1.2.1+git20221219.10c1929/src/RemoteSsh.cpp 2022-12-19 15:04:46.000000000 +0100 @@ -110,7 +110,7 @@ } mSocketDir = new SpacelessQTemporaryDir(); - mMasterSocket = mSocketDir->path() + "/ssh_socket"; + mControlSocket = mSocketDir->path() + "/ssh_socket"; } catch (const SyncProcessException& e) { @@ -131,13 +131,13 @@ args.append(SCAP_WORKBENCH_LOCAL_SSH_PATH); #endif - args.append("-M"); // place ssh client into "master" mode for connection sharing + args.append("-M"); // place ssh client in control of the shared connection socket args.append("-f"); // requests ssh to go to background before command execution args.append("-N"); // do not execute a remote command (yet) // send keep alive null messages every 60 seconds to make sure the connection stays alive args.append("-o"); args.append(QString("ServerAliveInterval=%1").arg(60)); - args.append("-o"); args.append(QString("ControlPath=%1").arg(mMasterSocket)); + args.append("-o"); args.append(QString("ControlPath=%1").arg(mControlSocket)); args.append("-p"); args.append(QString::number(mPort)); // TODO: sanitize input? args.append(mTarget); @@ -156,13 +156,13 @@ if (proc.getExitCode() != 0) { throw SshConnectionException( - QString("Failed to create SSH master socket! Diagnostic info: %1").arg(proc.getDiagnosticInfo())); + QString("Failed to create SSH control socket! Diagnostic info: %1").arg(proc.getDiagnosticInfo())); } } catch (const SyncProcessException& e) { throw SshConnectionException( - QString("Failed to create SSH master socket! Exception was: %1").arg(QString::fromUtf8(e.what()))); + QString("Failed to create SSH control socket! Exception was: %1").arg(QString::fromUtf8(e.what()))); } if (mCancelRequestSource && *mCancelRequestSource) @@ -186,7 +186,7 @@ args.append(SCAP_WORKBENCH_LOCAL_SSH_PATH); #endif - args.append("-S"); args.append(mMasterSocket); + args.append("-S"); args.append(mControlSocket); args.append("-p"); args.append(QString::number(mPort)); args.append("-O"); args.append("exit"); args.append(mTarget); @@ -217,9 +217,9 @@ return mConnected; } -const QString& SshConnection::_getMasterSocket() const +const QString& SshConnection::_getControlSocket() const { - return mMasterSocket; + return mControlSocket; } const QProcessEnvironment& SshConnection::_getEnvironment() const @@ -258,7 +258,7 @@ args.append(SCAP_WORKBENCH_LOCAL_SSH_PATH); #endif - args.append("-o"); args.append(QString("ControlPath=%1").arg(mSshConnection._getMasterSocket())); + args.append("-o"); args.append(QString("ControlPath=%1").arg(mSshConnection._getControlSocket())); args.append("-p"); args.append(QString::number(mSshConnection.getPort())); args.append(mSshConnection.getTarget()); args.append(SyncProcess::generateFullCommand() + QString(" ") + SyncProcess::generateFullArguments().join(" "));
