Hello community,
here is the log from the commit of package curl for openSUSE:Factory checked in
at 2017-09-04 12:20:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/curl (Old)
and /work/SRC/openSUSE:Factory/.curl.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "curl"
Mon Sep 4 12:20:32 2017 rev:126 rq:519611 version:7.55.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/curl/curl-mini.changes 2017-08-24
18:21:04.378161026 +0200
+++ /work/SRC/openSUSE:Factory/.curl.new/curl-mini.changes 2017-09-04
12:20:35.700186389 +0200
@@ -1,0 +2,11 @@
+Tue Aug 29 17:33:29 UTC 2017 - zai...@opensuse.org
+
+- Add curl-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch:
+ Fix NetworkManagers connectivity test.
+
+-------------------------------------------------------------------
+Mon Aug 28 16:15:30 UTC 2017 - sch...@suse.de
+
+- ppc-build.patch: Fix build for powerpc
+
+-------------------------------------------------------------------
curl.changes: same change
New:
----
curl-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch
ppc-build.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ curl-mini.spec ++++++
--- /var/tmp/diff_new_pack.7MUOMZ/_old 2017-09-04 12:20:38.707763570 +0200
+++ /var/tmp/diff_new_pack.7MUOMZ/_new 2017-09-04 12:20:38.723761321 +0200
@@ -49,6 +49,10 @@
Patch3: curl-disable-test1427-i586.patch
# PATCH-FIX-UPSTREAM curl-man3.patch - Fix to build libcurl man3 pages
Patch4: curl-man3.patch
+# PATCH-FIX-UPSTREAM ppc-build.patch - Fix build for powerpc
+Patch5: ppc-build.patch
+# PATCH-FIX-UPSTREAM
curl-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch -- Fix
NetworkManagers connectivity test
+Patch6: curl-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch
BuildRequires: libtool
BuildRequires: pkgconfig
%if !0%{?bootstrap}
@@ -131,6 +135,8 @@
%patch2
%patch3 -p1 -R
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
# curl complains if macro definition is contained in CFLAGS
++++++ curl.spec ++++++
--- /var/tmp/diff_new_pack.7MUOMZ/_old 2017-09-04 12:20:38.823747264 +0200
+++ /var/tmp/diff_new_pack.7MUOMZ/_new 2017-09-04 12:20:38.855742766 +0200
@@ -47,6 +47,10 @@
Patch3: curl-disable-test1427-i586.patch
# PATCH-FIX-UPSTREAM curl-man3.patch - Fix to build libcurl man3 pages
Patch4: curl-man3.patch
+# PATCH-FIX-UPSTREAM ppc-build.patch - Fix build for powerpc
+Patch5: ppc-build.patch
+# PATCH-FIX-UPSTREAM
curl-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch -- Fix
NetworkManagers connectivity test
+Patch6: curl-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch
BuildRequires: libtool
BuildRequires: pkgconfig
%if !0%{?bootstrap}
@@ -129,6 +133,8 @@
%patch2
%patch3 -p1 -R
%patch4 -p1
+%patch5 -p1
+%patch6 -p1
%build
# curl complains if macro definition is contained in CFLAGS
++++++ curl-http-Don-t-wait-on-CONNECT-when-there-is-no-proxy.patch ++++++
>From 74dac344b2feb2e0f4baddb70532dc8e45d2d817 Mon Sep 17 00:00:00 2001
From: "Jan Alexander Steffens (heftig)" <jan.steff...@gmail.com>
Date: Fri, 18 Aug 2017 10:43:02 +0200
Subject: [PATCH] http: Don't wait on CONNECT when there is no proxy
Since curl 7.55.0, NetworkManager almost always failed its connectivity
check by timeout. I bisected this to 5113ad04 (http-proxy: do the HTTP
CONNECT process entirely non-blocking).
This patch replaces !Curl_connect_complete with Curl_connect_ongoing,
which returns false if the CONNECT state was left uninitialized and lets
the connection continue.
Closes #1803
Fixes #1804
Also-fixed-by: Gergely Nagy
---
lib/http.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/http.c b/lib/http.c
index 35c7c3d43f..3e33132783 100644
--- a/lib/http.c
+++ b/lib/http.c
@@ -1371,7 +1371,7 @@ CURLcode Curl_http_connect(struct connectdata *conn, bool
*done)
if(CONNECT_FIRSTSOCKET_PROXY_SSL())
return CURLE_OK; /* wait for HTTPS proxy SSL initialization to complete */
- if(!Curl_connect_complete(conn))
+ if(Curl_connect_ongoing(conn))
/* nothing else to do except wait right now - we're not done here. */
return CURLE_OK;
++++++ ppc-build.patch ++++++
Index: curl-7.55.0/include/curl/system.h
===================================================================
--- curl-7.55.0.orig/include/curl/system.h
+++ curl-7.55.0/include/curl/system.h
@@ -401,7 +401,7 @@
#elif defined(__GNUC__)
# if !defined(__LP64__) && (defined(__ILP32__) || \
- defined(__i386__) || defined(__ppc__) || defined(__arm__) || \
+ defined(__i386__) || defined(__powerpc__) || defined(__arm__) || \
defined(__sparc__) || defined(__mips__) || defined(__sh__) || \
defined(__XTENSA__))
# define CURL_SIZEOF_LONG 4
