curl-7.62.0-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@11840 ec354946-7b23-47d6-9f5a-488ba84defc7

c/curl/curl-vl.spec

@@ -7,7 +7,7 @@
 Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
 Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
 Name: curl 
-Version: 7.59.0
+Version: 7.62.0
 Release: 1%{?_dist_release}
 
 License: MIT
@@ -15,15 +15,15 @@ Group: Applications/Internet
 URL: http://curl.haxx.se/
 Source: http://curl.haxx.se/download/%{name}-%{version}.tar.xz
 
-# ftp: fix typo in recursive callback detection for seeking
-Patch1: 0001-curl-7.58.0-ftp-typo-in-recursive-callback-detection.patch
-
 # patch making libcurl multilib ready
-Patch101: 0101-curl-7.58.0-multilib.patch
+Patch101: 0101-curl-7.32.0-multilib.patch
+
 # prevent configure script from discarding -g in CFLAGS (#496778)
 Patch102: 0102-curl-7.36.0-debug.patch
+
 # migrate tests/http_pipe.py to Python 3
 Patch103: 0103-curl-7.59.0-python3.patch
+
 # use localhost6 instead of ip6-localhost in the curl test-suite
 Patch104: 0104-curl-7.19.7-localhost6.patch
 
@@ -97,20 +97,40 @@ use cURL's capabilities internally.
 %setup -q 
 
 # upstream patches
-%patch1 -p1
+# (none)
 
 # Fedora patches
 %patch101 -p1
 %patch102 -p1
-%patch103 -p1
+#patch103 -p1
 %patch104 -p1
 
 # make tests/*.py use Python 3
 sed -e '1 s|^#!/.*python|&3|' -i tests/*.py
 
-# disable test 1112 (#565305) and test 1801
+# regenerate Makefile.in files
+aclocal -I m4
+automake
+
+# disable test 1112 (#565305), test 1455 (occasionally fails with 'bind failed
+# with errno 98: Address already in use' in Koji environment), and test 1801
 # <https://github.com/bagder/curl/commit/21e82bd6#commitcomment-12226582>
-printf "1112\n1801\n" >> tests/data/DISABLED
+# and test 1900, which is flaky and covers a deprecated feature of libcurl
+# <https://github.com/curl/curl/pull/2705>
+printf "1112\n1455\n1801\n1900\n" >> tests/data/DISABLED
+
+# disable test 1319 on ppc64 (server times out)
+%ifarch ppc64
+echo "1319" >> tests/data/DISABLED
+%endif
+
+# temporarily disable test 582 on s390x (client times out)
+%ifarch s390x
+echo "582" >> tests/data/DISABLED
+%endif
+
+# adapt test 323 for updated OpenSSL
+sed -e 's/^35$/35,52/' -i tests/data/test323
 
 %build
 %configure \
@@ -181,6 +201,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Sat Nov 03 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.62.0-1
+- new upstream release.
+- imported patches from rawhide.
+
 * Fri Apr 13 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.59.0-1
 - new upstream release.
 - imported Patch1 and 103 from rawhide.