gentoo auto-resync : 14:03:2023 - 12:18:11

2 files changed, 0 insertions, 108 deletions

diff --git a/app-office/libreoffice/Manifest b/app-office/libreoffice/Manifest
index c27e8b8eb94c..8eeb4aa2d918 100644
--- a/app-office/libreoffice/Manifest
+++ b/app-office/libreoffice/Manifest
@@ -5,7 +5,6 @@ AUX libreoffice-7.3.5.2-gpgme-1.18.0.patch 2290 BLAKE2B ff65e3bb94e000c996330058
 AUX libreoffice-7.3.7.2-boost-1.81-locale.patch 1687 BLAKE2B 2d95ddf84c7a2b1eb69da311ac0bc7bdac67ec48173d20a375563455411501b783805f6f8d7e71dc8b3e9b8dc166e5bde96260e26ca57c0333a9c4c5f9a09661 SHA512 4fc2f01f890809f4e118744d7d6dc484f124b980b7699753acf6597c390e4457aac2a32bb720d4ac3afcbb9776b472c27b9c13ebd9aadec2c354a9ee0108e854
 AUX libreoffice-7.3.7.2-zxing-cpp-1.4.0.patch 2221 BLAKE2B c0b719247e58ae9270c420d3f3d4c34ac71ab67cfdcf2e766c6b7420c4919e486fb123c816a0651ad71c71662c155159fb4855934402f0959a3e5394ef818376 SHA512 26bf310f333e862eb91241e0f7b30fea031f29a4a1dfb74b5bfc0a2a9799f80c8a4d550fdcb22d674b4c5bb87618968892d7aa30ed2f0d30ce837c11707bac43
 AUX libreoffice-7.4.4.2-zxing-cpp-1.4.0-c++17.patch 1344 BLAKE2B 463964af9f5480e8038d1d860ac3184da611a2fde3c5a4ba9bacb61d8d676d336aedae65471054d0d01e0524fd7021bc513e8e1a44126e310817dbcda419a626 SHA512 77baae50517f3cefe9edcedfb9438e3b988a1430dc85ac18d0d7e4a15296ff7500b2b0d9db4a2c1d7e383afc2711afe862044c33ad05fa3764a72de0b10e1835
-AUX libreoffice-7.4.5.1-fix-webdav-upload.patch 4424 BLAKE2B 6b1c3f9c0b320c9e67351bde635ef9dbbe63ba26783abc1ec6911b0d488990370bf97a25f3b65341f303438ca347294dff3cee0659cd4f16f391de94c3521a51 SHA512 752dcee6060fd18eec0064f8317dc57a25049451439fa64ff0944e9db7908b3ce573f5055f883f7ab00e379d3763451d3fd6dd6cbc8f5b433b489184e0f3dac2
 AUX libreoffice.confd 228 BLAKE2B 7b9ed0d08b91b6e78dd3a2ac242cac48ef141c25bf25713b5fa6c4fdea3d5b0e16b4073a864fbec328edf4008729869fba5236e9cc113ba9bd3d6de5c10153c3 SHA512 6718cfd481b4349d70b718d4811f80ac0eff60d465b9f9eeff8ab9641de1fecb6197023f98bb1fca77a57b48ae2d8e38803f3af3a51191b1df71aa8cc5d33661
 AUX libreoffice.initd 507 BLAKE2B d49fd0f48254160fff3eb90a75294c6cf044805352a982ab3d2127426a18a6171e5043c071b59581a1f927a7c499c8abb58820081c6ba6e285097c883917f0e3 SHA512 fee4720898510b1aa07a9ed597d041d1e1edfb8f8b8e9596ef4254d4d3c1e8a959bbd65202a377289910ed28283f9c8a4bdc893d2d0835f37ee28cd3c7cb010d
 DIST 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip 3519470 BLAKE2B ccfdf6b7f88f22d3ec7898c529c374f13059979450aabdccc9781ca91dd27d0119dfec3d33dda073c2973fa4a8aacae13924c9a67e38a1422c48bfee41b6f3e8 SHA512 a231eba4a1baca11766ef292ab45e302081115477fe23018652882923308856835cf8c9ecba61a5cf22543474ccef3136965d794a90c9e4e9e6dcc21f9af6e1a
