continue working issues #122 and #123; upgrade to Qt 6.5.3

squinky86 · Oct 17, 2023 · c99bbb7 · c99bbb7
1 parent 7655c80
commit c99bbb7
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 6 deletions.
diff --git a/appveyor.yml b/appveyor.yml
@@ -34,13 +34,13 @@ build_script:
 
     pushd /tmp/libxlsxwriter-RELEASE_1.1.5 && sed -i -e 's:REQUIRED "1.0":"1.0" REQUIRED:g' CMakeLists.txt && cmake -DUSE_STANDARD_TMPFILE=OFF -DCMAKE_TOOLCHAIN_FILE=/tmp/profile.cmake -DBUILD_SHARED_LIBS=OFF -DZLIB_INCLUDE_DIR=/tmp/zlib-ng-2.1.3 -DZLIB_LIBRARY=/tmp/zlib-ng-2.1.3/libz.a -DUSE_OPENSSL_MD5=ON -DCMAKE_C_FLAGS=-I/tmp/openssl-3.0.11/include -DOPENSSL_ROOT_DIR=/tmp/openssl-3.0.11 && make -j3 && popd
 
-    pushd /tmp && wget https://download.qt.io/official_releases/qt/6.5/6.5.2/submodules/qtbase-everywhere-src-6.5.2.tar.xz && tar -xf qtbase-everywhere-src-6.5.2.tar.xz && popd
+    pushd /tmp && wget https://download.qt.io/official_releases/qt/6.5/6.5.3/submodules/qtbase-everywhere-src-6.5.3.tar.xz && tar -xf qtbase-everywhere-src-6.5.3.tar.xz && popd
 
     sudo update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
 
     sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
 
-    pushd /tmp/qtbase-everywhere-src-6.5.2 && wget "https://codereview.qt-project.org/changes/qt%2Fqtbase~484198/revisions/2/patch?zip&path=src%2Fplugins%2Fnetworkinformation%2Fnetworklistmanager%2FCMakeLists.txt" -O patch.gz && zcat patch.gz | patch -p1 && ./configure -prefix /tmp/qt -no-vulkan -no-feature-sql-odbc -sql-sqlite -platform linux-g++-64 -qt-host-path /opt/qt6.5-static -xplatform win32-g++ -device-option CROSS_COMPILE=x86_64-w64-mingw32- -release -opengl desktop -mp -static -static-runtime -no-shared -nomake examples -no-icu -optimize-size -openssl-linked -- -DOPENSSL_ROOT_DIR=/tmp/openssl-3.0.11 -DCMAKE_TOOLCHAIN_FILE=/tmp/profile.cmake && cmake --build . && cmake --install . && popd
+    pushd /tmp/qtbase-everywhere-src-6.5.3 && wget "https://codereview.qt-project.org/changes/qt%2Fqtbase~484198/revisions/2/patch?zip&path=src%2Fplugins%2Fnetworkinformation%2Fnetworklistmanager%2FCMakeLists.txt" -O patch.gz && zcat patch.gz | patch -p1 && ./configure -prefix /tmp/qt -no-vulkan -no-feature-sql-odbc -sql-sqlite -platform linux-g++-64 -qt-host-path /opt/qt6.5-static -xplatform win32-g++ -device-option CROSS_COMPILE=x86_64-w64-mingw32- -release -opengl desktop -mp -static -static-runtime -no-shared -nomake examples -no-icu -optimize-size -openssl-linked -- -DOPENSSL_ROOT_DIR=/tmp/openssl-3.0.11 -DCMAKE_TOOLCHAIN_FILE=/tmp/profile.cmake && cmake --build . && cmake --install . && popd
 
     sed -i -e '/^LIBS/d' STIGQter.pro
 

diff --git a/...-forensics/stigqter/stigqter-1.2.5.ebuild → ...-forensics/stigqter/stigqter-1.2.7.ebuild b/...-forensics/stigqter/stigqter-1.2.5.ebuild → ...-forensics/stigqter/stigqter-1.2.7.ebuild
diff --git a/src/common.h b/src/common.h
@@ -24,7 +24,7 @@
 #include <QFile>
 #include <QNetworkReply>
 
-#define VERSION QStringLiteral("1.2.6")
+#define VERSION QStringLiteral("1.2.7")
 
 [[maybe_unused]] extern bool IgnoreWarnings;
 

diff --git a/src/workerfindingsreport.cpp b/src/workerfindingsreport.cpp
@@ -235,7 +235,7 @@ void WorkerFindingsReport::process()
         worksheet_write_number(wsCCIs, onRow, 1, c.cci, fmtCci);
         //severity
         if (checks2.isEmpty())
-             worksheet_write_string(wsCCIs, onRow, 2, GetSeverity(Severity::low).toStdString().c_str(), nullptr);
+            worksheet_write_string(wsCCIs, onRow, 2, GetSeverity(Severity::low).toStdString().c_str(), nullptr);
         else
             worksheet_write_string(wsCCIs, onRow, 2, GetSeverity(checks2.first().GetSeverity()).toStdString().c_str(), nullptr);
         //Checks
@@ -269,7 +269,16 @@ void WorkerFindingsReport::process()
             }
             QString samples = QString(" (Occurred on %1 of %2 samples: %3%)").arg(QString::number(f), QString::number(f + nf), QString::number((double)100 * (double)f / (double)(f + nf), 'f', 2));
             assets.append(PrintCKLCheck(cc) + samples);
-            fixes.append(sc.fix);
+            if (!sc.fix.trimmed().isEmpty())
+            {
+                fixes.append("\n\n-----" + sc.rule + "-----\n");
+                fixes.append(sc.fix);
+            }
+        }
+        if (fixes.length() > 2500)
+        {
+            fixes.truncate(2488);
+            fixes.append("(truncated)");
         }
         worksheet_write_string(wsCCIs, onRow, 3, assets.toStdString().c_str(), fmtWrapped);
         worksheet_write_string(wsCCIs, onRow, 4, fixes.toStdString().c_str(), fmtWrapped);
@@ -296,12 +305,12 @@ void WorkerFindingsReport::process()
         bool notFirst = false;
         QString technicalDesc = QString();
         QString technicalRec = QString();
+        QVector<STIGCheck> failedChecksDup;
         for (auto j = i.value().constBegin(); j != i.value().constEnd(); j++)
         {
             if (failedCCIs.contains(*j))
             {
                 auto failedChecks = failedCCIs.value(*j);
-                QVector<STIGCheck> failedChecksDup;
                 for (auto k = failedChecks.constBegin(); k != failedChecks.constEnd(); k++)
                 {
                     auto sc = k->GetSTIGCheck();