Hello community, here is the log from the commit of package kio for openSUSE:Factory checked in at 2018-05-08 13:32:26 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kio (Old) and /work/SRC/openSUSE:Factory/.kio.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kio" Tue May 8 13:32:26 2018 rev:63 rq:604385 version:5.45.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kio/kio.changes 2018-04-19 15:16:56.957450972 +0200 +++ /work/SRC/openSUSE:Factory/.kio.new/kio.changes 2018-05-08 13:32:27.572120292 +0200 @@ -1,0 +2,7 @@ +Fri May 4 14:39:14 UTC 2018 - [email protected] + +- Add 0001-Revert-Support-NTFS-hidden-files.patch to revert the new + support for NTFS hidden files, it caused the mount point itself + to be hidden (boo#1091780, kde#392913) + +------------------------------------------------------------------- New: ---- 0001-Revert-Support-NTFS-hidden-files.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kio.spec ++++++ --- /var/tmp/diff_new_pack.Z53K1d/_old 2018-05-08 13:32:28.328093016 +0200 +++ /var/tmp/diff_new_pack.Z53K1d/_new 2018-05-08 13:32:28.332092871 +0200 @@ -34,6 +34,8 @@ Source1: baselibs.conf # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 Patch0: kio_help-fallback-to-kde4-docs.patch +# PATCH-FIX-OPENSUSE +Patch1: 0001-Revert-Support-NTFS-hidden-files.patch BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes @@ -125,7 +127,7 @@ %lang_package %prep %setup -q -%patch0 -p1 +%autopatch -p1 %build %cmake_kf5 -d build ++++++ 0001-Revert-Support-NTFS-hidden-files.patch ++++++ >From 3640475b0a8ea4a2eca060ed0bcf1f8f8da22375 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer <[email protected]> Date: Fri, 4 May 2018 16:22:57 +0200 Subject: [PATCH] Revert "Support NTFS hidden files" This reverts commit d7cce9937d5e9af2753fadb82d11f308b58bb8fa. The new support for NTFS hidden files causes the mountpoint itself to be hidden as well, apparently the root directory of an NTFS partition always has the "hidden" attribute set. https://bugs.kde.org/show_bug.cgi?id=392913 http://bugzilla.opensuse.org/show_bug.cgi?id=1091780 --- src/ioslaves/file/file_unix.cpp | 54 ----------------------------------------- 1 file changed, 54 deletions(-) diff --git a/src/ioslaves/file/file_unix.cpp b/src/ioslaves/file/file_unix.cpp index afa2bd3f..826c46cd 100644 --- a/src/ioslaves/file/file_unix.cpp +++ b/src/ioslaves/file/file_unix.cpp @@ -37,9 +37,6 @@ #include <kmountpoint.h> #include <errno.h> -#if HAVE_SYS_XATTR_H -#include <sys/xattr.h> -#endif #include <utime.h> #include <KAuth> @@ -413,44 +410,6 @@ static bool isLocalFileSameHost(const QUrl &url) return (QString::compare(url.host(), QLatin1String(hostname), Qt::CaseInsensitive) == 0); } -#if HAVE_SYS_XATTR_H -static bool isNtfsHidden(const QString &filename) -{ - constexpr auto attrName = "system.ntfs_attrib_be"; - const auto filenameEncoded = QFile::encodeName(filename); - auto length = getxattr(filenameEncoded.data(), attrName, nullptr, 0); - if (length <= 0) { - return false; - } - constexpr size_t xattr_size = 1024; - char strAttr[xattr_size]; - length = getxattr(filenameEncoded.data(), attrName, strAttr, xattr_size); - if (length <= 0) { - return false; - } - - // Decode result to hex string - static constexpr auto digits = "0123456789abcdef"; - QVarLengthArray<char> hexAttr(static_cast<int>(length) * 2 + 4); - char *c = strAttr; - char *e = hexAttr.data(); - *e++ ='0'; - *e++ = 'x'; - for (auto n = 0; n < length; n++, c++) { - *e++ = digits[(static_cast<uchar>(*c) >> 4)]; - *e++ = digits[(static_cast<uchar>(*c) & 0x0F)]; - } - *e = '\0'; - - // Decode hex string to int - auto intAttr = static_cast<uint>(strtol(hexAttr.data(), nullptr, 16)); - - constexpr auto FILE_ATTRIBUTE_HIDDEN = 0x2u; - return static_cast<bool>(intAttr & FILE_ATTRIBUTE_HIDDEN); -} -#endif - - void FileProtocol::listDir(const QUrl &url) { if (!isLocalFileSameHost(url)) { @@ -555,11 +506,6 @@ void FileProtocol::listDir(const QUrl &url) } else { if (createUDSEntry(filename, QByteArray(ep->d_name), entry, details)) { -#if HAVE_SYS_XATTR_H - if (isNtfsHidden(filename)) { - entry.insert(KIO::UDSEntry::UDS_HIDDEN, 1); - } -#endif listEntry(entry); } } -- 2.13.6
