From 433bad76e9d91b8fd7a6b96bc65facc872826d025f7b861b537b67323eafecf7 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 17 May 2020 10:18:48 +0000 Subject: [PATCH 1/4] KDE Applications 20.04.1 OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=127 --- kio-extras-20.04.0.tar.xz | 3 -- kio-extras-20.04.0.tar.xz.sig | 11 ------ kio-extras-20.04.1.tar.xz | 3 ++ kio-extras-20.04.1.tar.xz.sig | 11 ++++++ kio-extras5.changes | 16 +++++++++ kio-extras5.spec | 5 +-- ...empt-to-resolve-the-correct-WSD-host.patch | 36 ------------------- 7 files changed, 31 insertions(+), 54 deletions(-) delete mode 100644 kio-extras-20.04.0.tar.xz delete mode 100644 kio-extras-20.04.0.tar.xz.sig create mode 100644 kio-extras-20.04.1.tar.xz create mode 100644 kio-extras-20.04.1.tar.xz.sig delete mode 100644 smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch diff --git a/kio-extras-20.04.0.tar.xz b/kio-extras-20.04.0.tar.xz deleted file mode 100644 index 1c81d2c..0000000 --- a/kio-extras-20.04.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -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 deleted file mode 100644 index 74abd58..0000000 --- a/kio-extras-20.04.0.tar.xz.sig +++ /dev/null @@ -1,11 +0,0 @@ ------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-extras-20.04.1.tar.xz b/kio-extras-20.04.1.tar.xz new file mode 100644 index 0000000..a62e89c --- /dev/null +++ b/kio-extras-20.04.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a81b3f8f81fa7b6d0677d6706bbb9c995db27643ce40fca6501c2c56c2d8f33 +size 617460 diff --git a/kio-extras-20.04.1.tar.xz.sig b/kio-extras-20.04.1.tar.xz.sig new file mode 100644 index 0000000..14c1f69 --- /dev/null +++ b/kio-extras-20.04.1.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCgAdFiEE8jJ15L8Qr8HfaRSm29LOiT4tHIcFAl65/34ACgkQ29LOiT4t +HIfCTQf9GpMyeldwAgKdyrPcfroiMcgv2fQ/ACkEgur5k1YJZ5PNw35H0qAHKyUZ +Rw6lHHgkbI4ExYuFB5jVaTdLCtoQaxb+mUiWPQf5o1z235/kVmDsIJ7tFovorYTB +JA0vF1c3ZGa4yK5BaW6XOWoiqY4oBAnwQiQuCSsPIp+a5Xl86TERXeAmUiDxbJPO +6WZ2G3ppl8VQVaP7qE7igkdV8WYPmTZZ39dGc/b08fTVu+tVjanphXUyHx1fyLsU +b1xOTw8Z3Zp60uLw/74h5hTWyw9fMTvxkbGDwcBK+LZXVijfkYwkgbDFxGWQmNAl +4EhjhLlLsvZKAn+gXJOYWfrOsLdEBA== +=iZzS +-----END PGP SIGNATURE----- diff --git a/kio-extras5.changes b/kio-extras5.changes index 34a884d..fdd617b 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri May 15 15:41:33 UTC 2020 - Luca Beltrame + +- Update to 20.04.1 + * New bugfix release + * For more details please see: + * https://kde.org/announcements/releases/2020-04-apps-update +- Changes since 20.04.0: + * Only store password in KWallet if the user asked for it + * smb: resolve potential dnssd names via kdnssd + * sftp: successfully write files to proftpd servers (kde#419999) + * smb: put unmapped errno value into error message + * smb: accurately attempt to resolve the correct WSD host (kde#420578) +- Dropped patches, now upstream: + * smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch + ------------------------------------------------------------------- Sun May 3 16:28:47 UTC 2020 - Wolfgang Bauer diff --git a/kio-extras5.spec b/kio-extras5.spec index 8f65808..0c55228 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.04.0 +Version: 20.04.1 Release: 0 Summary: Additional KIO slaves for KDE applications License: GPL-2.0-or-later @@ -30,8 +30,6 @@ 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 @@ -110,7 +108,6 @@ 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 deleted file mode 100644 index 4b0feb9..0000000 --- a/smb-accurately-attempt-to-resolve-the-correct-WSD-host.patch +++ /dev/null @@ -1,36 +0,0 @@ -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 - From e50920ed9f97828b3a8d5b8e4d358f6c840a016c94b4225b00803db18a621047 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 17 May 2020 10:50:36 +0000 Subject: [PATCH 2/4] Fix URL in changelog OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=128 --- kio-extras5.changes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kio-extras5.changes b/kio-extras5.changes index fdd617b..734376a 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -4,7 +4,7 @@ Fri May 15 15:41:33 UTC 2020 - Luca Beltrame - Update to 20.04.1 * New bugfix release * For more details please see: - * https://kde.org/announcements/releases/2020-04-apps-update + * https://kde.org/announcements/releases/2020-05-apps-update - Changes since 20.04.0: * Only store password in KWallet if the user asked for it * smb: resolve potential dnssd names via kdnssd From fbea0650f4d6b61ec7a730761b6b2dddb9818ebce8cf5c9abe3c9266b30930c5 Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 17 May 2020 11:55:17 +0000 Subject: [PATCH 3/4] Fix 19.12 URLs in changelog OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=129 --- kio-extras5.changes | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kio-extras5.changes b/kio-extras5.changes index 734376a..03a01b5 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -72,7 +72,7 @@ Thu Mar 5 20:36:09 UTC 2020 - Luca Beltrame - Update to 19.12.3 * New bugfix release * For more details please see: - * https://www.kde.org/announcements/releases/19.12.3 + * https://kde.org/announcements/releases/2020-03-apps-update - Too many changes since 19.12.2, only listing bugfixes: * smb: enable anonymous and domain extra field in authinfo (kde#327484) * smb: disable mode bits getting forwarded to KIO (kde#414482) @@ -100,7 +100,7 @@ Wed Feb 5 06:29:13 UTC 2020 - Luca Beltrame - Update to 19.12.2 * New bugfix release * For more details please see: - * https://www.kde.org/announcements/releases/19.12.2 + * https://kde.org/announcements/releases/2020-02-apps-update - No code change since 19.12.1 ------------------------------------------------------------------- From 581df5e632342177250ff007fd4df8412a77d10fd8ede1c01eb853dc1338208a Mon Sep 17 00:00:00 2001 From: Wolfgang Bauer Date: Sun, 17 May 2020 12:40:26 +0000 Subject: [PATCH 4/4] Remove non-existing 20.04-beta/rc URLs from changelog OBS-URL: https://build.opensuse.org/package/show/KDE:Applications/kio-extras5?expand=0&rev=130 --- kio-extras5.changes | 4 ---- 1 file changed, 4 deletions(-) diff --git a/kio-extras5.changes b/kio-extras5.changes index 03a01b5..9b8b810 100644 --- a/kio-extras5.changes +++ b/kio-extras5.changes @@ -41,8 +41,6 @@ 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) @@ -54,8 +52,6 @@ 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)