|
|
@@ -3,20 +3,53 @@
|
|
|
Summary: A utility for getting files from remote servers (FTP, HTTP, and others).
|
|
|
Summary(ja): リモートサーバ(FTP,HTTPなど)からファイルを取得するためのユーティリティ
|
|
|
Name: curl
|
|
|
-Version: 7.28.1
|
|
|
+Version: 7.32.0
|
|
|
Release: 1%{?_dist_release}
|
|
|
-License: MIT/X
|
|
|
+
|
|
|
+License: MIT
|
|
|
Group: Applications/Internet
|
|
|
-Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
|
|
|
URL: http://curl.haxx.se/
|
|
|
|
|
|
+Source: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
|
|
|
+
|
|
|
+# make sure that NSS is initialized prior to calling PK11_GenerateRandom()
|
|
|
+Patch1: 0001-curl-7.32.0-204126a5.patch
|
|
|
+
|
|
|
+# avoid delay if FTP is aborted in CURLOPT_HEADERFUNCTION callback (#1005686)
|
|
|
+Patch2: 0002-curl-7.32.0-c639d725.patch
|
|
|
+
|
|
|
+# patch making libcurl multilib ready
|
|
|
+Patch101: 0101-curl-7.32.0-multilib.patch
|
|
|
+
|
|
|
+# prevent configure script from discarding -g in CFLAGS (#496778)
|
|
|
+Patch102: 0102-curl-7.32.0-debug.patch
|
|
|
+
|
|
|
+# make the curl tool link SSL libraries also used by src/tool_metalink.c
|
|
|
+Patch103: 0103-curl-7.32.0-metalink.patch
|
|
|
+
|
|
|
+# use localhost6 instead of ip6-localhost in the curl test-suite
|
|
|
+Patch104: 0104-curl-7.19.7-localhost6.patch
|
|
|
+
|
|
|
+# disable valgrind for certain test-cases (libssh2 problem)
|
|
|
+Patch106: 0106-curl-7.21.0-libssh2-valgrind.patch
|
|
|
+
|
|
|
+# work around valgrind bug (#678518)
|
|
|
+Patch107: 0107-curl-7.21.4-libidn-valgrind.patch
|
|
|
+
|
|
|
+# Fix character encoding of docs, which are of mixed encoding originally so
|
|
|
+# a simple iconv can't fix them
|
|
|
+Patch108: 0108-curl-7.32.0-utf8.patch
|
|
|
+
|
|
|
+
|
|
|
BuildRoot: %{_tmppath}/%{name}-%{version}-root
|
|
|
BuildRequires: openssl-devel libidn-devel zlib-devel
|
|
|
BuildRequires: openldap-devel gnutls-devel
|
|
|
-BuildRequires: libssh2-devel
|
|
|
-BuildRequires: openssh-clients
|
|
|
BuildRequires: openssh-server
|
|
|
+BuildRequires: openssh-clients
|
|
|
BuildRequires: pkgconfig
|
|
|
+%if "%{?_dist_release}" != "vl6"
|
|
|
+BuildRequires: libssh2-devel
|
|
|
+%endif
|
|
|
Requires: ca-certificates
|
|
|
|
|
|
Vendor: Project Vine
|
|
|
@@ -71,6 +104,19 @@ use cURL's capabilities internally.
|
|
|
%prep
|
|
|
%setup -q
|
|
|
|
|
|
+# upstream patches
|
|
|
+%patch1 -p1
|
|
|
+%patch2 -p1
|
|
|
+
|
|
|
+# Fedora patches
|
|
|
+%patch101 -p1
|
|
|
+%patch102 -p1
|
|
|
+%patch103 -p1
|
|
|
+%patch104 -p1
|
|
|
+%patch106 -p1
|
|
|
+%patch107 -p1
|
|
|
+%patch108 -p1
|
|
|
+
|
|
|
%build
|
|
|
%configure \
|
|
|
--with-ssl=%{_prefix} \
|
|
|
@@ -79,7 +125,9 @@ use cURL's capabilities internally.
|
|
|
--enable-ipv6 \
|
|
|
--enable-threaded-resolver \
|
|
|
--with-ca-bundle=%{_sysconfdir}/pki/tls/certs/ca-bundle.crt \
|
|
|
+%if "%{?_dist_release}" != "vl6"
|
|
|
--with-libssh2 \
|
|
|
+%endif
|
|
|
--enable-ldaps \
|
|
|
--disable-static
|
|
|
|
|
|
@@ -132,6 +180,11 @@ rm -rf $RPM_BUILD_ROOT
|
|
|
%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Wed Sep 25 2013 Daisuke SUZUKI <daisuke@linux.or.jp> 7.32.0-1
|
|
|
+- new upstream release
|
|
|
+- import upstream/fedora patches
|
|
|
+- disable libssh2 on Vine Linux 6
|
|
|
+
|
|
|
* Thu Nov 29 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 7.28.1-1
|
|
|
- new upstream reelase
|
|
|
|
daisuke