curl: update to upstream version 7.28.1
(From OE-Core rev: 2cb1285195439faa48571acc5346d25b4de214b4) Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
b7515e25bf
commit
1cfb12babc
|
@ -1,11 +1,29 @@
|
||||||
Upstream-Status: Inappropriate [packaging]
|
Upstream-Status: Inappropriate [packaging]
|
||||||
|
|
||||||
|
diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac
|
||||||
Index: curl-7.20.0/libcurl.pc.in
|
--- curl-7.28.1/configure.ac 2012-09-08 23:39:18.000000000 +0300
|
||||||
===================================================================
|
+++ curl-7.28.1/configure.ac 2012-12-25 03:41:29.948026351 +0200
|
||||||
--- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000
|
@@ -1863,6 +1863,7 @@
|
||||||
+++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000
|
AC_SUBST(USE_GNUTLS, [1])
|
||||||
@@ -35,6 +35,7 @@
|
GNUTLS_ENABLED=1
|
||||||
|
USE_GNUTLS="yes"
|
||||||
|
+ GNUTLS_REQUIRED="gnutls"
|
||||||
|
curl_ssl_msg="enabled (GnuTLS)"
|
||||||
|
],
|
||||||
|
[
|
||||||
|
@@ -1933,6 +1934,8 @@
|
||||||
|
])
|
||||||
|
fi
|
||||||
|
|
||||||
|
+AC_SUBST(GNUTLS_REQUIRED)
|
||||||
|
+
|
||||||
|
dnl ----------------------------------------------------
|
||||||
|
dnl check for PolarSSL
|
||||||
|
dnl ----------------------------------------------------
|
||||||
|
diff -Nurd curl-7.28.1/libcurl.pc.in curl-7.28.1/libcurl.pc.in
|
||||||
|
--- curl-7.28.1/libcurl.pc.in 2012-08-08 23:45:18.000000000 +0300
|
||||||
|
+++ curl-7.28.1/libcurl.pc.in 2012-12-25 03:43:23.564023858 +0200
|
||||||
|
@@ -34,6 +34,7 @@
|
||||||
URL: http://curl.haxx.se/
|
URL: http://curl.haxx.se/
|
||||||
Description: Library to transfer files with ftp, http, etc.
|
Description: Library to transfer files with ftp, http, etc.
|
||||||
Version: @CURLVERSION@
|
Version: @CURLVERSION@
|
||||||
|
@ -14,25 +32,4 @@ Index: curl-7.20.0/libcurl.pc.in
|
||||||
+Requires.private: @GNUTLS_REQUIRED@
|
+Requires.private: @GNUTLS_REQUIRED@
|
||||||
+Libs: -L${libdir} -lcurl
|
+Libs: -L${libdir} -lcurl
|
||||||
+Libs.private: -ldl -lz
|
+Libs.private: -ldl -lz
|
||||||
Cflags: -I${includedir}
|
Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@
|
||||||
Index: curl-7.20.0/configure.ac
|
|
||||||
===================================================================
|
|
||||||
--- curl-7.20.0.orig/configure.ac 2010-02-04 21:41:46.000000000 +0000
|
|
||||||
+++ curl-7.20.0/configure.ac 2010-03-25 12:12:18.673129001 +0000
|
|
||||||
@@ -1668,6 +1668,7 @@
|
|
||||||
AC_SUBST(USE_GNUTLS, [1])
|
|
||||||
GNUTLS_ENABLED=1
|
|
||||||
USE_GNUTLS="yes"
|
|
||||||
+ GNUTLS_REQUIRED="gnutls"
|
|
||||||
curl_ssl_msg="enabled (GnuTLS)"
|
|
||||||
],
|
|
||||||
[
|
|
||||||
@@ -1696,6 +1697,8 @@
|
|
||||||
|
|
||||||
fi dnl OPENSSL != 1
|
|
||||||
|
|
||||||
+AC_SUBST(GNUTLS_REQUIRED)
|
|
||||||
+
|
|
||||||
dnl ----------------------------------------------------
|
|
||||||
dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
|
|
||||||
dnl ----------------------------------------------------
|
|
||||||
|
|
|
@ -18,8 +18,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
|
||||||
#
|
#
|
||||||
SRC_URI += " file://configure_ac.patch"
|
SRC_URI += " file://configure_ac.patch"
|
||||||
|
|
||||||
SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3"
|
SRC_URI[md5sum] = "26eb081c999b0e203770869427e9a93d"
|
||||||
SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a"
|
SRC_URI[sha256sum] = "e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367"
|
||||||
|
|
||||||
inherit autotools pkgconfig binconfig
|
inherit autotools pkgconfig binconfig
|
||||||
|
|
Loading…
Reference in New Issue