Merge branch '3.x' into release-3.7.0-1

Merge pull request #960 from alina-derkach-oaza/PT-2447-3.7.0-1
PT-2447 Release notes for Percona Toolkit 3.7.0-1
2025-09-24 21:35:00 +00:00 · 2025-05-14 16:09:28 +03:00 · 2025-05-14 10:59:16 +02:00 · 2025-05-13 16:42:18 +02:00 · 2025-04-28 14:25:07 +03:00 · 2025-04-22 12:18:26 +03:00
6 changed files with 22 additions and 8 deletions
--- a/6
+++ b/6
@@ -1,5 +1,11 @@
 Changelog for Percona Toolkit

+v3.7.0-1 released 2025-05-14
+
+This release addresses multiple security vulnerabilities reported in Percona Toolkit version 3.7.0, including issues related to the `libxml2` component (CVE-2024-56171, CVE-2025-24928), `openssl` (CVE-2024-12797), and `krb5` (CVE-2022-37967).
+
+* Fixed bug PT-2442: percona-toolkit:latest Vulnerability [CVE-2024-56171 CVE-2024-12797 CVE-2022-37967 CVE-2025-24928]
+
 v3.7.0 released 2024-12-23

 * Feature PT-2340: Support MySQL 8.4
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -11,7 +11,7 @@ MAKE_GOTOOLS

 WriteMakefile(
    NAME      => 'Percona::Toolkit',
-    VERSION   => '3.7.0',
+    VERSION   => '3.7.0-1',
    EXE_FILES => [
      map {
         (my $name = $_) =~ s/^bin.//;
--- a/config/scripts/pt_builder.sh
+++ b/config/scripts/pt_builder.sh
@@ -582,8 +582,8 @@ OS_NAME=
 ARCH=
 OS=
 INSTALL=0
-RPM_RELEASE=1
-DEB_RELEASE=1
+RPM_RELEASE=2
+DEB_RELEASE=2
 REVISION=0
 GIT_BRANCH=${GIT_BRANCH}
 GIT_REPO=https://github.com/percona/percona-toolkit.git
--- a/config/sphinx-build/conf.py
+++ b/config/sphinx-build/conf.py
@@ -50,7 +50,7 @@ copyright = u'2024, Percona LLC and/or its affiliates'
 # The short X.Y version.
 version = '3.7'
 # The full version, including alpha/beta/rc tags.
-release = '3.7.0'
+release = '3.7.0-1'

 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1,6 +1,16 @@
 Release Notes
 ***************

+v3.7.0-1 released 2025-05-14
+==============================
+
+This release addresses multiple security vulnerabilities reported in Percona Toolkit version 3.7.0, including issues related to the `libxml2` component (CVE-2024-56171, CVE-2025-24928), `openssl` (CVE-2024-12797), and `krb5` (CVE-2022-37967).
+
+Bug Fixed
+------------
+
+* :jirabug:`PT-2442`: percona-toolkit:latest Vulnerability [CVE-2024-56171 CVE-2024-12797 CVE-2022-37967 CVE-2025-24928]
+
 v3.7.0 released 2024-12-23
 ==============================

--- a/src/go/mongolib/stats/stats.go
+++ b/src/go/mongolib/stats/stats.go
@@ -16,7 +16,6 @@ import (

 const (
 	planSummaryCollScan = "COLLSCAN"
-	planSummaryIXScan   = "IXSCAN"
 )

 type StatsError struct {
@@ -106,9 +105,8 @@ func (s *Stats) Add(doc proto.SystemProfile) error {
 	if qiac.PlanSummary == planSummaryCollScan {
 		qiac.CollScanCount++
 	}
-	if strings.HasPrefix(qiac.PlanSummary, planSummaryIXScan) {
-		qiac.PlanSummary = planSummaryIXScan
-	}
+
+	qiac.PlanSummary = strings.Split(qiac.PlanSummary, " ")[0]

 	qiac.NReturned = append(qiac.NReturned, float64(doc.Nreturned))
 	qiac.QueryTime = append(qiac.QueryTime, float64(doc.Millis))
Author	SHA1	Message	Date
EvgeniyPatlan	84095fd7d7	Merge branch '3.x' into release-3.7.0-1	2025-05-14 16:09:28 +03:00
Alina Derkach	47b8c5b067	Merge pull request #960 from alina-derkach-oaza/PT-2447-3.7.0-1 PT-2447 Release notes for Percona Toolkit 3.7.0-1	2025-05-14 10:59:16 +02:00
Alina Derkach	7717cfe4f1	PT-2447 Release notes for Percona Toolkit 3.7.0-1 modified: Changelog modified: Makefile.PL modified: config/sphinx-build/conf.py modified: docs/release_notes.rst	2025-05-13 16:42:18 +02:00
Jiří Čtvrtka	f9d9a993e9	PMM-13897 Remove {} from all values in Plan Summary. (#950 )	2025-04-28 14:25:07 +03:00
EvgeniyPatlan	7f322f7cbd	Merge pull request #954 from EvgeniyPatlan/release-3.7.0-1 Release 3.7.0 1	2025-04-22 12:18:26 +03:00
Evgeniy Patlan	3ff98c20bc	Update version	2025-04-22 11:37:43 +03:00
Sveta Smirnova	f816053065	Merge pull request #917 from surbhat1595/PKG374 PKG-374 Make Percona Toolkit rpm spec file architecture independent (cherry picked from commit `d82723f272`)	2025-04-22 08:32:53 +03:00
Evgeniy Patlan	34a14ec77e	Update crypto version	2025-04-22 08:00:54 +03:00