From 37e476a3da51accaf378513271bcc2f299c2bb3b0b7c1b9637266b592b77ba09 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 31 Oct 2022 08:05:15 +0000 Subject: [PATCH 1/2] Accepting request 1031521 from home:bnavigator:branches:KDE:Frameworks5 - Add kio-mr1008-fix-webdav.diff * Fixes WebDAV upload * kde#460717 * https://invent.kde.org/frameworks/kio/-/merge_requests/1008 OBS-URL: https://build.opensuse.org/request/show/1031521 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=369 --- kio-mr1008-fix-webdav.diff | 13 +++++++++++++ kio.changes | 8 ++++++++ kio.spec | 6 ++++-- 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 kio-mr1008-fix-webdav.diff diff --git a/kio-mr1008-fix-webdav.diff b/kio-mr1008-fix-webdav.diff new file mode 100644 index 0000000..cfe3218 --- /dev/null +++ b/kio-mr1008-fix-webdav.diff @@ -0,0 +1,13 @@ +diff --git a/src/ioslaves/http/http.cpp b/src/ioslaves/http/http.cpp +index ec3c8809f70fae7331d7d4871a2203be6d94204a..c54e568d28febc094b0aa5445b18a52eb0ff44f3 100644 +--- a/src/ioslaves/http/http.cpp ++++ b/src/ioslaves/http/http.cpp +@@ -5522,7 +5522,7 @@ bool HTTPProtocol::davDestinationExists() + m_request.cacheTag.policy = CC_Reload; + m_request.davData.depth = 0; + +- (void)/* handling result via response codes */ (true); ++ (void)/* handling result via response codes */proceedUntilResponseContent(true); + + if (!m_request.isKeepAlive) { + httpCloseConnection(); // close connection if server requested it. diff --git a/kio.changes b/kio.changes index 9cad1d3..1839fee 100644 --- a/kio.changes +++ b/kio.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Oct 27 10:44:41 UTC 2022 - Ben Greiner + +- Add kio-mr1008-fix-webdav.diff + * Fixes WebDAV upload + * kde#460717 + * https://invent.kde.org/frameworks/kio/-/merge_requests/1008 + ------------------------------------------------------------------- Sat Oct 1 15:55:52 UTC 2022 - Christophe Giboudeaux diff --git a/kio.spec b/kio.spec index faaef6d..9f9e7c2 100644 --- a/kio.spec +++ b/kio.spec @@ -1,7 +1,7 @@ # # spec file for package kio # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -36,12 +36,14 @@ Source2: frameworks.keyring %endif # PATCH-FIX-OPENSUSE kio_help-fallback-to-kde4-docs.patch -- allow kio_help to see into kde4 documentation, needed especially for khelpcenter5 Patch0: kio_help-fallback-to-kde4-docs.patch +# PATCH-FIX-UPSTREAM kio-mr1008-fix-webdav.diff kde#460717, https://invent.kde.org/frameworks/kio/-/merge_requests/1008 +Patch1: https://invent.kde.org/frameworks/kio/-/commit/501091059ae9fc2877d621cdbc0fb3c5ece56dae.diff#/kio-mr1008-fix-webdav.diff BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} BuildRequires: fdupes # gcc7 is too old for std::transform_reduce %if 0%{?suse_version} == 1500 -BuildRequires: gcc10-c++ BuildRequires: gcc10-PIE +BuildRequires: gcc10-c++ %endif BuildRequires: kf5-filesystem BuildRequires: krb5-devel From 51a545e452a4be1820c164a4da2c4199fca248245e56ab505b01bd5d8bf02370 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux Date: Mon, 31 Oct 2022 08:05:54 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kio?expand=0&rev=370 --- kio.changes | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kio.changes b/kio.changes index 1839fee..10fd4e1 100644 --- a/kio.changes +++ b/kio.changes @@ -2,8 +2,7 @@ Thu Oct 27 10:44:41 UTC 2022 - Ben Greiner - Add kio-mr1008-fix-webdav.diff - * Fixes WebDAV upload - * kde#460717 + * Fixes WebDAV upload (kde#460717) * https://invent.kde.org/frameworks/kio/-/merge_requests/1008 -------------------------------------------------------------------