From b476ce075c7621fe8927813ff7d887a2e52ccb882d60012c432bfb0343f2300e Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Fri, 10 Nov 2017 09:15:49 +0000 Subject: [PATCH 1/4] KDE Applications 17.08.3 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=64 --- kio-extras-17.08.2.tar.xz | 3 --- kio-extras-17.08.3.tar.xz | 3 +++ kio-extras5.changes | 11 +++++++++++ kio-extras5.spec | 2 +- 4 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 kio-extras-17.08.2.tar.xz create mode 100644 kio-extras-17.08.3.tar.xz diff --git a/kio-extras-17.08.2.tar.xz b/kio-extras-17.08.2.tar.xz deleted file mode 100644 index 6f1c490..0000000 --- a/kio-extras-17.08.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d6fc25a3f83750ca2af27768a7278314139bda8591df70b8f49b3d11379a74dd -size 555728 diff --git a/kio-extras-17.08.3.tar.xz b/kio-extras-17.08.3.tar.xz new file mode 100644 index 0000000..afbc6b7 --- /dev/null +++ b/kio-extras-17.08.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4c268b22a50d7ed08dbb7211a34e562aa10c2cbb2c62fb4311a0f932c841013f +size 556316 diff --git a/kio-extras5.changes b/kio-extras5.changes index debc776..b8dc2b4 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Thu Nov 09 23:11:48 CET 2017 - lbeltrame@kde.org + +- Update to 17.08.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.08.3.php +- Changes since 17.08.2: + * Workaround incorrectly returned EEXIST instead of EPERM regression introduced by libsmbclient 4.7 (kde#385708) + * Fix smb:/ handling + ------------------------------------------------------------------- Wed Nov 1 12:36:03 UTC 2017 - wbauer@tmo.at diff --git a/kio-extras5.spec b/kio-extras5.spec index 6609bb7..913e40f 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -19,7 +19,7 @@ %bcond_without lang Name: kio-extras5 -Version: 17.08.2 +Version: 17.08.3 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) From 9b4f225a206f559ae51119c5490c70330ce751e576e9dac756a11abb6a95b46a Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 10 Nov 2017 14:09:02 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=65 --- workaround-bug-in-libsmbclient-4.7.patch | 118 ----------------------- 1 file changed, 118 deletions(-) delete mode 100644 workaround-bug-in-libsmbclient-4.7.patch diff --git a/workaround-bug-in-libsmbclient-4.7.patch b/workaround-bug-in-libsmbclient-4.7.patch deleted file mode 100644 index dedb36f..0000000 --- a/workaround-bug-in-libsmbclient-4.7.patch +++ /dev/null @@ -1,118 +0,0 @@ -From a36b797913a844dbb26d5dc1542b3ce304f5f445 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michal=20Mal=C3=BD?= -Date: Tue, 31 Oct 2017 18:19:21 -0600 -Subject: Workaround incorrectly returned EEXIST instead of EPERM regression - introduced by libsmbclient 4.7 - -Summary: -There appears to be an issue with libsmbclient 4.7 that returns nonsensical EEXIST error code when a user has not authenticated themselves to access password-protected shares. This patch attempts to work around the issue by treating EEXIST as another case of "invalid login credentials". The workaround tries to detect broken versions of libsmbclient and enables itself only when such a version is found. - -See https://bugzilla.samba.org/show_bug.cgi?id=13050 for upstream bug report. - -BUG: 385708 - -Reviewers: ngraham, davidedmundson, elvisangelaccio, #frameworks - -Reviewed By: ngraham, davidedmundson - -Subscribers: cfeck, rdieter, graesslin, z3ntu - -Differential Revision: https://phabricator.kde.org/D8387 ---- - smb/kio_smb.cpp | 30 +++++++++++++++++++++++++++++- - smb/kio_smb.h | 3 +++ - smb/kio_smb_browse.cpp | 7 ++++++- - 3 files changed, 38 insertions(+), 2 deletions(-) - -diff --git a/smb/kio_smb.cpp b/smb/kio_smb.cpp -index 2a2e424..1ea3f99 100644 ---- a/smb/kio_smb.cpp -+++ b/smb/kio_smb.cpp -@@ -31,12 +31,40 @@ - #include "kio_smb.h" - #include "kio_smb_internal.h" - #include -+#include - - Q_LOGGING_CATEGORY(KIO_SMB, "kio_smb") - -+bool needsEEXISTWorkaround() -+{ -+ /* There is an issue with some libsmbclient versions that return EEXIST -+ * return code from smbc_opendir() instead of EPERM when the user -+ * tries to access a resource that requires login authetification. -+ * We are working around the issue by treating EEXIST as a special case -+ * of "invalid/unavailable credentials" if we detect that we are using -+ * the affected versions of libsmbclient -+ * -+ * Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=13050 -+ */ -+ static const QVersionNumber firstBrokenVer{4, 7, 0}; -+ static const QVersionNumber lastBrokenVer{9, 9, 9}; /* Adjust accordingly when this gets fixed upstream */ -+ -+ const QVersionNumber currentVer = QVersionNumber::fromString(smbc_version()); -+ qCDebug(KIO_SMB) << "Using libsmbclient library version" << currentVer; -+ -+ if (currentVer >= firstBrokenVer && currentVer <= lastBrokenVer) { -+ qCDebug(KIO_SMB) << "Detected broken libsmbclient version" << currentVer; -+ return true; -+ } -+ -+ return false; -+} -+ - //=========================================================================== - SMBSlave::SMBSlave(const QByteArray& pool, const QByteArray& app) -- : SlaveBase( "smb", pool, app ), m_openFd(-1) -+ : SlaveBase( "smb", pool, app ), -+ m_openFd(-1), -+ m_enableEEXISTWorkaround(needsEEXISTWorkaround()) - { - m_initialized_smbc = false; - -diff --git a/smb/kio_smb.h b/smb/kio_smb.h -index 77866b1..22fa036 100644 ---- a/smb/kio_smb.h -+++ b/smb/kio_smb.h -@@ -278,6 +278,7 @@ private: - void smbCopy(const QUrl& src, const QUrl &dest, int permissions, KIO::JobFlags flags); - void smbCopyGet(const QUrl& src, const QUrl& dest, int permissions, KIO::JobFlags flags); - void smbCopyPut(const QUrl& src, const QUrl& dest, int permissions, KIO::JobFlags flags); -+ bool workaroundEEXIST(const int errNum) const; - - void fileSystemFreeSpace(const QUrl &url); - -@@ -288,6 +289,8 @@ private: - */ - int m_openFd; - SMBUrl m_openUrl; -+ -+ const bool m_enableEEXISTWorkaround; /* Enables a workaround for some broken libsmbclient versions */ - }; - - //========================================================================== -diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp -index 5995eec..47b2b32 100644 ---- a/smb/kio_smb_browse.cpp -+++ b/smb/kio_smb_browse.cpp -@@ -473,7 +473,7 @@ void SMBSlave::listDir( const QUrl& kurl ) - } - else - { -- if (errNum == EPERM || errNum == EACCES) { -+ if (errNum == EPERM || errNum == EACCES || workaroundEEXIST(errNum)) { - if (checkPassword(m_current_url)) { - redirection( m_current_url ); - finished(); -@@ -522,3 +522,8 @@ void SMBSlave::fileSystemFreeSpace(const QUrl& url) - finished(); - } - -+bool SMBSlave::workaroundEEXIST(const int errNum) const -+{ -+ return (errNum == EEXIST) && m_enableEEXISTWorkaround; -+} -+ --- -cgit v0.11.2 - From de3f7fdd9cb62d8a8b5f1d916902fdb8d0653cc337d23de0d271bf75e4557f12 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 10 Nov 2017 14:09:18 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=66 --- kio-extras5.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/kio-extras5.spec b/kio-extras5.spec index 913e40f..72c392e 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -31,8 +31,6 @@ Url: http://www.kde.org Source: kio-extras-%{version}.tar.xz Source99: %{name}-rpmlintrc Patch0: fix-mtp-paste-with-KF5-5.25.diff -# PATCH-FIX-UPSTREAM -Patch1: workaround-bug-in-libsmbclient-4.7.patch BuildRequires: OpenEXR-devel BuildRequires: flac-devel BuildRequires: gperf @@ -110,7 +108,6 @@ This is the development package for libkioarchive %prep %setup -q -n kio-extras-%{version} %patch0 -p1 -%patch1 -p1 sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt %build From b1514c081a72688f3a909d8226da3068b658b9aab87e85fbda1be8104170eb22 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Fri, 10 Nov 2017 14:10:52 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=67 --- kio-extras5.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/kio-extras5.changes b/kio-extras5.changes index b8dc2b4..208ba21 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -8,6 +8,7 @@ Thu Nov 09 23:11:48 CET 2017 - lbeltrame@kde.org - Changes since 17.08.2: * Workaround incorrectly returned EEXIST instead of EPERM regression introduced by libsmbclient 4.7 (kde#385708) * Fix smb:/ handling +- Drop workaround-bug-in-libsmbclient-4.7.patch (merged upstream) ------------------------------------------------------------------- Wed Nov 1 12:36:03 UTC 2017 - wbauer@tmo.at