diff --git a/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch b/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
deleted file mode 100644
index 9b70f62c7d19..000000000000
--- a/app-office/libreoffice/files/libreoffice-7.4.5.1-fix-webdav-upload.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-From 30ca48f4dc0e65a3798e6b21574bc80f6d4953fa Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?L=C3=A1szl=C3=B3=20N=C3=A9meth?= <nemeth@numbertext.org>
-Date: Wed, 25 Jan 2023 12:08:14 +0100
-Subject: tdf#152493 ucb WebDAV: fix upload using HTTP 1.0 fallback
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Fix broken libcurl upload to Vibe 4.0.6 WebDAV server
-using HTTP 1.0 fallback.
-
-Regression from commit 023ebf17898db4bca63129f079fd90b5cf76c1a9
-"ucb: remove --with-webdav=neon" (Neon had no such upload
-problem).
-
-HTTP 1.0 fallback found by Pál Zoltán Kochis.
-Fallback for CURLE_UNSUPPORTED_PROTOCOL
-suggested by Michael Stahl. Thanks for their and
-Attila Bakos' help.
-
-Michael Stahl's comment: "'HTTP/0.9' in the [curl] error
-message is very misleading: it simply means that a header
-was expected but there was no header, so what is received
-is interpreted as body.
-
-Note: the HTTP/1.0 works because it does not use the
-'Expect: 100-continue' so there should be no intermediate
-100 Continue response from the server at all - instead
-libcurl directly sends the XML document for the PROPFIND
-and the server sends the response, and the problem does
-not occur."
-
-Co-authored-by: Michael Stahl <michael.stahl@allotropia.de>
-
-Change-Id: I8bd79154de14b6425e0324f4d8f6e64512c08264
-Reviewed-on: https://gerrit.libreoffice.org/c/core/+/146067
-Tested-by: László Németh <nemeth@numbertext.org>
-Reviewed-by: László Németh <nemeth@numbertext.org>
----
- ucb/source/ucp/webdav-curl/CurlSession.cxx  | 24 ++++++++++++++++++++++++
- ucb/source/ucp/webdav-curl/DAVException.hxx |  1 +
- 2 files changed, 25 insertions(+)
-
-diff --git a/ucb/source/ucp/webdav-curl/CurlSession.cxx b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-index 0f06363ce68f..bb1d4689a53c 100644
---- a/ucb/source/ucp/webdav-curl/CurlSession.cxx
-+++ b/ucb/source/ucp/webdav-curl/CurlSession.cxx
-@@ -964,6 +964,8 @@ auto CurlProcessor::ProcessRequestImpl(
-                  "curl_easy_perform failed: " << GetErrorString(rc, rSession.m_ErrorBuffer));
-         switch (rc)
-         {
-+            case CURLE_UNSUPPORTED_PROTOCOL:
-+                throw DAVException(DAVException::DAV_UNSUPPORTED);
-             case CURLE_COULDNT_RESOLVE_PROXY:
-                 throw DAVException(
-                     DAVException::DAV_HTTP_LOOKUP,
-@@ -1250,6 +1252,7 @@ auto CurlProcessor::ProcessRequest(
-         }
-     }
-     bool isRetry(false);
-+    bool isFallbackHTTP10(false);
-     int nAuthRequests(0);
-     int nAuthRequestsProxy(0);
- 
-@@ -1473,6 +1476,27 @@ auto CurlProcessor::ProcessRequest(
-                     }
-                 }
-             }
-+            else if (rException.getError() == DAVException::DAV_UNSUPPORTED)
-+            {
-+                // tdf#152493 libcurl can't handle "Transfer-Encoding: chunked"
-+                // in HTTP/1.1 100 Continue response.
-+                // workaround: if HTTP/1.1 didn't work, try HTTP/1.0
-+                // (but fallback only once - to prevent infinite loop)
-+                if (isFallbackHTTP10)
-+                {
-+                    throw DAVException(DAVException::DAV_HTTP_ERROR);
-+                }
-+                isFallbackHTTP10 = true;
-+                // note: this is not reset - future requests to this URI use it!
-+                auto rc = curl_easy_setopt(rSession.m_pCurl.get(), CURLOPT_HTTP_VERSION,
-+                                           CURL_HTTP_VERSION_1_0);
-+                if (rc != CURLE_OK)
-+                {
-+                    throw DAVException(DAVException::DAV_HTTP_ERROR);
-+                }
-+                SAL_INFO("ucb.ucp.webdav.curl", "attempting fallback to HTTP/1.0");
-+                isRetry = true;
-+            }
-             if (!isRetry)
-             {
-                 throw; // everything else: re-throw
-diff --git a/ucb/source/ucp/webdav-curl/DAVException.hxx b/ucb/source/ucp/webdav-curl/DAVException.hxx
-index 84dba895485c..759e43f25f8e 100644
---- a/ucb/source/ucp/webdav-curl/DAVException.hxx
-+++ b/ucb/source/ucp/webdav-curl/DAVException.hxx
-@@ -130,6 +130,7 @@ class DAVException : public std::exception
-             DAV_SESSION_CREATE, // session creation error,
-                                 // mData = server[:port]
-             DAV_INVALID_ARG,    // invalid argument
-+            DAV_UNSUPPORTED,    // internal to CurlSession
- 
-             DAV_LOCK_EXPIRED,   // DAV lock expired
- 
--- 
-cgit v1.2.1
-