public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
* [rpms/kio-fuse] epel10: 5.1.1
@ 2026-07-30 15:54 Steve Cossette
  0 siblings, 0 replies; only message in thread
From: Steve Cossette @ 2026-07-30 15:54 UTC (permalink / raw)
  To: git-commits

A new commit has been pushed.

Repo   : rpms/kio-fuse
Branch : epel10
Commit : b7161e293618d999c19e76eabdd9995a5abc7e87
Author : Steve Cossette <farchord@gmail.com>
Date   : 2025-10-13T19:05:08-04:00
Stats  : +9/-89 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/kio-fuse/c/b7161e293618d999c19e76eabdd9995a5abc7e87?branch=epel10

Log:
5.1.1

---
diff --git a/.gitignore b/.gitignore
index 6fb9f05..f96c43c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
 /kio-fuse-v5.0.1.tar.bz2
 /kio-fuse-5.1.0.tar.xz
 /kio-fuse-5.1.0.tar.xz.sig
+/kio-fuse-5.1.1.tar.xz
+/kio-fuse-5.1.1.tar.xz.sig

diff --git a/kio-fuse-5.1.0-use-KIO__rmdir-for-unlinking-directories.patch b/kio-fuse-5.1.0-use-KIO__rmdir-for-unlinking-directories.patch
deleted file mode 100644
index 0f3ed53..0000000
--- a/kio-fuse-5.1.0-use-KIO__rmdir-for-unlinking-directories.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 830f5cb4784a2e584bbfadeabe93410f0005205c Mon Sep 17 00:00:00 2001
-From: Fabian Vogt <fabian@ritter-vogt.de>
-Date: Fri, 8 Mar 2024 22:26:27 +0100
-Subject: [PATCH] Use KIO::rmdir for unlinking directories
-
-Unlike KIO::del, this fails if the directory is not empty.
-
-BUG: 482902
----
- kiofusevfs.cpp        |  8 +++++---
- tests/fileopstest.cpp | 22 ++++++++++++++++++++++
- 2 files changed, 27 insertions(+), 3 deletions(-)
-
-diff --git a/kiofusevfs.cpp b/kiofusevfs.cpp
-index a9d5a95..10cddfe 100644
---- a/kiofusevfs.cpp
-+++ b/kiofusevfs.cpp
-@@ -873,8 +873,10 @@ void KIOFuseVFS::unlinkHelper(fuse_req_t req, fuse_ino_t parent, const char *nam
- 		}
- 	}
- 
--	auto *job = KIO::del(that->remoteUrl(node));
--	that->connect(job, &KIO::SimpleJob::finished, that, [=] {
-+	auto remoteUrl = that->remoteUrl(node);
-+	// Use KIO::rmdir to ensure that the directory is really empty (kde#482902)
-+	auto *job = isDirectory ? static_cast<KIO::Job*>(KIO::rmdir(remoteUrl)) : KIO::del(remoteUrl);
-+	that->connect(job, &KIO::Job::finished, that, [=] {
- 		if(job->error())
- 		{
- 			fuse_reply_err(req, kioErrorToFuseError(job->error()));
-@@ -2473,7 +2475,7 @@ int KIOFuseVFS::kioErrorToFuseError(const int kioError) {
- 		case KIO::ERR_CANNOT_STAT                  : return EIO;
- 		case KIO::ERR_CANNOT_CLOSEDIR              : return EIO;
- 		case KIO::ERR_CANNOT_MKDIR                 : return EIO;
--		case KIO::ERR_CANNOT_RMDIR                 : return EIO;
-+		case KIO::ERR_CANNOT_RMDIR                 : return ENOTEMPTY;
- 		case KIO::ERR_CANNOT_RESUME                : return ECONNABORTED;
- 		case KIO::ERR_CANNOT_RENAME                : return EIO;
- 		case KIO::ERR_CANNOT_CHMOD                 : return EIO;
-diff --git a/tests/fileopstest.cpp b/tests/fileopstest.cpp
-index 1219f5d..4ef6d02 100644
---- a/tests/fileopstest.cpp
-+++ b/tests/fileopstest.cpp
-@@ -51,6 +51,7 @@ private Q_SLOTS:
- 	void testTypeRefresh();
- 	void testDirSymlink();
- 	void testSymlinkRewrite();
-+	void testNonemptyRmdir();
- #ifdef WASTE_DISK_SPACE
- 	void testReadWrite4GBFile();
- #endif // WASTE_DISK_SPACE
-@@ -991,6 +992,27 @@ void FileOpsTest::testSymlinkRewrite()
- 	         QDir(reply).filePath(QStringLiteral("somewhere")));
- }
- 
-+void FileOpsTest::testNonemptyRmdir()
-+{
-+	QTemporaryDir localTmpDir;
-+	QVERIFY(localTmpDir.isValid());
-+	QDir localDir(localTmpDir.path());
-+
-+	// Mount the temporary dir
-+	QString reply = m_kiofuse_iface.mountUrl(QStringLiteral("file://%1").arg(localDir.path())).value();
-+	QVERIFY(!reply.isEmpty());
-+
-+	QDir mirrorDir(reply);
-+	QVERIFY(mirrorDir.exists());
-+
-+	// Create a directory structure inside
-+	localDir.mkpath(QStringLiteral("outer/inner"));
-+
-+	// Attempt to rmdir "outer" while "inner" exists inside.
-+	QCOMPARE(rmdir(qPrintable(mirrorDir.filePath(QStringLiteral("outer")))), -1);
-+	QCOMPARE(errno, ENOTEMPTY);
-+}
-+
- #ifdef WASTE_DISK_SPACE
- void FileOpsTest::testReadWrite4GBFile()
- {
--- 
-GitLab
-

diff --git a/kio-fuse.spec b/kio-fuse.spec
index 6fe30a8..c5d6116 100644
--- a/kio-fuse.spec
+++ b/kio-fuse.spec
@@ -9,8 +9,8 @@
 %endif
 
 Name:           kio-fuse
-Version:        5.1.0
-Release:        9%{?dist}
+Version:        5.1.1
+Release:        1%{?dist}
 Summary:        KIO FUSE
 
 License:        GPL-3.0-or-later
@@ -20,9 +20,6 @@ Source1:        https://download.kde.org/stable/%{name}/%{name}-%{version}.tar.x
 Source2:        gpgkey-21EC3FD75D26B39E820BE6FBD27C2C1AF21D8BAD.gpg
 
 ## upstream fixes
-# Data loss on remote mount when using rmdir in terminal
-# https://bugs.kde.org/show_bug.cgi?id=482902
-Patch0:         kio-fuse-5.1.0-use-KIO__rmdir-for-unlinking-directories.patch
 
 BuildRequires:  cmake
 BuildRequires:  gnupg2
@@ -87,6 +84,9 @@ dbus-launch --exit-with-session \
 
 
 %changelog
+* Mon Oct 13 2025 Steve Cossette <farchord@gmail.com> - 5.1.1-1
+- 5.1.1
+
 * Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.0-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
 

diff --git a/sources b/sources
index 871078b..1338613 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (kio-fuse-5.1.0.tar.xz) = 273b75fe90f8cb31ee0f611716bf05384d78d21747cb43785bb7a91037ca9ac30233aee5081e467d46aa21aa03f4c0fc7583334fe34dec7530c89c818db41a4b
-SHA512 (kio-fuse-5.1.0.tar.xz.sig) = 09d2946a91330753ff1fd79f98774f72f18c609d94ec97ed2346e64779acbe8dfa4cf924f509c76e63d35b0aadddb87ec81600ab27115db293a172fcb0edbd04
+SHA512 (kio-fuse-5.1.1.tar.xz) = 1a529f43ac96ad3e7cfa684bb056ed70089a73bf858969cb09f297967a1d3f49d25586d75c30ae5a636cf946d09d97a5c286156e79d12f5c6105a1b965e3c1e8
+SHA512 (kio-fuse-5.1.1.tar.xz.sig) = edfb46fd8658ff22c6c69b3557e3ce073794bd230103f4e4031f0f772606782eefddc66c1605d98436aeec428824f8e56891ec56e016348f81fa83eaf21cea29

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2026-07-30 15:54 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2026-07-30 15:54 [rpms/kio-fuse] epel10: 5.1.1 Steve Cossette

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox