Date: Monday, May 26, 2014 @ 10:53:32
Author: andrea
Revision: 213594
upgpkg: kdelibs 4.13.1-3
Fix CIFS mount (FS#40475)
Added:
kdelibs/trunk/fix-cifs-mount.patch
Modified:
kdelibs/trunk/PKGBUILD
----------------------+
PKGBUILD | 10 +++++++---
fix-cifs-mount.patch | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 56 insertions(+), 3 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2014-05-25 20:34:12 UTC (rev 213593)
+++ PKGBUILD 2014-05-26 08:53:32 UTC (rev 213594)
@@ -4,7 +4,7 @@
pkgname=kdelibs
pkgver=4.13.1
-pkgrel=2
+pkgrel=3
pkgdesc="KDE Core Libraries"
arch=('i686' 'x86_64')
url='https://projects.kde.org/projects/kde/kdelibs'
@@ -16,11 +16,13 @@
makedepends=('cmake' 'automoc4' 'avahi' 'libgl' 'hspell' 'mesa')
install=${pkgname}.install
source=("http://download.kde.org/stable/${pkgver}/src/${pkgname}-${pkgver}.tar.xz";
- 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch')
+ 'kde-applications-menu.patch' 'archlinux-menu.patch' 'qt4.patch'
+ 'fix-cifs-mount.patch')
sha1sums=('1008effc37f316bf6e3a4d527c4257937fc572ec'
'86ee8c8660f19de8141ac99cd6943964d97a1ed7'
'63a850ab4196b9d06934f2b4a13acd9f7739bc67'
- 'ed1f57ee661e5c7440efcaba7e51d2554709701c')
+ 'ed1f57ee661e5c7440efcaba7e51d2554709701c'
+ '26bbebeaf3f882d84030fd9b39b7b4c9debbbeec')
prepare() {
cd ${pkgname}-${pkgver}
@@ -30,6 +32,8 @@
patch -p1 -i "${srcdir}"/archlinux-menu.patch
# qmake refers to Qt5
patch -p1 -i "${srcdir}"/qt4.patch
+
+ patch -p1 -i "${srcdir}"/fix-cifs-mount.patch
}
build() {
Added: fix-cifs-mount.patch
===================================================================
--- fix-cifs-mount.patch (rev 0)
+++ fix-cifs-mount.patch 2014-05-26 08:53:32 UTC (rev 213594)
@@ -0,0 +1,49 @@
+commit 9a8426ae2ed35ac900b89a623618fc158d24ee6a
+Author: Tomáš Trnka <tomastr...@gmx.com>
+Date: Sun May 25 16:12:36 2014 +0200
+
+ Revert "Avoid unnecessary automounting in
KDiskFreeSpaceInfo::freeSpaceInfo"
+
+ This reverts commit 6246e99b43f3d1a9e15d563fbb5e173ed50ba5e5.
+
+ It breaks KIO on CIFS mounts as the check for automounts copied over
+ from frameworks/kfileitem.cpp isDirectoryMounted() apparently matches
+ CIFS as well (and for some weird reason KIO checks for available space
+ before trying to copy files).
+
+ We'll probably have to return to v1 of the abovementioned commit, i.e.
+ checking for "autofs" explicitly. However, more testing is apparently
+ necessary to avoid further nasty surprises.
+
+ REVIEW: 117044
+ BUG: 334776
+ FIXED-IN: 4.13.2
+
+diff --git a/kio/kfile/kdiskfreespaceinfo.cpp
b/kio/kfile/kdiskfreespaceinfo.cpp
+index 5c1fa72..f11eb09 100644
+--- a/kio/kfile/kdiskfreespaceinfo.cpp
++++ b/kio/kfile/kdiskfreespaceinfo.cpp
+@@ -33,7 +33,6 @@
+ #include <QtCore/QDir>
+ #include <windows.h>
+ #else
+-#include <QtCore/QFileInfo>
+ #include <sys/statvfs.h>
+ #endif
+
+@@ -131,15 +130,6 @@ KDiskFreeSpaceInfo KDiskFreeSpaceInfo::freeSpaceInfo(
const QString& path )
+ #else
+ struct statvfs statvfs_buf;
+
+- // Ignore autofs mountpoints as statvfs would trigger (expensive)
automounting
+- // This also matches "special" filesystems like /proc where free space
has no meaning
+- if (mp) {
+- QFileInfo fi(info.d->mountPoint);
+- if (fi.isDir() && fi.size() == 0) {
+- return info;
+- }
+- }
+-
+ // Prefer mountPoint if available, so that it even works with
non-existing files.
+ const QString pathArg = info.d->mountPoint.isEmpty() ? path :
info.d->mountPoint;
+ if (!statvfs(QFile::encodeName(pathArg).constData(), &statvfs_buf)) {
