|
|
@@ -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.58.0
|
|
|
+Version: 7.59.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
License: MIT
|
|
|
@@ -15,10 +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
|
|
|
# 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
|
|
|
|
|
|
@@ -91,11 +96,22 @@ use cURL's capabilities internally.
|
|
|
%prep
|
|
|
%setup -q
|
|
|
|
|
|
+# upstream patches
|
|
|
+%patch1 -p1
|
|
|
+
|
|
|
# Fedora patches
|
|
|
%patch101 -p1
|
|
|
%patch102 -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
|
|
|
+# <https://github.com/bagder/curl/commit/21e82bd6#commitcomment-12226582>
|
|
|
+printf "1112\n1801\n" >> tests/data/DISABLED
|
|
|
+
|
|
|
%build
|
|
|
%configure \
|
|
|
--with-ssl=%{_prefix} \
|
|
|
@@ -165,6 +181,10 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Fri Apr 13 2018 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 7.59.0-1
|
|
|
+- new upstream release.
|
|
|
+- imported Patch1 and 103 from rawhide.
|
|
|
+
|
|
|
* Wed Feb 7 2018 Satoshi IWAMOTO <satoshi.iwamoto@nifty.ne.jp> 7.58.0-1
|
|
|
- new upstream release with security fix
|
|
|
- update patch101
|
tomop