curl: merged 7.16.4 from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4069 311d38ba-8fff-0310-9ca6-ca027cbcb966

4 files changed, 58 insertions, 12 deletions

diff --git a/meta/packages/curl/curl-native_7.16.2.bb b/meta/packages/curl/curl-native_7.16.4.bb
index e056ec10c3..e056ec10c3 100644
--- a/meta/packages/curl/curl-native_7.16.2.bb
+++ b/meta/packages/curl/curl-native_7.16.4.bb
diff --git a/meta/packages/curl/curl-sdk_7.16.2.bb b/meta/packages/curl/curl-sdk_7.16.4.bb
index 816fe645bc..816fe645bc 100644
--- a/meta/packages/curl/curl-sdk_7.16.2.bb
+++ b/meta/packages/curl/curl-sdk_7.16.4.bb
diff --git a/meta/packages/curl/curl_7.16.2.bb b/meta/packages/curl/curl_7.16.4.bb
index a8749f6662..ef85358f3e 100644
--- a/meta/packages/curl/curl_7.16.2.bb
+++ b/meta/packages/curl/curl_7.16.4.bb
@@ -1,21 +1,27 @@
 DESCRIPTION = "Command line tool and library for client-side URL transfers."
 LICENSE = "MIT"
-DEPENDS = "zlib"
+DEPENDS = "zlib gnutls"
 SECTION = "console/network"
-RPROVIDES_lib${PN} += "libcurl"
-PR = "r2"
+PR = "r3"
 
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+           file://pkgconfig_fix.patch;patch=1"
 S = "${WORKDIR}/curl-${PV}"
 
 inherit autotools pkgconfig binconfig
 
-EXTRA_OECONF = "--with-zlib=${STAGING_DIR_HOST}${layout_prefix}/ \
-		--without-ssl \
+EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
+                --with-gnutls=${STAGING_BINDIR_CROSS}/ \
+                --without-ssl \
+                --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
-		--enable-http \
-		--enable-file"
+		--enable-crypto-auth \
+		"
+
+do_configure_prepend() {
+	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
+}
 
 do_stage () {
 	install -d ${STAGING_INCDIR}/curl
@@ -23,13 +29,17 @@ do_stage () {
 	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
 }
 
-PACKAGES += "libcurl libcurl-dev libcurl-doc libcurl-dbg"
+PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
+
 FILES_${PN} = "${bindir}/curl"
-FILES_${PN}-dbg = "${bindir}/.debug/"
-FILES_${PN}-dev = " "
+
+FILES_${PN}-certs = "${datadir}/curl/curl-*"
+PACKAGE_ARCH_${PN}-certs = "all"
+
 FILES_${PN}-doc = "${mandir}/man1/curl.1"
+
 FILES_lib${PN} = "${libdir}/lib*.so.*"
-FILES_lib${PN}-dbg = "${libdir}/.debug/lib*.so.*"
+RRECOMMENDS_lib${PN} += "${PN}-certs"
 FILES_lib${PN}-dev = "${includedir} \
                       ${libdir}/lib*.so \
                       ${libdir}/lib*.a \
@@ -37,6 +47,7 @@ FILES_lib${PN}-dev = "${includedir} \
                       ${libdir}/pkgconfig \
                       ${datadir}/aclocal \
                       ${bindir}/*-config"
+
 FILES_lib${PN}-doc = "${mandir}/man3 \
                       ${mandir}/man1/curl-config.1"
 
diff --git a/meta/packages/curl/files/pkgconfig_fix.patch b/meta/packages/curl/files/pkgconfig_fix.patch
new file mode 100644
index 0000000000..e02316a73a
--- /dev/null
+++ b/meta/packages/curl/files/pkgconfig_fix.patch
@@ -0,0 +1,35 @@
+Index: curl-7.16.4/libcurl.pc.in
+===================================================================
+--- curl-7.16.4.orig/libcurl.pc.in	2007-02-18 09:41:27.000000000 +0000
++++ curl-7.16.4/libcurl.pc.in	2008-03-18 11:42:43.000000000 +0000
+@@ -33,6 +33,7 @@
+ URL: http://curl.haxx.se/
+ Description: Library to transfer files with ftp, http, etc.
+ Version: @VERSION@
+-Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-Libs.private: @LIBCURL_LIBS@ @LIBS@
++Requires.private: @GNUTLS_REQUIRED@
++Libs: -L${libdir} -lcurl
++Libs.private: -ldl -lz
+ Cflags: -I${includedir}
+Index: curl-7.16.4/configure.ac
+===================================================================
+--- curl-7.16.4.orig/configure.ac	2008-03-18 11:40:30.000000000 +0000
++++ curl-7.16.4/configure.ac	2008-03-18 11:42:06.000000000 +0000
+@@ -1361,6 +1361,7 @@
+        AC_SUBST(USE_GNUTLS, [1])
+        GNUTLS_ENABLED=1
+        USE_GNUTLS="yes"
++       GNUTLS_REQUIRED="gnutls"
+        curl_ssl_msg="enabled (GnuTLS)"
+        ],
+        [
+@@ -1387,6 +1388,8 @@
+ 
+ fi dnl OPENSSL != 1
+ 
++AC_SUBST(GNUTLS_REQUIRED)
++
+ dnl ----------------------------------------------------
+ dnl NSS. Only check if GnuTLS and OpenSSL are not enabled
+ dnl ----------------------------------------------------