From b6fd91a2bb9af2cdd73e37634a13f81ec83d3b53f0a9c69c353ed8a58349fd11 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Sat, 28 Mar 2020 13:57:42 +0000 Subject: [PATCH 1/4] KDE Applications 20.03.80 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=123 --- kio-extras-19.12.3.tar.xz | 3 --- kio-extras-19.12.3.tar.xz.sig | 11 ---------- kio-extras-20.03.80.tar.xz | 3 +++ kio-extras-20.03.80.tar.xz.sig | 16 +++++++++++++++ kio-extras5.changes | 17 ++++++++++++++++ kio-extras5.spec | 37 +++++++++++++++++----------------- 6 files changed, 55 insertions(+), 32 deletions(-) delete mode 100644 kio-extras-19.12.3.tar.xz delete mode 100644 kio-extras-19.12.3.tar.xz.sig create mode 100644 kio-extras-20.03.80.tar.xz create mode 100644 kio-extras-20.03.80.tar.xz.sig 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.03.80.tar.xz b/kio-extras-20.03.80.tar.xz new file mode 100644 index 0000000..7ecd2dd --- /dev/null +++ b/kio-extras-20.03.80.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f041f2a7c13eaaf3e486a4ea39208b0e2c2e9f422e234cc392e7ad4396d36ce7 +size 614824 diff --git a/kio-extras-20.03.80.tar.xz.sig b/kio-extras-20.03.80.tar.xz.sig new file mode 100644 index 0000000..4d2043b --- /dev/null +++ b/kio-extras-20.03.80.tar.xz.sig @@ -0,0 +1,16 @@ +-----BEGIN PGP SIGNATURE----- + +iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl50vAkACgkQOmpNuDnq +ptdeKw//UUj94z1Czc3GcFOhb8p8iM8rDwkV9fQe3jhxbI2DO1nPZ6nm0Pa2nkBi +kK1Y1jKAHnQBwujDXcaYifSy78FAp1MheQl9rnzkTIHVbobPMvA2gyA0d1sTnit2 +Qvnls/SLL7oOIGRdvl6eeFiWpJ2vF2oBWTNATISIXd6M5gFHs8zWfcKKyUMKI8GL +VdzOH0bAelpHwevN6SugyVFmJc/6SPJQW+HUEye8bTYUDvNFpCBvskFUsbKEhCHl +B9DxeR1LtnI4ajHL7cfbsthpXkDpJEj1AcFSIXLCWDra5qTEte8/On0NfVJPR2kZ +CEILADyeRZHymdedosLGt0CYpmwVQn6zcFHF3On2HoFkhPBKjd6FrlJpQW4gqWOa +c+K3rdyiaXV2QwcECINbQA2ZoTRwwxMw6XTsP8jx9/vbG2oqS3t9mqRE1XH0zrK8 +t1Bk3GuTeoQAkROUEutUC8dQH4hXi2H3JmB2hjC91kmiabMnenrl0YINwH97GtqO +rMQcr8a0u/A94UeL3pF0s0dmkceGjLu8JNASIdyXLZbtaK33smR5bkKhdmUvy5UA +Qcc75xuiKGdeeiM74VegBGuCpIpTbV1OI6e5RRjHXc49xcdN2HGacxfb/fE+dYRK +AW5hd+FSiEOPJaatv5gLO5ANC9+OfQLj/+43xSit1Ado9FmkuU4= +=0pzN +-----END PGP SIGNATURE----- diff --git a/kio-extras5.changes b/kio-extras5.changes index b648dab..ed94441 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +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..877d889 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,26 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio-extras5 -Version: 19.12.3 +Version: 20.03.80 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 +Source: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source99: %{name}-rpmlintrc 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 +49,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 +77,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/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source2: applications.keyring +%endif %description Additional KIO-slaves for KDE applications. From 45ed33d5a8731aea05f896f498ea6e2ff1ead19c54bc7cee6012dbd8ec290da6 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Tue, 7 Apr 2020 11:09:10 +0000 Subject: [PATCH 2/4] KDE Applications 20.03.90 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=124 --- kio-extras-20.03.80.tar.xz | 3 --- kio-extras-20.03.80.tar.xz.sig | 16 ---------------- kio-extras-20.03.90.tar.xz | 3 +++ kio-extras-20.03.90.tar.xz.sig | 11 +++++++++++ kio-extras5.changes | 13 +++++++++++++ kio-extras5.spec | 2 +- 6 files changed, 28 insertions(+), 20 deletions(-) delete mode 100644 kio-extras-20.03.80.tar.xz delete mode 100644 kio-extras-20.03.80.tar.xz.sig create mode 100644 kio-extras-20.03.90.tar.xz create mode 100644 kio-extras-20.03.90.tar.xz.sig diff --git a/kio-extras-20.03.80.tar.xz b/kio-extras-20.03.80.tar.xz deleted file mode 100644 index 7ecd2dd..0000000 --- a/kio-extras-20.03.80.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f041f2a7c13eaaf3e486a4ea39208b0e2c2e9f422e234cc392e7ad4396d36ce7 -size 614824 diff --git a/kio-extras-20.03.80.tar.xz.sig b/kio-extras-20.03.80.tar.xz.sig deleted file mode 100644 index 4d2043b..0000000 --- a/kio-extras-20.03.80.tar.xz.sig +++ /dev/null @@ -1,16 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQIzBAABCgAdFiEEyiYsbIPeTS+yijMqOmpNuDnqptcFAl50vAkACgkQOmpNuDnq -ptdeKw//UUj94z1Czc3GcFOhb8p8iM8rDwkV9fQe3jhxbI2DO1nPZ6nm0Pa2nkBi -kK1Y1jKAHnQBwujDXcaYifSy78FAp1MheQl9rnzkTIHVbobPMvA2gyA0d1sTnit2 -Qvnls/SLL7oOIGRdvl6eeFiWpJ2vF2oBWTNATISIXd6M5gFHs8zWfcKKyUMKI8GL -VdzOH0bAelpHwevN6SugyVFmJc/6SPJQW+HUEye8bTYUDvNFpCBvskFUsbKEhCHl -B9DxeR1LtnI4ajHL7cfbsthpXkDpJEj1AcFSIXLCWDra5qTEte8/On0NfVJPR2kZ -CEILADyeRZHymdedosLGt0CYpmwVQn6zcFHF3On2HoFkhPBKjd6FrlJpQW4gqWOa -c+K3rdyiaXV2QwcECINbQA2ZoTRwwxMw6XTsP8jx9/vbG2oqS3t9mqRE1XH0zrK8 -t1Bk3GuTeoQAkROUEutUC8dQH4hXi2H3JmB2hjC91kmiabMnenrl0YINwH97GtqO -rMQcr8a0u/A94UeL3pF0s0dmkceGjLu8JNASIdyXLZbtaK33smR5bkKhdmUvy5UA -Qcc75xuiKGdeeiM74VegBGuCpIpTbV1OI6e5RRjHXc49xcdN2HGacxfb/fE+dYRK -AW5hd+FSiEOPJaatv5gLO5ANC9+OfQLj/+43xSit1Ado9FmkuU4= -=0pzN ------END PGP SIGNATURE----- diff --git a/kio-extras-20.03.90.tar.xz b/kio-extras-20.03.90.tar.xz new file mode 100644 index 0000000..1219732 --- /dev/null +++ b/kio-extras-20.03.90.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c2cc3a3e144d34f860105a34988c54284fc7a134d76f5bb6a22e0e2ec8824b3 +size 614888 diff --git a/kio-extras-20.03.90.tar.xz.sig b/kio-extras-20.03.90.tar.xz.sig new file mode 100644 index 0000000..365a307 --- /dev/null +++ b/kio-extras-20.03.90.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6G3uMACgkQ29LOiT4t +HIfg5gf8CogNIJFTADGoYeVE8m528DiprUEru9NJWGi8M8zOVnxyH5amxYWnqyBf +JXSj3s8sb7xxIH0IFwvJnEDITiynHtIa4tBQGW7X+n61G4fWhJoGSmpClm+19QHb +ZfAIjetP3u5sM+QgwqYaI04BdeEtiiGSI3qPhhgaAsmQvAny/MGG5bI9up02iVcP +7rGxmvco/0l27ar+78Eef2Z9tlFsQhjse9rjm1zWd2aF7t2WugYjtBd29KWy7lzj +AWG2JWwM49TzsjkOgvqcNdQLeYfUMfJsGNwBKKLO6yh5vHMnWZ+aXM5zk9r7tvNL +oF8FYf9WtgGOyiEmnYgL7nScWgaKTA== +=0L43 +-----END PGP SIGNATURE----- diff --git a/kio-extras5.changes b/kio-extras5.changes index ed94441..d198c2b 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +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 diff --git a/kio-extras5.spec b/kio-extras5.spec index 877d889..5e05f6a 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -22,7 +22,7 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio-extras5 -Version: 20.03.80 +Version: 20.03.90 Release: 0 Summary: Additional KIO slaves for KDE applications License: GPL-2.0-or-later From aba4e9474c5db3e274f14125341ee13d388f3b9dabafc6c1cf189dc101e5b15d Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Fri, 24 Apr 2020 07:23:18 +0000 Subject: [PATCH 3/4] KDE Applications 20.04.0 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=125 --- kio-extras-20.03.90.tar.xz | 3 --- kio-extras-20.03.90.tar.xz.sig | 11 ----------- kio-extras-20.04.0.tar.xz | 3 +++ kio-extras-20.04.0.tar.xz.sig | 11 +++++++++++ kio-extras5.changes | 15 +++++++++++++++ kio-extras5.spec | 6 +++--- 6 files changed, 32 insertions(+), 17 deletions(-) delete mode 100644 kio-extras-20.03.90.tar.xz delete mode 100644 kio-extras-20.03.90.tar.xz.sig create mode 100644 kio-extras-20.04.0.tar.xz create mode 100644 kio-extras-20.04.0.tar.xz.sig diff --git a/kio-extras-20.03.90.tar.xz b/kio-extras-20.03.90.tar.xz deleted file mode 100644 index 1219732..0000000 --- a/kio-extras-20.03.90.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c2cc3a3e144d34f860105a34988c54284fc7a134d76f5bb6a22e0e2ec8824b3 -size 614888 diff --git a/kio-extras-20.03.90.tar.xz.sig b/kio-extras-20.03.90.tar.xz.sig deleted file mode 100644 index 365a307..0000000 --- a/kio-extras-20.03.90.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl6G3uMACgkQ29LOiT4t -HIfg5gf8CogNIJFTADGoYeVE8m528DiprUEru9NJWGi8M8zOVnxyH5amxYWnqyBf -JXSj3s8sb7xxIH0IFwvJnEDITiynHtIa4tBQGW7X+n61G4fWhJoGSmpClm+19QHb -ZfAIjetP3u5sM+QgwqYaI04BdeEtiiGSI3qPhhgaAsmQvAny/MGG5bI9up02iVcP -7rGxmvco/0l27ar+78Eef2Z9tlFsQhjse9rjm1zWd2aF7t2WugYjtBd29KWy7lzj -AWG2JWwM49TzsjkOgvqcNdQLeYfUMfJsGNwBKKLO6yh5vHMnWZ+aXM5zk9r7tvNL -oF8FYf9WtgGOyiEmnYgL7nScWgaKTA== -=0L43 ------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 d198c2b..774c338 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +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 diff --git a/kio-extras5.spec b/kio-extras5.spec index 5e05f6a..8e88f55 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -22,13 +22,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: kio-extras5 -Version: 20.03.90 +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/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz +Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz Source99: %{name}-rpmlintrc BuildRequires: OpenEXR-devel BuildRequires: flac-devel @@ -78,7 +78,7 @@ Obsoletes: kfileaudiopreview < 4.100.0 Provides: kde-odf-thumbnail = %{version} Obsoletes: kde-odf-thumbnail < %{version} %if %{with lang} -Source1: https://download.kde.org/unstable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig +Source1: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz.sig Source2: applications.keyring %endif From d1b77662b1b101303cf5e9d0c623ad3fb227196256fa29cc3d0f1809590b21f0 Mon Sep 17 00:00:00 2001 From: Luca Beltrame Date: Sun, 3 May 2020 18:08:28 +0000 Subject: [PATCH 4/4] Accepting request 799868 from home:wolfi323:branches:KDE:Applications - 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) OBS-URL: https://build.opensuse.org/request/show/799868 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=126 --- kio-extras5.changes | 7 ++++ kio-extras5.spec | 3 ++ ...empt-to-resolve-the-correct-WSD-host.patch | 36 +++++++++++++++++++ 3 files changed, 46 insertions(+) create mode 100644 smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch diff --git a/kio-extras5.changes b/kio-extras5.changes index 774c338..34a884d 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 diff --git a/kio-extras5.spec b/kio-extras5.spec index 8e88f55..8f65808 100644 --- a/kio-extras5.spec +++ b/kio-extras5.spec @@ -30,6 +30,8 @@ Group: System/GUI/KDE URL: https://www.kde.org Source: https://download.kde.org/stable/release-service/%{version}/src/%{rname}-%{version}.tar.xz 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 @@ -108,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 +