--- Begin Message ---
Package: release.debian.org
Severity: normal
X-Debbugs-Cc: kpmcore@packages.debian.org, Debian Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
Control: affects -1 + src:kpmcore
User: release.debian.org@packages.debian.org
Usertags: unblock
Dear Release Team,
please unblock package kpmcore.
[ Reason ]
It contains the following changes:
* Backport upstream commits:
- Fix a memory leak by actually freeing a correct pointer.
- Fix a crash when filesystem==nullptr.
* Reenable build-time tests.
[ Tests ]
- Tested showing internal and external disks and partitions in
partitionmanager.
- Upstream test suite passes in sbuild.
[ Risks ]
Only backport of upstream commits that apply cleanly. Further fixes can
easily be backported or the changes reverted.
[ Checklist ]
[x] all changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in testing
Thanks!
unblock kpmcore/24.12.3-2
diff -Nru kpmcore-24.12.3/debian/changelog kpmcore-24.12.3/debian/changelog
--- kpmcore-24.12.3/debian/changelog 2025-05-04 00:19:45.000000000 +0200
+++ kpmcore-24.12.3/debian/changelog 2025-06-09 09:01:20.000000000 +0200
@@ -1,3 +1,13 @@
+kpmcore (24.12.3-2) unstable; urgency=medium
+
+ [ Aurélien COUDERC ]
+ * Backport upstream commits:
+ - Fix a memory leak by actually freeing a correct pointer.
+ - Fix a crash when filesystem==nullptr.
+ * Reenable build-time tests.
+
+ -- Aurélien COUDERC <coucouf@debian.org> Mon, 09 Jun 2025 09:01:20 +0200
+
kpmcore (24.12.3-1) unstable; urgency=medium
[ Aurélien COUDERC ]
diff -Nru kpmcore-24.12.3/debian/patches/series kpmcore-24.12.3/debian/patches/series
--- kpmcore-24.12.3/debian/patches/series 2025-05-04 00:19:45.000000000 +0200
+++ kpmcore-24.12.3/debian/patches/series 2025-06-09 09:00:32.000000000 +0200
@@ -1 +1,3 @@
fix-misleading-pl-translation.patch
+upstream_8b4b5c86_Fix-a-memory-leak-by-actually-freeing-a-correct-pointer.patch
+upstream_98838306_Fix-a-crash-when-filesystem-nullptr-.patch
diff -Nru kpmcore-24.12.3/debian/patches/upstream_8b4b5c86_Fix-a-memory-leak-by-actually-freeing-a-correct-pointer.patch kpmcore-24.12.3/debian/patches/upstream_8b4b5c86_Fix-a-memory-leak-by-actually-freeing-a-correct-pointer.patch
--- kpmcore-24.12.3/debian/patches/upstream_8b4b5c86_Fix-a-memory-leak-by-actually-freeing-a-correct-pointer.patch 1970-01-01 01:00:00.000000000 +0100
+++ kpmcore-24.12.3/debian/patches/upstream_8b4b5c86_Fix-a-memory-leak-by-actually-freeing-a-correct-pointer.patch 2025-06-09 08:53:15.000000000 +0200
@@ -0,0 +1,35 @@
+From 8b4b5c86cfd278fa0cf3e05f6ad2cd33ca1bd600 Mon Sep 17 00:00:00 2001
+From: Gleb Popov <6yearold@gmail.com>
+Date: Mon, 24 Feb 2025 19:24:07 +0300
+Subject: [PATCH] Fix a memory leak by actually freeing a correct pointer
+
+---
+ src/plugins/sfdisk/sfdiskbackend.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/sfdisk/sfdiskbackend.cpp b/src/plugins/sfdisk/sfdiskbackend.cpp
+index 3c4b900b..e47c4e58 100644
+--- a/src/plugins/sfdisk/sfdiskbackend.cpp
++++ b/src/plugins/sfdisk/sfdiskbackend.cpp
+@@ -108,7 +108,7 @@ QList<Device*> SfdiskBackend::scanDevices(const ScanFlags scanFlags)
+ result.append(device);
+ }
+ }
+-
++
+ }
+
+ VolumeManagerDevice::scanDevices(result); // scan all types of VolumeManagerDevices
+@@ -337,8 +337,8 @@ void SfdiskBackend::scanWholeDevicePartition(Device& d) {
+ Partition *partition = scanPartition(d, partitionNode, firstSector, lastSector, QString(), false);
+
+ if (partition->fileSystem().type() == FileSystem::Type::Unknown) {
+- setPartitionTableForDevice(d, nullptr);
+ delete d.partitionTable();
++ setPartitionTableForDevice(d, nullptr);
+ }
+
+ if (!partition->roles().has(PartitionRole::Luks))
+--
+GitLab
+
diff -Nru kpmcore-24.12.3/debian/patches/upstream_98838306_Fix-a-crash-when-filesystem-nullptr-.patch kpmcore-24.12.3/debian/patches/upstream_98838306_Fix-a-crash-when-filesystem-nullptr-.patch
--- kpmcore-24.12.3/debian/patches/upstream_98838306_Fix-a-crash-when-filesystem-nullptr-.patch 1970-01-01 01:00:00.000000000 +0100
+++ kpmcore-24.12.3/debian/patches/upstream_98838306_Fix-a-crash-when-filesystem-nullptr-.patch 2025-06-09 09:00:32.000000000 +0200
@@ -0,0 +1,31 @@
+From 9883830642b943d8b26b7d83f1ac87b0a63b5b48 Mon Sep 17 00:00:00 2001
+From: Fabio Bas <ctrlaltca@gmail.com>
+Date: Tue, 22 Apr 2025 14:40:33 +0200
+Subject: [PATCH] Fix a crash when filesystem==nullptr.
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+(cherry picked from commit 458ef81f2e424f13cdea44d2d89b8260b463e34e)
+
+Co-authored-by: Andrius Štikonas <andrius@stikonas.eu>
+---
+ src/plugins/sfdisk/sfdiskbackend.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/plugins/sfdisk/sfdiskbackend.cpp b/src/plugins/sfdisk/sfdiskbackend.cpp
+index e47c4e58..447c096b 100644
+--- a/src/plugins/sfdisk/sfdiskbackend.cpp
++++ b/src/plugins/sfdisk/sfdiskbackend.cpp
+@@ -515,6 +515,8 @@ bool SfdiskBackend::updateDevicePartitionTable(Device &d, const QJsonObject &jso
+ */
+ void SfdiskBackend::readSectorsUsed(const Device& d, Partition& p, const QString& mountPoint)
+ {
++ if (p.isFileSystemNullptr())
++ return;
+ if (!mountPoint.isEmpty() && p.fileSystem().type() != FileSystem::Type::LinuxSwap && p.fileSystem().type() != FileSystem::Type::Lvm2_PV) {
+ const QStorageInfo storage = QStorageInfo(mountPoint);
+ if (p.isMounted() && storage.isValid())
+--
+GitLab
+
diff -Nru kpmcore-24.12.3/debian/rules kpmcore-24.12.3/debian/rules
--- kpmcore-24.12.3/debian/rules 2024-12-21 08:39:01.000000000 +0100
+++ kpmcore-24.12.3/debian/rules 2025-06-09 09:01:20.000000000 +0200
@@ -15,4 +15,4 @@
rm debian/tmp/usr/share/locale/*/LC_MESSAGES/kpmcore._policy_.mo
# Not sure these can work in a chroot
-override_dh_auto_test:
+#override_dh_auto_test:
--- End Message ---