diff -Nru kactivities-stats-5.115.0/CMakeLists.txt kactivities-stats-5.116.0/CMakeLists.txt --- kactivities-stats-5.115.0/CMakeLists.txt 2024-02-03 14:21:26.000000000 +0000 +++ kactivities-stats-5.116.0/CMakeLists.txt 2024-05-04 11:37:20.000000000 +0000 @@ -2,8 +2,8 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.115.0") # handled by release scripts -set(KF_DEP_VERSION "5.115.0") # handled by release scripts +set(KF_VERSION "5.116.0") # handled by release scripts +set(KF_DEP_VERSION "5.116.0") # handled by release scripts project (KActivitiesStats VERSION ${KF_VERSION}) set (REQUIRED_QT_VERSION 5.15.2) @@ -20,7 +20,7 @@ # Extra CMake stuff include (FeatureSummary) -find_package (ECM 5.115.0 NO_MODULE) +find_package (ECM 5.116.0 NO_MODULE) set_package_properties (ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules") feature_summary (WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -Nru kactivities-stats-5.115.0/debian/changelog kactivities-stats-5.116.0/debian/changelog --- kactivities-stats-5.115.0/debian/changelog 2024-03-31 01:28:03.000000000 +0000 +++ kactivities-stats-5.116.0/debian/changelog 2024-05-04 15:33:24.000000000 +0000 @@ -1,3 +1,9 @@ +kactivities-stats (5.116.0-0ubuntu1~ubuntu24.10~ppa1) oracular; urgency=high + + * New upstream release (5.116.0) + + -- José Manuel Santamaría Lema Sat, 04 May 2024 17:33:24 +0200 + kactivities-stats (5.115.0-0ubuntu5) noble; urgency=medium * No-change rebuild for CVE-2024-3094 diff -Nru kactivities-stats-5.115.0/debian/control kactivities-stats-5.116.0/debian/control --- kactivities-stats-5.115.0/debian/control 2024-02-19 14:43:15.000000000 +0000 +++ kactivities-stats-5.116.0/debian/control 2024-05-04 15:33:24.000000000 +0000 @@ -7,10 +7,10 @@ Build-Depends: cmake (>= 3.16~), debhelper-compat (= 13), doxygen, - extra-cmake-modules (>= 5.115.0~), + extra-cmake-modules (>= 5.116.0~), libboost-dev (>= 1.49~), - libkf5activities-dev (>= 5.115.0~), - libkf5config-dev (>= 5.115.0~), + libkf5activities-dev (>= 5.116.0~), + libkf5config-dev (>= 5.116.0~), libqt5sql5-sqlite, pkg-kde-tools, qtbase5-dev (>= 5.15.2~), diff -Nru kactivities-stats-5.115.0/src/common/database/Database.h kactivities-stats-5.116.0/src/common/database/Database.h --- kactivities-stats-5.115.0/src/common/database/Database.h 2024-02-03 14:21:26.000000000 +0000 +++ kactivities-stats-5.116.0/src/common/database/Database.h 2024-05-04 11:37:20.000000000 +0000 @@ -112,7 +112,9 @@ inline QString escapeSqliteLikePattern(QString pattern) { - return pattern.replace(QLatin1String("%"), QLatin1String("\\%")).replace(QLatin1String("_"), QLatin1String("\\_")); + return pattern.replace(QLatin1String("%"), QLatin1String("\\%")) + .replace(QLatin1String("_"), QLatin1String("\\_")) + .replace(QLatin1String("'"), QLatin1String("\\'")); } inline QString starPatternToLike(const QString &pattern) diff -Nru kactivities-stats-5.115.0/src/resultset.cpp kactivities-stats-5.116.0/src/resultset.cpp --- kactivities-stats-5.115.0/src/resultset.cpp 2024-02-03 14:21:26.000000000 +0000 +++ kactivities-stats-5.116.0/src/resultset.cpp 2024-05-04 11:37:20.000000000 +0000 @@ -145,12 +145,9 @@ return QStringLiteral("1"); } - /* clang-format off */ - return QStringLiteral("agent = '") + ( - agent == QLatin1String(":current") ? QCoreApplication::instance()->applicationName() : - agent - ) + QStringLiteral("'"); - /* clang-format on */ + return QLatin1String("agent = '") + + Common::escapeSqliteLikePattern(agent == QLatin1String(":current") ? QCoreApplication::instance()->applicationName() : agent) + + QLatin1String("'"); } QString activityClause(const QString &activity) const @@ -159,12 +156,9 @@ return QStringLiteral("1"); } - /* clang-format off */ - return QStringLiteral("activity = '") + ( - activity == QLatin1String(":current") ? ActivitiesSync::currentActivity(activities) : - activity - ) + QStringLiteral("'"); - /* clang-format on */ + return QLatin1String("activity = '") + // + Common::escapeSqliteLikePattern(activity == QLatin1String(":current") ? ActivitiesSync::currentActivity(activities) : activity) + + QLatin1String("'"); } inline QString starPattern(const QString &pattern) const