gentoo resync : 05.12.2021

5 files changed, 88 insertions, 8 deletions

diff --git a/sys-libs/kpmcore/Manifest b/sys-libs/kpmcore/Manifest
index b29d8ecab217..638804342746 100644
--- a/sys-libs/kpmcore/Manifest
+++ b/sys-libs/kpmcore/Manifest
@@ -1,5 +1,7 @@
-DIST kpmcore-21.04.3.tar.xz 586264 BLAKE2B b9733f8b941fed98503e78b9c0357e002df92a39c4e70885822f6bb8944cf2c76be1fbba23e4cedf104b46a95832e72d2384c0d78abde312e0b2be40aa4d5745 SHA512 44614e3a0db646b81e56b87daa841b7b7e03ff97699ea393d83b6cc61e6c12efa36ac6b8aba87da612f2973a1d108bdad21ef0d73fc2db98595e5b711e5a0fcf
+AUX kpmcore-21.08.3-dont-destroy-zfs-pool.patch 1539 BLAKE2B 926b93a359383686e341a52ac5a74b20b48e9c8e66ff0b61ebaeaf39137ea1f96600951c41b503c903d778767547717b271d7052f688e46964873e8ba3e2c81e SHA512 3da2cadc6ab753edaf502dbca775cd96700096b2b28d9ad63039872e6728d111b855b77d77b9b2481ff439945f094f35e071425584e752c92ddc53ed5b5ae96e
+AUX kpmcore-21.08.3-fix-seek-error-when-shred-partition.patch 1017 BLAKE2B 88775e15a0d7ab025645f3423675cc6a141ce343eb91c8f352cc5e32dbb4e02c11763c777fb7eccea653eeec49adaefe407261d3415745d4c561a00999ffbcb6 SHA512 2321b77cb3f80de4ff94dc886f06317bb6f3a09080d71b9e3ffbc87c6091332e6dc4e01b7c33da4724683c860f6df7b547a3c10be38f48310cbd707707e9688d
 DIST kpmcore-21.08.3.tar.xz 589464 BLAKE2B 188a702b21976c352bea49c3e40e86c6d3f85b398c3dc9577301471c49cbbf8f161a5f6b62acfc020bcd9530aab2739a39023170c7586a1f18e52add4b2d6ecd SHA512 16570fe9b5e4e83d26b1c2e591d797cd23f37a2195ac5f043ee921d038d0e10d63f9d2c72c4d710e10eeb05d81a6df577f9ddb48b762b034154e399560daa7a7
