From fbcad9a3a0d50831db86e64633da4c9ba983650c Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Mon, 9 Mar 2020 09:53:54 +0100
Subject: [PATCH] Resolves: #1810989 - make Flatpak work again

---
 0001-curl-7.69.0-flatpak.patch | 58 ++++++++++++++++++++++++++++++++++
 curl.spec                      |  9 +++++-
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 0001-curl-7.69.0-flatpak.patch

diff --git a/0001-curl-7.69.0-flatpak.patch b/0001-curl-7.69.0-flatpak.patch
new file mode 100644
index 0000000..0268258
--- /dev/null
+++ b/0001-curl-7.69.0-flatpak.patch
@@ -0,0 +1,58 @@
+From 2c706c44b98998fa619ddc63b2c14955b0f50692 Mon Sep 17 00:00:00 2001
+From: Daniel Stenberg <daniel@haxx.se>
+Date: Thu, 5 Mar 2020 23:45:36 +0100
+Subject: [PATCH] Revert "pause: force-drain the transfer on unpause"
+
+This reverts commit fa0216b294af4c7113a9040ca65eefc7fc18ac1c (from #5000)
+
+Clearly that didn't solve the problem correctly.
+
+Reported-by: Christopher Reid
+Reopens #4966
+Fixes #5044
+
+Upstream-commit: 8aa04e9a24932b830bc5eaf6838dea5a3329341e
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ lib/easy.c     | 1 -
+ lib/transfer.c | 5 ++---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/lib/easy.c b/lib/easy.c
+index 1a69127..4546210 100644
+--- a/lib/easy.c
++++ b/lib/easy.c
+@@ -1033,7 +1033,6 @@ CURLcode curl_easy_pause(struct Curl_easy *data, int action)
+      to have this handle checked soon */
+   if((newstate & (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) !=
+      (KEEP_RECV_PAUSE|KEEP_SEND_PAUSE)) {
+-    data->state.drain++;
+     Curl_expire(data, 0, EXPIRE_RUN_NOW); /* get this handle going again */
+     if(data->multi)
+       Curl_update_timer(data->multi);
+diff --git a/lib/transfer.c b/lib/transfer.c
+index 8270761..ead8b36 100644
+--- a/lib/transfer.c
++++ b/lib/transfer.c
+@@ -5,7 +5,7 @@
+  *                            | (__| |_| |  _ <| |___
+  *                             \___|\___/|_| \_\_____|
+  *
+- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
++ * Copyright (C) 1998 - 2019, Daniel Stenberg, <daniel@haxx.se>, et al.
+  *
+  * This software is licensed as described in the file COPYING, which
+  * you should have received as part of this distribution. The terms
+@@ -1217,8 +1217,7 @@ CURLcode Curl_readwrite(struct connectdata *conn,
+   else
+     fd_write = CURL_SOCKET_BAD;
+ 
+-  if(data->state.drain) {
+-    data->state.drain--;
++  if(conn->data->state.drain) {
+     select_res |= CURL_CSELECT_IN;
+     DEBUGF(infof(data, "Curl_readwrite: forcibly told to drain data\n"));
+   }
+-- 
+2.21.1
+
diff --git a/curl.spec b/curl.spec
index dacb502..67e623c 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,10 +1,13 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
 Name: curl
 Version: 7.69.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: MIT
 Source: https://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
+# make Flatpak work again (#1810989)
+Patch1:   0001-curl-7.69.0-flatpak.patch
+
 # patch making libcurl multilib ready
 Patch101: 0101-curl-7.32.0-multilib.patch
 
@@ -171,6 +174,7 @@ be installed.
 %setup -q
 
 # upstream patches
+%patch1 -p1
 
 # Fedora patches
 %patch101 -p1
@@ -346,6 +350,9 @@ rm -f ${RPM_BUILD_ROOT}%{_libdir}/libcurl.la
 %{_libdir}/libcurl.so.4.[0-9].[0-9].minimal
 
 %changelog
+* Mon Mar 09 2020 Kamil Dudka <kdudka@redhat.com> - 7.69.0-2
+- make Flatpak work again (#1810989)
+
 * Wed Mar 04 2020 Kamil Dudka <kdudka@redhat.com> - 7.69.0-1
 - new upstream release