diff options
| author | Marko Lindqvist <cazfi74@gmail.com> | 2012-12-26 03:10:56 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-31 09:42:49 +0000 |
| commit | 2cb1285195439faa48571acc5346d25b4de214b4 (patch) | |
| tree | 5b540df3f463087d2bd07e436b4ede8eb2473578 /meta | |
| parent | 4c2434271cfc41e910969266ced9e5f06ee0c732 (diff) | |
| download | openembedded-core-2cb1285195439faa48571acc5346d25b4de214b4.tar.gz openembedded-core-2cb1285195439faa48571acc5346d25b4de214b4.tar.bz2 openembedded-core-2cb1285195439faa48571acc5346d25b4de214b4.zip | |
curl: update to upstream version 7.28.1
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-support/curl/curl/pkgconfig_fix.patch | 45 | ||||
| -rw-r--r-- | meta/recipes-support/curl/curl_7.28.1.bb (renamed from meta/recipes-support/curl/curl_7.26.0.bb) | 4 |
2 files changed, 23 insertions, 26 deletions
diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch index ad73c00885..7f4ef7daf6 100644 --- a/meta/recipes-support/curl/curl/pkgconfig_fix.patch +++ b/meta/recipes-support/curl/curl/pkgconfig_fix.patch @@ -1,25 +1,9 @@ Upstream-Status: Inappropriate [packaging] - -Index: curl-7.20.0/libcurl.pc.in -=================================================================== ---- curl-7.20.0.orig/libcurl.pc.in 2009-11-17 18:11:07.000000000 +0000 -+++ curl-7.20.0/libcurl.pc.in 2010-03-25 12:13:26.814051066 +0000 -@@ -35,6 +35,7 @@ - URL: http://curl.haxx.se/ - Description: Library to transfer files with ftp, http, etc. - Version: @CURLVERSION@ --Libs: -L${libdir} -lcurl @LIBS@ --Libs.private: @LIBCURL_LIBS@ @LIBS@ -+Requires.private: @GNUTLS_REQUIRED@ -+Libs: -L${libdir} -lcurl -+Libs.private: -ldl -lz - Cflags: -I${includedir} -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 @@ +diff -Nurd curl-7.28.1/configure.ac curl-7.28.1/configure.ac +--- 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 +@@ -1863,6 +1863,7 @@ AC_SUBST(USE_GNUTLS, [1]) GNUTLS_ENABLED=1 USE_GNUTLS="yes" @@ -27,12 +11,25 @@ Index: curl-7.20.0/configure.ac curl_ssl_msg="enabled (GnuTLS)" ], [ -@@ -1696,6 +1697,8 @@ - - fi dnl OPENSSL != 1 +@@ -1933,6 +1934,8 @@ + ]) + fi +AC_SUBST(GNUTLS_REQUIRED) + dnl ---------------------------------------------------- - dnl NSS. Only check if GnuTLS and OpenSSL are not enabled + 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/ + Description: Library to transfer files with ftp, http, etc. + Version: @CURLVERSION@ +-Libs: -L${libdir} -lcurl @LIBS@ +-Libs.private: @LIBCURL_LIBS@ @LIBS@ ++Requires.private: @GNUTLS_REQUIRED@ ++Libs: -L${libdir} -lcurl ++Libs.private: -ldl -lz + Cflags: -I${includedir} @CPPFLAG_CURL_STATICLIB@ diff --git a/meta/recipes-support/curl/curl_7.26.0.bb b/meta/recipes-support/curl/curl_7.28.1.bb index c95788ba45..1f200668f4 100644 --- a/meta/recipes-support/curl/curl_7.26.0.bb +++ b/meta/recipes-support/curl/curl_7.28.1.bb @@ -18,8 +18,8 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ # SRC_URI += " file://configure_ac.patch" -SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3" -SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a" +SRC_URI[md5sum] = "26eb081c999b0e203770869427e9a93d" +SRC_URI[sha256sum] = "e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367" inherit autotools pkgconfig binconfig |