-EBUILD kpmcore-21.04.3.ebuild 738 BLAKE2B 283bdba57268a73410f37b011dc4b1d975bd4319497aed024073950a695c13ceb7b7912966da86ebbd71181a70539b443c81062f4abdf60895cb672e39688d4e SHA512 ec32c6db3717e1c8be8fff04cd566ef313fb5a7c6c6de2dc6d7b3dd18fcd4ebec16ee24d92bd8ff094dba7dc1ccb51f4eb921cc193eb4023096c346e5e955f6b
-EBUILD kpmcore-21.08.3.ebuild 739 BLAKE2B b33db70a783bbfabdd5c3863896d8914346cb18e22a806a14418ed6800365d800f348e3b8540c063f33c78ce186240abe18274980ba165021b93824280da4e2e SHA512 8d73b3aca6a8ec64a2e93ee1f59f6ebe6d6bfa857067bcab8eb776795f2deb6789eb686ac55272b225a26c0549aea735fa8249d8c548a89f4882e8af33b17dda
+DIST kpmcore-21.11.90.tar.xz 594208 BLAKE2B 972ec50bf2deb8d9c987cc1902d3b744a668010e2f081a27307349ecae0629a2a7e75844450df6b2f2be584d2c47eeeeffcabff8a65b5730dfef0140ddc28f4d SHA512 c975c0221b711976551a1f9457329da5c52dd2ba8e582ef0e92be0f8bb1fe51c92df875044c1f8c6ed55b7e8c008215bf43cb9b98486dbc11b17acd58e15dbdf
+EBUILD kpmcore-21.08.3-r1.ebuild 859 BLAKE2B ce8a1d8701008c122a79d78d39f3b744015848db11202201493ced6b342da5cc4cf40fe02f9ba75862c6f2f3f2a473695676d85ea44b588bc212e8e2e2259824 SHA512 dc3bc3f41ac00c73c4403dd4b07cb4be14e63ed30a78d0228391a5b40abdcd51bdbc9faa4c3359e3dff029a5c5ed26aced47f3dd3af9431933c161749b55b8dd
+EBUILD kpmcore-21.11.90.ebuild 739 BLAKE2B d61b51f7d4f75c83a52ecbb5aef0db9bb96992ef84783079cd2f58d094a99bda659756b140988bfc27137eb641f14ab1d904a3af2b3ee64fb3efce2207440354 SHA512 fa9f6bc514b18cfa9b737d1c4223d2dbf312d95d5d46dfa10a0b1b5b0530e5441803c8c70e5766ca4d1526b149613fabff2e18e58eb77292fb87975250eeef57
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/sys-libs/kpmcore/files/kpmcore-21.08.3-dont-destroy-zfs-pool.patch b/sys-libs/kpmcore/files/kpmcore-21.08.3-dont-destroy-zfs-pool.patch
new file mode 100644
index 000000000000..83cc15d0f2d5
--- /dev/null
+++ b/sys-libs/kpmcore/files/kpmcore-21.08.3-dont-destroy-zfs-pool.patch
@@ -0,0 +1,46 @@
+From 282cfdcde179ec44d053b257e13aa715158596bd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Sat, 30 Oct 2021 21:13:07 +0100
+Subject: [PATCH] Do not destroy zfs pool when removing zfs partition.
+
+This can be dangerous, e.g. if partition is part of raid set.
+So better be more cautious and in some cases fail to remove partition
+than lose data.
+---
+ src/fs/zfs.cpp | 7 -------
+ src/fs/zfs.h   | 1 -
+ 2 files changed, 8 deletions(-)
+
+diff --git a/src/fs/zfs.cpp b/src/fs/zfs.cpp
+index 5d12894..5f4c87d 100644
+--- a/src/fs/zfs.cpp
++++ b/src/fs/zfs.cpp
+@@ -77,13 +77,6 @@ qint64 zfs::maxCapacity() const
+     return Capacity::unitFactor(Capacity::Unit::Byte, Capacity::Unit::EiB);
+ }
+ 
+-bool zfs::remove(Report& report, const QString& deviceNode) const
+-{
+-    Q_UNUSED(deviceNode)
+-    ExternalCommand cmd(report, QStringLiteral("zpool"), { QStringLiteral("destroy"), QStringLiteral("-f"), label() });
+-    return cmd.run(-1) && cmd.exitCode() == 0;
+-}
+-
+ bool zfs::writeLabel(Report& report, const QString& deviceNode, const QString& newLabel)
+ {
+     Q_UNUSED(deviceNode)
+diff --git a/src/fs/zfs.h b/src/fs/zfs.h
+index 6e559de..61026c3 100644
+--- a/src/fs/zfs.h
++++ b/src/fs/zfs.h
+@@ -35,7 +35,6 @@ public:
+ public:
+     void init() override;
+ 
+-    bool remove(Report& report, const QString& deviceNode) const override;
+     bool writeLabel(Report& report, const QString& deviceNode, const QString& newLabel) override;
+ 
+     CommandSupportType supportGetUsed() const override {
+-- 
+GitLab
+
diff --git a/sys-libs/kpmcore/files/kpmcore-21.08.3-fix-seek-error-when-shred-partition.patch b/sys-libs/kpmcore/files/kpmcore-21.08.3-fix-seek-error-when-shred-partition.patch
new file mode 100644
index 000000000000..568db790c7e9
--- /dev/null
+++ b/sys-libs/kpmcore/files/kpmcore-21.08.3-fix-seek-error-when-shred-partition.patch
@@ -0,0 +1,27 @@
+From e9fc875c5e233401afd12f54ab0472c66ff6fdff Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andrius=20=C5=A0tikonas?= <andrius@stikonas.eu>
+Date: Fri, 12 Nov 2021 01:02:15 +0000
+Subject: [PATCH] Fix seek error when filling device with random data or
+ zeroes.
+
+---
+ src/util/externalcommandhelper.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/util/externalcommandhelper.cpp b/src/util/externalcommandhelper.cpp
+index 6e61aba..0fa400d 100644
+--- a/src/util/externalcommandhelper.cpp
++++ b/src/util/externalcommandhelper.cpp
+@@ -80,7 +80,8 @@ bool ExternalCommandHelper::readData(const QString& sourceDevice, QByteArray& bu
+         return false;
+     }
+ 
+-    if (!device.seek(offset)) {
++    // Sequential devices such as /dev/zero or /dev/urandom return false on seek().
++    if (!device.isSequential() && !device.seek(offset)) {
+         qCritical() << xi18n("Could not seek position %1 on device <filename>%2</filename>.", offset, sourceDevice);
+         return false;
+     }
+-- 
+GitLab
+
diff --git a/sys-libs/kpmcore/kpmcore-21.04.3.ebuild b/sys-libs/kpmcore/kpmcore-21.08.3-r1.ebuild
index 89b01d630c8b..dbf7c293053e 100644
--- a/sys-libs/kpmcore/kpmcore-21.04.3.ebuild
+++ b/sys-libs/kpmcore/kpmcore-21.08.3-r1.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 ECM_NONGUI="true"
 KDE_GEAR="true"
-KFMIN=5.80.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -18,9 +18,8 @@ KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE=""
 
 # bug 689468, tests need polkit etc.
-RESTRICT+=" test"
+RESTRICT="test"
 
-BDEPEND="virtual/pkgconfig"
 DEPEND="
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
@@ -32,3 +31,9 @@ DEPEND="
 	sys-auth/polkit-qt
 "
 RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-dont-destroy-zfs-pool.patch"
+	"${FILESDIR}/${P}-fix-seek-error-when-shred-partition.patch"
+)
diff --git a/sys-libs/kpmcore/kpmcore-21.08.3.ebuild b/sys-libs/kpmcore/kpmcore-21.11.90.ebuild
index ba39ac6ae27c..9cf2587af684 100644
--- a/sys-libs/kpmcore/kpmcore-21.08.3.ebuild
+++ b/sys-libs/kpmcore/kpmcore-21.11.90.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 ECM_NONGUI="true"
 KDE_GEAR="true"
-KFMIN=5.84.0
+KFMIN=5.88.0
 QTMIN=5.15.2
 inherit ecm kde.org