Merge branch 'update_to_7710' into 'master'

[curl] Upgrade to 7.71.0. Contributes to JB#50356

See merge request mer-core/curl!25

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "curl"]
 	path = curl
-	url = https://github.com/curl/curl.git
+	url = https://git.sailfishos.org/mirror/curl.git

rpm/0101-curl-7.32.0-multilib.patch

@@ -4,10 +4,10 @@ Date: Fri, 12 Apr 2013 12:04:05 +0200
 Subject: [PATCH] prevent multilib conflicts on the curl-config script
 
 ---
- curl-config.in     |   21 +++------------------
- docs/curl-config.1 |    4 +++-
- libcurl.pc.in      |    1 +
- 3 files changed, 7 insertions(+), 19 deletions(-)
+ curl-config.in     | 23 +++++------------------
+ docs/curl-config.1 |  4 +++-
+ libcurl.pc.in      |  1 +
+ 3 files changed, 9 insertions(+), 19 deletions(-)
 
 diff --git a/curl-config.in b/curl-config.in
 index 150004d..95d0759 100644
@@ -22,7 +22,7 @@ index 150004d..95d0759 100644
          ;;
 
      --prefix)
-@@ -143,32 +143,17 @@ while test $# -gt 0; do
+@@ -155,32 +155,19 @@ while test $# -gt 0; do
          ;;
 
      --libs)
@@ -31,7 +31,7 @@ index 150004d..95d0759 100644
 -        else
 -           CURLLIBDIR=""
 -        fi
--        if test "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
+-        if test "X@ENABLE_SHARED@" = "Xno" -o "X@REQUIRE_LIB_DEPS@" = "Xyes"; then
 -          echo ${CURLLIBDIR}-lcurl @LIBCURL_LIBS@
 -        else
 -          echo ${CURLLIBDIR}-lcurl
@@ -49,6 +49,8 @@ index 150004d..95d0759 100644
 -          echo "curl was built with static libraries disabled" >&2
 -          exit 1
 -        fi
++        echo "curl was built with static libraries disabled" >&2
++        exit 1
          ;;
 
      --configure)
@@ -83,4 +85,7 @@ index 2ba9c39..f8f8b00 100644
 +configure_options=@CONFIGURE_OPTIONS@
 
  Name: libcurl
- URL: http://curl.haxx.se/
+ URL: https://curl.haxx.se/
+-- 
+2.5.0
+

rpm/0104-curl-7.19.7-localhost6.patch

@@ -1,34 +1,7 @@
-From c3742688208527fa8a790355924df82ce8f2fc19 Mon Sep 17 00:00:00 2001
-From: Lauri Kopo <lauri.kopo@jolla.com>
-Date: Mon, 27 Apr 2020 10:08:08 +0300
-Subject: [PATCH] 0104-curl-7.19.7-localhost6.patch
-
-
 diff --git a/tests/data/test1083 b/tests/data/test1083
-index 1b1db0539..0b5b573a0 100644
+index e441278..b0958b6 100644
 --- a/tests/data/test1083
 +++ b/tests/data/test1083
-@@ -12,13 +12,13 @@ IPv6
- # Server-side
- <reply>
- <data>
--HTTP/1.1 200 OK
--Date: Mon, 28 Jul 2008 14:49:00 GMT
--Server: test-server/fake
--Content-Length: 6
--Connection: close
--Content-Type: text/plain
--
-+HTTP/1.1 200 OK
-+Date: Mon, 28 Jul 2008 14:49:00 GMT
-+Server: test-server/fake
-+Content-Length: 6
-+Connection: close
-+Content-Type: text/plain
-+
- -foo-
- </data>
- </reply>
 @@ -33,13 +33,13 @@ ipv6
  http-ipv6
  </server>
@@ -46,23 +19,8 @@ index 1b1db0539..0b5b573a0 100644
  </precheck>
  </client>
 
-@@ -50,10 +50,10 @@ perl -e "if ('%CLIENT6IP' ne '[::1]') {print 'Test requires default test client
- ^User-Agent:.*
- </strip>
- <protocol>
--GET /1083 HTTP/1.1
--Host: %HOST6IP:%HTTP6PORT
--Accept: */*
--
-+GET /1083 HTTP/1.1
-+Host: %HOST6IP:%HTTP6PORT
-+Accept: */*
-+
- </protocol>
- </verify>
- </testcase>
 diff --git a/tests/data/test241 b/tests/data/test241
-index 46eae1f72..20b6b6f83 100644
+index 46eae1f..4e1632c 100644
 --- a/tests/data/test241
 +++ b/tests/data/test241
 @@ -30,13 +30,13 @@ ipv6
@@ -82,21 +40,12 @@ index 46eae1f72..20b6b6f83 100644
  </precheck>
  </client>
 
-@@ -47,10 +47,10 @@ HTTP-IPv6 GET (using ip6-localhost)
- ^User-Agent:
+@@ -48,7 +48,7 @@ HTTP-IPv6 GET (using ip6-localhost)
  </strip>
  <protocol>
