diff --git a/kio-extras-19.12.3.tar.xz b/kio-extras-19.12.3.tar.xz deleted file mode 100644 index 0dd4eee..0000000 --- a/kio-extras-19.12.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:413cb21479fedf1421a6e2585b4df813c3a3fadaa77c248a9f810021f58cea4b -size 581020 diff --git a/kio-extras-19.12.3.tar.xz.sig b/kio-extras-19.12.3.tar.xz.sig deleted file mode 100644 index 08b3275..0000000 --- a/kio-extras-19.12.3.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl5gzA8ACgkQ29LOiT4t -HIc7ZQgAgfgXc7AEuuKRcLiLmfyEMtg3nMLEy+rSSLBztuLN4iXVI66p/6wn2I45 -srJBCgMSJbB2qKXE0/PGP9NlHI//nQDPvtWW03atblwjRq38A8JPP7JNTYNuCvgX -0MEumheRyndtPCu3uJTt9P0QfhbD95CO3X6dkdRmj2+6vcbDHaOOoIB7cUZpLZqv -iV1jf7bJvfK1PH3bBaYz5V0gMTVjisRp6ouav9rU/P6nkyYehaJZxulcfpf16TDG -mkr544twd1rRe6PmS0OTpcG+3XTxt+YniMrZdD1sL6tcmVGs9z+c6vFQK6QyL1uQ -JbLObziLYqranQORn5U9KHbiQrWS7g== -=OuyU ------END PGP SIGNATURE----- diff --git a/kio-extras-20.04.0.tar.xz b/kio-extras-20.04.0.tar.xz new file mode 100644 index 0000000..1c81d2c --- /dev/null +++ b/kio-extras-20.04.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a70f6079a8d2acb8c64bf0d08f7f7e5685f2e9c4e49548c138609437fdc6cd4d +size 617252 diff --git a/kio-extras-20.04.0.tar.xz.sig b/kio-extras-20.04.0.tar.xz.sig new file mode 100644 index 0000000..74abd58 --- /dev/null +++ b/kio-extras-20.04.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6ZB8wACgkQ29LOiT4t +HIdWqQf7B1BO+NFoJF+tc+ZsuAXni4SNyGqD7Rtispodzq7JXHXFPIIeIKWrp7kb +tHoMgMI+qHLhSgjb1j/LgZoykTtK4IATddL/+K5sNgMVzEPgrvm95sbAd7AbTd5i +mkCMGTg1IPrN31MxLm9jEkkCO3XymFhaxkzL5J5H4rStlq33KGDoRvOhyHcwEO0T +UVCh4dTCN0UfKXCIt0IEsDM6mgSmHX6pqhnfqioVdqxXVndCx6Qm8lGWM6z6Pfza +Tpx6XfebrxfnXtWAPrDQW/eDTqVicJyfaIdsWLO8zo+qVOGTysdd8jRpRCwe9dPd +Jd+tQy5phtHgObvCgtEACvdZnrdwgg== +=3Z1H +-----END PGP SIGNATURE----- diff --git a/kio-extras5.changes b/kio-extras5.changes index b648dab..34a884d 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,55 @@ +------------------------------------------------------------------- +Sun May 3 16:28:47 UTC 2020 - Wolfgang Bauer + +- Add smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch + to fix some problems connecting to hosts found via the new + WS-Discovery method (kde#420578) + +------------------------------------------------------------------- +Thu Apr 23 12:22:28 UTC 2020 - Luca Beltrame + +- Update to 20.04.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- Changes since 20.03.90: + * sftp: extra verbosity when put fails + * smb: debug the smbc debug level + * Fix lifetime of slot in KIO-MTP + * smb: add hack to support spaces in workgroup names (kde#204423) + * smb: use prettyname.kio-discovery-wsd for hostname of wsdiscoveries + * import license copies via reuse + +------------------------------------------------------------------- +Sun Apr 5 20:30:07 UTC 2020 - Luca Beltrame + +- Update to 20.03.90 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-rc +- Changes since 20.03.80: + * sftp: fix partial transfer resuming when copying to local + * sftp: do not show creation time when we do not know it (kde#375305) + * smb: add some more topical debug output on opendir failure + * add some extra debug in case stat fails + +------------------------------------------------------------------- +Sun Mar 22 09:17:03 UTC 2020 - Luca Beltrame + +- Update to 20.03.80 + * New feature release + * For more details please see: + * https://kde.org/announcements/releases/20.04-beta +- Too many changes since 19.12.3, only listing bugfixes: + * sftp: fix seekPos + file resuming when part file is of size 11 (kde#417645) + * add readdirplus2 support for samba>=4.12 (kde#402988) + * smb: fix ipv6 support (kde#417682) + * add initial wsdiscovery support (kde#392447) + * smb: map EHOSTUNREACH to ERR_CANNOT_CONNECT (kde#417166) + * Improved quality of JPEG thumbnails (kde#411262) + * Restore cursor thumbnailer (kde#387660) + * fix preview of plain text files when using dark theme (kde#409380, kde#406821) + ------------------------------------------------------------------- Thu Mar 5 20:36:09 UTC 2020 - Luca Beltrame diff --git a/kio-extras5.spec b/kio-extras5.spec index 79c4c74..8f65808 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -1,7 +1,7 @@ # # spec file for package kio-extras5 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -22,21 +22,28 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio-extras5 -Version: 19.12.3 +Version: 20.04.0 Release: 0 Summary: Additional KIO slaves for KDE applications License: GPL-2.0-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz -%if %{with lang} -Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig -Source2: applications.keyring -%endif Source99: %{name}-rpmlintrc +# PATCH-FIX-UPSTREAM +Patch: smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch BuildRequires: OpenEXR-devel BuildRequires: flac-devel BuildRequires: gperf +BuildRequires: kf5-filesystem +BuildRequires: kdsoap-devel +BuildRequires: libjpeg-devel +BuildRequires: libmtp-devel +BuildRequires: libssh-devel +BuildRequires: libtag-devel +BuildRequires: openslp-devel +BuildRequires: pkgconfig +BuildRequires: xz BuildRequires: cmake(KF5Activities) BuildRequires: cmake(KF5ActivitiesStats) BuildRequires: cmake(KF5Archive) @@ -44,25 +51,17 @@ BuildRequires: cmake(KF5Config) BuildRequires: cmake(KF5ConfigWidgets) BuildRequires: cmake(KF5CoreAddons) BuildRequires: cmake(KF5DBusAddons) -BuildRequires: cmake(KF5KDELibs4Support) BuildRequires: cmake(KF5DNSSD) BuildRequires: cmake(KF5DocTools) -BuildRequires: kf5-filesystem -BuildRequires: cmake(KF5KHtml) BuildRequires: cmake(KF5I18n) BuildRequires: cmake(KF5IconThemes) +BuildRequires: cmake(KF5KDELibs4Support) +BuildRequires: cmake(KF5KHtml) BuildRequires: cmake(KF5KIO) BuildRequires: cmake(KF5Pty) -BuildRequires: libjpeg-devel -BuildRequires: libmtp-devel -BuildRequires: libssh-devel -BuildRequires: libtag-devel -BuildRequires: openslp-devel -BuildRequires: cmake(Phonon4Qt5) -BuildRequires: pkgconfig BuildRequires: cmake(KF5Solid) BuildRequires: cmake(KF5SyntaxHighlighting) -BuildRequires: xz +BuildRequires: cmake(Phonon4Qt5) BuildRequires: cmake(Qt5DBus) >= 5.4.0 BuildRequires: cmake(Qt5Network) >= 5.4.0 BuildRequires: cmake(Qt5Sql) @@ -80,6 +79,10 @@ Provides: kfileaudiopreview = 4.100.0 Obsoletes: kfileaudiopreview < 4.100.0 Provides: kde-odf-thumbnail = %{version} Obsoletes: kde-odf-thumbnail < %{version} +%if %{with lang} +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description Additional KIO-slaves for KDE applications. @@ -107,6 +110,7 @@ This is the development package for libkioarchive %prep %setup -q -n %{rname}-%{version} +%autopatch -p1 sed -i '/^add_subdirectory( doc )/d' CMakeLists.txt %build diff --git a/smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch b/smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch new file mode 100644 index 0000000..4b0feb9 --- /dev/null +++ b/smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch @@ -0,0 +1,36 @@ +From a4aefbbd35345ba6da80c65723161b7d16d3c431 Mon Sep 17 00:00:00 2001 +From: Harald Sitter +Date: Mon, 27 Apr 2020 11:36:36 +0200 +Subject: smb: accurately attempt to resolve the correct WSD host + +this previously was the wrong variable. m_current_url is only set after +url checking while kurl would be the current url under check. this lead +to state confusion was implicit stat() calls from dolphin on host foo would +evaluate the previous host (e.g. bar) for the wsd suffix. this meant we'll +let a foo with suffix pass through the check, and that just mustn't ever +happen. + +BUG: 420578 +FIXED-IN: 20.04.1 +--- + smb/kio_smb_browse.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/smb/kio_smb_browse.cpp b/smb/kio_smb_browse.cpp +index 048cea5..b6d956f 100644 +--- a/smb/kio_smb_browse.cpp ++++ b/smb/kio_smb_browse.cpp +@@ -234,8 +234,8 @@ QUrl SMBSlave::checkURL(const QUrl &kurl_) const + // NB: smbc has no way to resolve a name without also triggering auth etc.: we must + // rely on the system's ability to resolve DNSSD for this check. + const QLatin1String wsdSuffix(".kio-discovery-wsd"); +- if (m_current_url.host().endsWith(wsdSuffix)) { +- QString host = m_current_url.host(); ++ if (kurl.host().endsWith(wsdSuffix)) { ++ QString host = kurl.host(); + host.chop(wsdSuffix.size()); + const QString dnssd(host + ".local"); + auto dnssdHost = QHostInfo::fromName(dnssd); +-- +cgit v1.1 +