From 1cfb12babc308157f900135ef2be8bb7c74c58b8 Mon Sep 17 00:00:00 2001 From: Marko Lindqvist Date: Wed, 26 Dec 2012 03:10:56 +0200 Subject: curl: update to upstream version 7.28.1 (From OE-Core rev: 2cb1285195439faa48571acc5346d25b4de214b4) Signed-off-by: Marko Lindqvist Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-support/curl/curl/pkgconfig_fix.patch | 45 ++++++++-------- meta/recipes-support/curl/curl_7.26.0.bb | 61 ---------------------- meta/recipes-support/curl/curl_7.28.1.bb | 61 ++++++++++++++++++++++ 3 files changed, 82 insertions(+), 85 deletions(-) delete mode 100644 meta/recipes-support/curl/curl_7.26.0.bb create mode 100644 meta/recipes-support/curl/curl_7.28.1.bb (limited to 'meta/recipes-support') 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.26.0.bb deleted file mode 100644 index c95788ba45..0000000000 --- a/meta/recipes-support/curl/curl_7.26.0.bb +++ /dev/null @@ -1,61 +0,0 @@ -DESCRIPTION = "Command line tool and library for client-side URL transfers." -HOMEPAGE = "http://curl.haxx.se/" -BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" -SECTION = "console/network" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" - -DEPENDS = "zlib gnutls" -DEPENDS_class-native = "zlib-native openssl-native" -DEPENDS_class-nativesdk = "nativesdk-zlib" -PR = "r2" - -SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ - file://pkgconfig_fix.patch" - -# curl likes to set -g0 in CFLAGS, so we stop it -# from mucking around with debug options -# -SRC_URI += " file://configure_ac.patch" - -SRC_URI[md5sum] = "bfa80f01b3d300359cfb4d409b6136a3" -SRC_URI[sha256sum] = "fced262f16eb6bfcdcea15e04a7905ffcb5ff04b14a19ca35b9df86d6720d26a" - -inherit autotools pkgconfig binconfig - -EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ - --without-libssh2 \ - --with-random=/dev/urandom \ - --without-libidn \ - --enable-crypto-auth \ - --disable-ldap \ - --disable-ldaps \ - ${CURLGNUTLS} \ - " - -CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" -CURLGNUTLS_class-native = "--without-gnutls --with-ssl" -CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" - -do_configure_prepend() { - sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac -} - -PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc" - -FILES_${PN}-certs = "${datadir}/curl/curl-*" -PACKAGE_ARCH_${PN}-certs = "all" - -FILES_lib${BPN} = "${libdir}/lib*.so.*" -RRECOMMENDS_lib${BPN} += "${PN}-certs" -FILES_lib${BPN}-dev = "${includedir} \ - ${libdir}/lib*.so \ - ${libdir}/lib*.la \ - ${libdir}/pkgconfig \ - ${datadir}/aclocal \ - ${bindir}/*-config" -FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" -FILES_lib${BPN}-doc = "${mandir}/man3 \ - ${mandir}/man1/curl-config.1" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-support/curl/curl_7.28.1.bb b/meta/recipes-support/curl/curl_7.28.1.bb new file mode 100644 index 0000000000..1f200668f4 --- /dev/null +++ b/meta/recipes-support/curl/curl_7.28.1.bb @@ -0,0 +1,61 @@ +DESCRIPTION = "Command line tool and library for client-side URL transfers." +HOMEPAGE = "http://curl.haxx.se/" +BUGTRACKER = "http://curl.haxx.se/mail/list.cgi?list=curl-tracker" +SECTION = "console/network" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac" + +DEPENDS = "zlib gnutls" +DEPENDS_class-native = "zlib-native openssl-native" +DEPENDS_class-nativesdk = "nativesdk-zlib" +PR = "r2" + +SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \ + file://pkgconfig_fix.patch" + +# curl likes to set -g0 in CFLAGS, so we stop it +# from mucking around with debug options +# +SRC_URI += " file://configure_ac.patch" + +SRC_URI[md5sum] = "26eb081c999b0e203770869427e9a93d" +SRC_URI[sha256sum] = "e569d6deb58a516e6858cd4c348949e0397433e1354666bafde1a52d1ea77367" + +inherit autotools pkgconfig binconfig + +EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \ + --without-libssh2 \ + --with-random=/dev/urandom \ + --without-libidn \ + --enable-crypto-auth \ + --disable-ldap \ + --disable-ldaps \ + ${CURLGNUTLS} \ + " + +CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl" +CURLGNUTLS_class-native = "--without-gnutls --with-ssl" +CURLGNUTLS_class-nativesdk = "--without-gnutls --without-ssl" + +do_configure_prepend() { + sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g ${S}/configure.ac +} + +PACKAGES =+ "${PN}-certs libcurl libcurl-dev libcurl-staticdev libcurl-doc" + +FILES_${PN}-certs = "${datadir}/curl/curl-*" +PACKAGE_ARCH_${PN}-certs = "all" + +FILES_lib${BPN} = "${libdir}/lib*.so.*" +RRECOMMENDS_lib${BPN} += "${PN}-certs" +FILES_lib${BPN}-dev = "${includedir} \ + ${libdir}/lib*.so \ + ${libdir}/lib*.la \ + ${libdir}/pkgconfig \ + ${datadir}/aclocal \ + ${bindir}/*-config" +FILES_lib${BPN}-staticdev = "${libdir}/lib*.a" +FILES_lib${BPN}-doc = "${mandir}/man3 \ + ${mandir}/man1/curl-config.1" + +BBCLASSEXTEND = "native nativesdk" -- cgit v1.2.3-54-g00ecf