[packages/curl] - updated to 7.36.0 - added http2 patch (fixes nghttp2 detection) - removed outdated metalink patch
qboosh
qboosh at pld-linux.org
Mon Mar 31 03:49:01 CEST 2014
commit 358ad66ad560791350d2fceebb586629050ac1a9
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Mon Mar 31 03:52:26 2014 +0200
- updated to 7.36.0
- added http2 patch (fixes nghttp2 detection)
- removed outdated metalink patch
curl-http2.patch | 11 ++++++++++
curl.spec | 37 +++++++++++++++++----------------
metalink.patch | 63 --------------------------------------------------------
3 files changed, 30 insertions(+), 81 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index f4961d5..c9eaeb5 100644
--- a/curl.spec
+++ b/curl.spec
@@ -1,19 +1,18 @@
#
# Conditional build:
-%bcond_without ssh # without SSH support
-%bcond_without ssl # without SSL support
-%bcond_without kerberos5 # without Heimdal Kerberos 5 support
-%bcond_without ldap # without LDAP support
-%bcond_with http2 # without HTTP/2.0 support (nghttp2 based)
-%bcond_without metalink # without metalink support
+%bcond_without ssh # SSH support
+%bcond_without ssl # SSL support
+%bcond_with gnutls # GnuTLS instead of OpenSSL
+%bcond_without kerberos5 # Heimdal Kerberos 5 support
+%bcond_without ldap # LDAP support
+%bcond_with http2 # HTTP/2.0 support (nghttp2 based)
+%bcond_without metalink # metalink support
%if "%{pld_release}" != "ac"
-%bcond_without ares # with c-ares (asynchronous DNS operations) library
-%bcond_with gnutls # use GnuTLS instead of OpenSSL
-%bcond_without rtmp # without Real Time Media Protocol
+%bcond_without ares # c-ares (asynchronous DNS operations) library support
+%bcond_without rtmp # Real Time Media Protocol support
%else
-%bcond_with ares # with c-ares (asynchronous DNS operations) library
-%bcond_with gnutls # use GnuTLS instead of OpenSSL
-%bcond_with rtmp # without Real Time Media Protocol
+%bcond_with ares # c-ares (asynchronous DNS operations) library support
+%bcond_with rtmp # Real Time Media Protocol support
%endif
Summary: A utility for getting files from remote servers (FTP, HTTP, and others)
@@ -23,28 +22,27 @@ Summary(pt_BR.UTF-8): Busca URL (suporta FTP, TELNET, LDAP, GOPHER, DICT, HTTP e
Summary(ru.UTF-8): Утилита для получения файлов с серверов FTP, HTTP и других
Summary(uk.UTF-8): Утиліта для отримання файлів з серверів FTP, HTTP та інших
Name: curl
-Version: 7.35.0
+Version: 7.36.0
Release: 1
License: MIT-like
Group: Applications/Networking
Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: ad7d63864414c61246450dc5e2248c7b
+# Source0-md5: 291081121e604b04e0035bfdd736d196
Patch0: %{name}-ac.patch
Patch1: %{name}-krb5flags.patch
-# make the curl tool link SSL libraries also used by src/tool_metalink.c
-Patch2: metalink.patch
+Patch2: %{name}-http2.patch
URL: http://curl.haxx.se/
BuildRequires: autoconf >= 2.57
BuildRequires: automake
%{?with_ares:BuildRequires: c-ares-devel >= 1.7.0}
%{?with_kerberos5:BuildRequires: heimdal-devel}
-%{?with_http2:BuildRequires: nghttp2-devel}
BuildRequires: libidn-devel >= 0.4.1
%{?with_metalink:BuildRequires: libmetalink-devel}
%{?with_rtmp:BuildRequires: librtmp-devel}
%{?with_ssh:BuildRequires: libssh2-devel >= 1.2.8}
BuildRequires: libtool
BuildRequires: nettle-devel
+%{?with_http2:BuildRequires: nghttp2-devel >= 0.3}
%{?with_ldap:BuildRequires: openldap-devel}
BuildRequires: pkgconfig
BuildRequires: rpm >= 4.4.9-56
@@ -118,6 +116,7 @@ Summary(pl.UTF-8): Biblioteka curl
Group: Libraries
%{?with_ares:Requires: c-ares >= 1.7.0}
%{?with_ssh:Requires: libssh2 >= 1.2.8}
+%{?with_http2:Requires: nghttp2 >= 0.3}
%if %{with ssl} && %{without gnutls}
Requires: openssl >= 1.0.1
%endif
@@ -143,6 +142,7 @@ Requires: %{name}-libs = %{version}-%{release}
Requires: libidn-devel >= 0.4.1
%{?with_rtmp:Requires: librtmp-devel}
%{?with_ssh:Requires: libssh2-devel >= 1.2.8}
+%{?with_http2:Requires: nghttp2-devel >= 0.3}
%{?with_ldap:Requires: openldap-devel}
%if %{with ssl}
%if %{with gnutls}
@@ -201,8 +201,9 @@ використанням бібліотеки curl.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
-%{__rm} -v m4/lt*.m4 m4/libtool.m4
+%{__rm} m4/lt*.m4 m4/libtool.m4
%build
%{__libtoolize}
diff --git a/curl-http2.patch b/curl-http2.patch
new file mode 100644
index 0000000..e1d596c
--- /dev/null
+++ b/curl-http2.patch
@@ -0,0 +1,11 @@
+--- curl-7.36.0/configure.ac.orig 2014-03-30 18:33:06.758735667 +0200
++++ curl-7.36.0/configure.ac 2014-03-30 20:11:15.498488539 +0200
+@@ -2767,7 +2767,7 @@
+ CLEANCPPFLAGS="$CPPFLAGS"
+ CLEANLIBS="$LIBS"
+
+- h2pcdir=${want_h2_path}/lib/pkgconfig
++ h2pcdir="${want_h2_path:+${want_h2_path}/lib${libsuff}/pkgconfig}"
+ CURL_CHECK_PKGCONFIG(libnghttp2, $h2pcdir)
+
+ if test "$PKGCONFIG" != "no" ; then
diff --git a/metalink.patch b/metalink.patch
deleted file mode 100644
index 3bb0af7..0000000
--- a/metalink.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From 5a4feefe61733d7b650d6f6e1995a6d1555530d3 Mon Sep 17 00:00:00 2001
-From: Kamil Dudka <kdudka at redhat.com>
-Date: Wed, 26 Jun 2013 18:00:43 +0200
-Subject: [PATCH] make the curl tool link SSL libraries also used by src/tool_metalink.c
-
----
- configure | 10 +++-------
- configure.ac | 18 +++++++++++-------
- 2 files changed, 14 insertions(+), 14 deletions(-)
-
-diff --git a/configure b/configure
-index a466175..cb63075 100755
---- a/configure
-+++ b/configure
-@@ -15495,13 +15495,9 @@ fi
-
-
-
--# Determine whether all dependent libraries must be specified when linking
--if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"
--then
-- REQUIRE_LIB_DEPS=no
--else
-- REQUIRE_LIB_DEPS=yes
--fi
-+REQUIRE_LIB_DEPS=yes
-+
-+
-
- if test x$REQUIRE_LIB_DEPS = xyes; then
- USE_EXPLICIT_LIB_DEPS_TRUE=
-diff --git a/configure.ac b/configure.ac
-index 49309e6..90c56b5 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -243,13 +243,17 @@ fi
- AC_SUBST([CPPFLAG_CURL_STATICLIB])
-
-
--# Determine whether all dependent libraries must be specified when linking
--if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"
--then
-- REQUIRE_LIB_DEPS=no
--else
-- REQUIRE_LIB_DEPS=yes
--fi
-+dnl make the curl tool link SSL libraries also used by src/tool_metalink.c
-+REQUIRE_LIB_DEPS=yes
-+
-+dnl # Determine whether all dependent libraries must be specified when linking
-+dnl if test "X$enable_shared" = "Xyes" -a "X$link_all_deplibs" = "Xno"
-+dnl then
-+dnl REQUIRE_LIB_DEPS=no
-+dnl else
-+dnl REQUIRE_LIB_DEPS=yes
-+dnl fi
-+
- AC_SUBST(REQUIRE_LIB_DEPS)
- AM_CONDITIONAL(USE_EXPLICIT_LIB_DEPS, test x$REQUIRE_LIB_DEPS = xyes)
-
---
-1.7.1
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/358ad66ad560791350d2fceebb586629050ac1a9
More information about the pld-cvs-commit
mailing list