Patchwork curl: update to upstream version 7.28.1

login
register
mail settings
Submitter Marko Lindqvist
Date Dec. 26, 2012, 1:10 a.m.
Message ID <1356484256-12329-1-git-send-email-cazfi74@gmail.com>
Download mbox | patch
Permalink /patch/41683/
State New
Headers show

Comments

Marko Lindqvist - Dec. 26, 2012, 1:10 a.m.
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
---
 meta/recipes-support/curl/curl/pkgconfig_fix.patch |   45 +++++++++-----------
 .../curl/{curl_7.26.0.bb => curl_7.28.1.bb}        |    4 +-
 2 files changed, 23 insertions(+), 26 deletions(-)
 rename meta/recipes-support/curl/{curl_7.26.0.bb => curl_7.28.1.bb} (93%)

Patch

diff --git a/meta/recipes-support/curl/curl/pkgconfig_fix.patch b/meta/recipes-support/curl/curl/pkgconfig_fix.patch
index ad73c00..7f4ef7d 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
similarity index 93%
rename from meta/recipes-support/curl/curl_7.26.0.bb
rename to meta/recipes-support/curl/curl_7.28.1.bb
index c95788b..1f20066 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