--GET /241 HTTP/1.1
+ GET /241 HTTP/1.1
 -Host: ip6-localhost:%HTTP6PORT
--Accept: */*
--
-+GET /241 HTTP/1.1
-+Host: localhost6:%HTTP6PORT
-+Accept: */*
-+
++Host: localhost6:%HTTP6PORT
+ Accept: */*
+
  </protocol>
- </verify>
- </testcase>
--- 
-2.25.4
-

rpm/0105-curl-7.63.0-lib1560-valgrind.patch

@@ -0,0 +1,39 @@
+From f55cca0e86f59ec11ffafd5c0503c39ca3723e2e Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 4 Feb 2019 17:32:56 +0100
+Subject: [PATCH] libtest: compile lib1560.c with -fno-builtin-strcmp
+
+... to prevent valgrind from reporting false positives on x86_64:
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x10BCAA: part2id (lib1560.c:489)
+   by 0x10BCAA: updateurl (lib1560.c:521)
+   by 0x10BCAA: set_parts (lib1560.c:630)
+   by 0x10BCAA: test (lib1560.c:802)
+   by 0x4923412: (below main) (in /usr/lib64/libc-2.28.9000.so)
+
+Conditional jump or move depends on uninitialised value(s)
+   at 0x10BCC3: part2id (lib1560.c:491)
+   by 0x10BCC3: updateurl (lib1560.c:521)
+   by 0x10BCC3: set_parts (lib1560.c:630)
+   by 0x10BCC3: test (lib1560.c:802)
+   by 0x4923412: (below main) (in /usr/lib64/libc-2.28.9000.so)
+---
+ tests/libtest/Makefile.inc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/libtest/Makefile.inc b/tests/libtest/Makefile.inc
+index 080421b..ea3b806 100644
+--- a/tests/libtest/Makefile.inc
++++ b/tests/libtest/Makefile.inc
+@@ -586,6 +586,7 @@ lib1559_SOURCES = lib1559.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
+ lib1559_LDADD = $(TESTUTIL_LIBS)
+
+ lib1560_SOURCES = lib1560.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
++lib1560_CFLAGS = $(AM_CFLAGS) -fno-builtin-strcmp
+ lib1560_LDADD = $(TESTUTIL_LIBS)
+
+ lib1564_SOURCES = lib1564.c $(SUPPORTFILES) $(TESTUTIL) $(WARNLESS)
+-- 
+2.17.2
+

rpm/curl.spec

@@ -1,13 +1,16 @@
 Name:       curl
 Summary:    A utility for getting files from remote servers (FTP, HTTP, and others)
-Version:    7.70.0
+Version:    7.71.0
 Release:    1
 License:    MIT
-URL:        http://curl.haxx.se/
+URL:        https://curl.haxx.se/
 Source0:    %{name}-%{version}.tar.gz
-Patch2:     0101-curl-7.32.0-multilib.patch
-Patch5:     0104-curl-7.19.7-localhost6.patch
-Patch7:     0107-curl-7.21.4-libidn-valgrind.patch
+# patch making libcurl multilib ready
+Patch101:   0101-curl-7.32.0-multilib.patch
+# use localhost6 instead of ip6-localhost in the curl test-suite
+Patch104:   0104-curl-7.19.7-localhost6.patch
+# prevent valgrind from reporting false positives on x86_64
+Patch105:   0105-curl-7.63.0-lib1560-valgrind.patch
 
 BuildRequires:  pkgconfig(openssl)
 BuildRequires:  pkgconfig(zlib)
@@ -56,16 +59,14 @@ use cURL's capabilities internally.
     --disable-gopher \
     --with-nghttp2
 
-make %{?_smp_mflags}
+%make_build
 
 %install
-rm -rf %{buildroot}
 %make_install
 
-install -d $RPM_BUILD_ROOT/%{_datadir}/aclocal
-install -m 644 docs/libcurl/libcurl.m4 $RPM_BUILD_ROOT/%{_datadir}/aclocal
+install -Dp -m 644 docs/libcurl/libcurl.m4 %{buildroot}/%{_datadir}/aclocal/
 # don't need curl's copy of the certs; use openssl's
-find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \;
+find %{buildroot} -name ca-bundle.crt -exec rm -f '{}' \;
 
 %post -n libcurl -p /sbin/ldconfig
 
@@ -83,7 +84,7 @@ find ${RPM_BUILD_ROOT} -name ca-bundle.crt -exec rm -f '{}' \;
 %files -n libcurl-devel
 %defattr(-,root,root,-)
 %doc docs/examples/*.c docs/examples/Makefile.example docs/INTERNALS.md
-%doc docs/CONTRIBUTE.md docs/libcurl/ABI
+%doc docs/CONTRIBUTE.md docs/libcurl/ABI.md
 %{_bindir}/curl-config*
 %{_includedir}/curl
 %{_libdir}/*.so