Accepting request 648043 from KDE:Applications
KDE Applications 18.08.3 OBS-URL: https://build.opensuse.org/request/show/648043 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kio-extras5?expand=0&rev=64
This commit is contained in:
commit
0cd233133d
@ -1,37 +0,0 @@
|
|||||||
From 767415da97a7fae3c5578b9a4fb17a7be041d8ae Mon Sep 17 00:00:00 2001
|
|
||||||
From: Kai Uwe Broulik <kde@privat.broulik.de>
|
|
||||||
Date: Fri, 31 Aug 2018 09:17:17 +0200
|
|
||||||
Subject: [PATCH] Avoid crash by not checking free space for smb://
|
|
||||||
|
|
||||||
This isn't a real location but the overview of all found hosts.
|
|
||||||
smbc_opendir would succeed but then crash in smbc_fstatvfs
|
|
||||||
|
|
||||||
Differential Revision: https://phabricator.kde.org/D15142
|
|
||||||
|
|
||||||
(cherry picked from commit 000b1d910b71b491621c7cdbd934c277171c20bf)
|
|
||||||
---
|
|
||||||
smb/kio_smb_browse.cpp | 8 ++++++++
|
|
||||||
1 file changed, 8 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp
|
|
||||||
index 47b2b328..1fa0e6fb 100644
|
|
||||||
--- a/smb/kio_smb_browse.cpp
|
|
||||||
+++ b/smb/kio_smb_browse.cpp
|
|
||||||
@@ -492,6 +492,14 @@ void SMBSlave::fileSystemFreeSpace(const QUrl& url)
|
|
||||||
{
|
|
||||||
qCDebug(KIO_SMB) << url;
|
|
||||||
|
|
||||||
+ // Avoid crashing in smbc_fstatvfs below when
|
|
||||||
+ // requesting free space for smb:// which doesn't
|
|
||||||
+ // make sense to do to begin with
|
|
||||||
+ if (url.host().isEmpty()) {
|
|
||||||
+ error(KIO::ERR_COULD_NOT_STAT, url.url());
|
|
||||||
+ return;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
SMBUrl smbcUrl = url;
|
|
||||||
int handle = smbc_opendir(smbcUrl.toSmbcUrl());
|
|
||||||
if (handle < 0) {
|
|
||||||
--
|
|
||||||
2.19.1
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:25e89675d9036bc0740f91e44c0a912e9a06247753ab5081740f67e3616044b3
|
|
||||||
size 552276
|
|
3
kio-extras-18.08.3.tar.xz
Normal file
3
kio-extras-18.08.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:450d69b16a873da51190c9397b2b0ecb08bc0dcae0d2a07f7ab1d2efcd02c280
|
||||||
|
size 552044
|
@ -1,3 +1,16 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Nov 08 20:43:38 UTC 2018 - lbeltrame@kde.org
|
||||||
|
|
||||||
|
- Update to 18.08.3
|
||||||
|
* New bugfix release
|
||||||
|
* For more details please see:
|
||||||
|
* https://www.kde.org/announcements/announce-applications-18.08.3.php
|
||||||
|
- Changes since 18.08.2:
|
||||||
|
* apply eexist workaround from listDir to stat as well (kde#399699)
|
||||||
|
* Avoid crash by not checking free space for smb://
|
||||||
|
- Dropped patches, now upstream:
|
||||||
|
* 0001-Avoid-crash-by-not-checking-free-space-for-smb.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Wed Oct 17 11:58:56 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
|
Wed Oct 17 11:58:56 UTC 2018 - Luca Beltrame <lbeltrame@kde.org>
|
||||||
|
|
||||||
|
@ -19,7 +19,7 @@
|
|||||||
%bcond_without lang
|
%bcond_without lang
|
||||||
|
|
||||||
Name: kio-extras5
|
Name: kio-extras5
|
||||||
Version: 18.08.2
|
Version: 18.08.3
|
||||||
Release: 0
|
Release: 0
|
||||||
%define kf5_version 5.26.0
|
%define kf5_version 5.26.0
|
||||||
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
# Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA)
|
||||||
@ -33,8 +33,6 @@ Source99: %{name}-rpmlintrc
|
|||||||
Patch0: fix-mtp-paste-with-KF5-5.25.diff
|
Patch0: fix-mtp-paste-with-KF5-5.25.diff
|
||||||
# PATCH-FEATURE-UPSTREAM
|
# PATCH-FEATURE-UPSTREAM
|
||||||
Patch1: 0001-sftp-bump-pending-request-count-from-1-to-128.patch
|
Patch1: 0001-sftp-bump-pending-request-count-from-1-to-128.patch
|
||||||
# PATCH-FIX-UPSTREAM
|
|
||||||
Patch2: 0001-Avoid-crash-by-not-checking-free-space-for-smb.patch
|
|
||||||
BuildRequires: OpenEXR-devel
|
BuildRequires: OpenEXR-devel
|
||||||
BuildRequires: flac-devel
|
BuildRequires: flac-devel
|
||||||
BuildRequires: gperf
|
BuildRequires: gperf
|
||||||
|
Loading…
Reference in New Issue
Block a user