commit 71a00fecf99c554b11cf5be592e81dc1f5ad4eaa
Author: Jakub Bogusz <[email protected]>
Date: Thu Jun 25 18:56:10 2015 +0200
- updated to 7.43.0
- updated krb5flags patch
curl-krb5flags.patch | 21 ++++++++++++---------
curl.spec | 10 +++++-----
2 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/curl.spec b/curl.spec
index 24074df..4e35b05 100644
--- a/curl.spec
+++ b/curl.spec
@@ -22,12 +22,12 @@ 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.42.1
+Version: 7.43.0
Release: 1
License: MIT-like
Group: Applications/Networking
Source0: http://curl.haxx.se/download/%{name}-%{version}.tar.lzma
-# Source0-md5: f1e460020a99da039b153e4bf0cd8600
+# Source0-md5: 95df6d1ce9c970289d2997e603d6fd79
Patch0: %{name}-ac.patch
Patch1: %{name}-krb5flags.patch
URL: http://curl.haxx.se/
@@ -41,7 +41,7 @@ BuildRequires: libidn-devel >= 0.4.1
%{?with_ssh:BuildRequires: libssh2-devel >= 1.2.8}
BuildRequires: libtool
BuildRequires: nettle-devel
-%{?with_http2:BuildRequires: nghttp2-devel >= 0.6}
+%{?with_http2:BuildRequires: nghttp2-devel >= 1.0}
%{?with_ldap:BuildRequires: openldap-devel}
BuildRequires: pkgconfig
BuildRequires: rpm >= 4.4.9-56
@@ -115,7 +115,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.6}
+%{?with_http2:Requires: nghttp2 >= 1.0}
%if %{with ssl} && %{without gnutls}
Requires: openssl >= 1.0.1
%endif
@@ -141,7 +141,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.6}
+%{?with_http2:Requires: nghttp2-devel >= 1.0}
%{?with_ldap:Requires: openldap-devel}
%if %{with ssl}
%if %{with gnutls}
diff --git a/curl-krb5flags.patch b/curl-krb5flags.patch
index 40bf3e3..484954e 100644
--- a/curl-krb5flags.patch
+++ b/curl-krb5flags.patch
@@ -1,15 +1,18 @@
---- curl-7.37.1/configure.ac.orig 2014-07-19 10:27:07.972697344 +0200
-+++ curl-7.37.1/configure.ac 2014-07-19 10:28:38.279360218 +0200
-@@ -1195,7 +1195,7 @@
+--- curl-7.43.0/configure.ac.orig 2015-06-24 21:11:53.330168712 +0200
++++ curl-7.43.0/configure.ac 2015-06-24 21:19:26.686816353 +0200
+@@ -1193,9 +1193,9 @@
+
+ if test -z "$GSSAPI_INCS"; then
if test -n "$host_alias" -a -f
"$GSSAPI_ROOT/bin/$host_alias-krb5-config"; then
- GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
- elif test -f "$GSSAPI_ROOT/bin/krb5-config"; then
-- GSSAPI_INCS=`$GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
-+ GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/krb5-config --cflags gssapi`
+- GSSAPI_INCS=`$GSSAPI_ROOT/bin/$host_alias-krb5-config --cflags gssapi`
++ GSSAPI_INCS=`CFLAGS= $GSSAPI_ROOT/bin/$host_alias-krb5-config
--cflags gssapi`
elif test -f "$KRB5CONFIG"; then
- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
+- GSSAPI_INCS=`$KRB5CONFIG --cflags gssapi`
++ GSSAPI_INCS=`CFLAGS= $KRB5CONFIG --cflags gssapi`
elif test "$GSSAPI_ROOT" != "yes"; then
-@@ -1285,7 +1285,7 @@
+ GSSAPI_INCS="-I$GSSAPI_ROOT/include"
+ fi
+@@ -1288,7 +1288,7 @@
elif test -f "$KRB5CONFIG"; then
dnl krb5-config doesn't have --libs-only-L or similar, put
everything
dnl into LIBS
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/curl.git/commitdiff/71a00fecf99c554b11cf5be592e81dc1f5ad4eaa
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
