From dc9026df7f693fc41e37cf265c73a8c3dbe7df57 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Wed, 19 Mar 2008 16:36:15 +0000
Subject: curl: merged 7.16.4 from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4069 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/curl/curl-native_7.16.2.bb     | 14 --------
 meta/packages/curl/curl-native_7.16.4.bb     | 14 ++++++++
 meta/packages/curl/curl-sdk_7.16.2.bb        | 14 --------
 meta/packages/curl/curl-sdk_7.16.4.bb        | 14 ++++++++
 meta/packages/curl/curl_7.16.2.bb            | 42 ----------------------
 meta/packages/curl/curl_7.16.4.bb            | 53 ++++++++++++++++++++++++++++
 meta/packages/curl/files/pkgconfig_fix.patch | 35 ++++++++++++++++++
 7 files changed, 116 insertions(+), 70 deletions(-)
 delete mode 100644 meta/packages/curl/curl-native_7.16.2.bb
 create mode 100644 meta/packages/curl/curl-native_7.16.4.bb
 delete mode 100644 meta/packages/curl/curl-sdk_7.16.2.bb
 create mode 100644 meta/packages/curl/curl-sdk_7.16.4.bb
 delete mode 100644 meta/packages/curl/curl_7.16.2.bb
 create mode 100644 meta/packages/curl/curl_7.16.4.bb
 create mode 100644 meta/packages/curl/files/pkgconfig_fix.patch

diff --git a/meta/packages/curl/curl-native_7.16.2.bb b/meta/packages/curl/curl-native_7.16.2.bb
deleted file mode 100644
index e056ec10c..000000000
--- a/meta/packages/curl/curl-native_7.16.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require curl_${PV}.bb
-inherit native
-DEPENDS = "zlib-native"
-
-do_stage () {
-        install -d ${STAGING_INCDIR}/curl
-        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-do_install() {
-	:
-}
-
diff --git a/meta/packages/curl/curl-native_7.16.4.bb b/meta/packages/curl/curl-native_7.16.4.bb
new file mode 100644
index 000000000..e056ec10c
--- /dev/null
+++ b/meta/packages/curl/curl-native_7.16.4.bb
@@ -0,0 +1,14 @@
+require curl_${PV}.bb
+inherit native
+DEPENDS = "zlib-native"
+
+do_stage () {
+        install -d ${STAGING_INCDIR}/curl
+        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
+do_install() {
+	:
+}
+
diff --git a/meta/packages/curl/curl-sdk_7.16.2.bb b/meta/packages/curl/curl-sdk_7.16.2.bb
deleted file mode 100644
index 816fe645b..000000000
--- a/meta/packages/curl/curl-sdk_7.16.2.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require curl_${PV}.bb
-inherit sdk
-DEPENDS = "zlib-sdk"
-
-do_stage () {
-        install -d ${STAGING_INCDIR}/curl
-        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-do_install() {
-	:
-}
-
diff --git a/meta/packages/curl/curl-sdk_7.16.4.bb b/meta/packages/curl/curl-sdk_7.16.4.bb
new file mode 100644
index 000000000..816fe645b
--- /dev/null
+++ b/meta/packages/curl/curl-sdk_7.16.4.bb
@@ -0,0 +1,14 @@
+require curl_${PV}.bb
+inherit sdk
+DEPENDS = "zlib-sdk"
+
+do_stage () {
+        install -d ${STAGING_INCDIR}/curl
+        install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+        oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
+do_install() {
+	:
+}
+
diff --git a/meta/packages/curl/curl_7.16.2.bb b/meta/packages/curl/curl_7.16.2.bb
deleted file mode 100644
index a8749f666..000000000
--- a/meta/packages/curl/curl_7.16.2.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-DESCRIPTION = "Command line tool and library for client-side URL transfers."
-LICENSE = "MIT"
-DEPENDS = "zlib"
-SECTION = "console/network"
-RPROVIDES_lib${PN} += "libcurl"
-PR = "r2"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2"
-S = "${WORKDIR}/curl-${PV}"
-
-inherit autotools pkgconfig binconfig
-
-EXTRA_OECONF = "--with-zlib=${STAGING_DIR_HOST}${layout_prefix}/ \
-		--without-ssl \
-		--with-random=/dev/urandom \
-		--without-libidn \
-		--enable-http \
-		--enable-file"
-
-do_stage () {
-	install -d ${STAGING_INCDIR}/curl
-	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
-	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
-}
-
-PACKAGES += "libcurl libcurl-dev libcurl-doc libcurl-dbg"
-FILES_${PN} = "${bindir}/curl"
-FILES_${PN}-dbg = "${bindir}/.debug/"
-FILES_${PN}-dev = " "
-FILES_${PN}-doc = "${mandir}/man1/curl.1"
-FILES_lib${PN} = "${libdir}/lib*.so.*"
-FILES_lib${PN}-dbg = "${libdir}/.debug/lib*.so.*"
-FILES_lib${PN}-dev = "${includedir} \
-                      ${libdir}/lib*.so \
-                      ${libdir}/lib*.a \
-                      ${libdir}/lib*.la \
-                      ${libdir}/pkgconfig \
-                      ${datadir}/aclocal \
-                      ${bindir}/*-config"
-FILES_lib${PN}-doc = "${mandir}/man3 \
-                      ${mandir}/man1/curl-config.1"
-
diff --git a/meta/packages/curl/curl_7.16.4.bb b/meta/packages/curl/curl_7.16.4.bb
new file mode 100644
index 000000000..ef85358f3
--- /dev/null
+++ b/meta/packages/curl/curl_7.16.4.bb
@@ -0,0 +1,53 @@
+DESCRIPTION = "Command line tool and library for client-side URL transfers."
+LICENSE = "MIT"
+DEPENDS = "zlib gnutls"
+SECTION = "console/network"
+PR = "r3"
+
+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_LIBDIR}/../ \
+                --with-gnutls=${STAGING_BINDIR_CROSS}/ \
+                --without-ssl \
+                --without-libssh2 \
+		--with-random=/dev/urandom \
+		--without-libidn \
+		--enable-crypto-auth \
+		"
+
+do_configure_prepend() {
+	sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
+}
+
+do_stage () {
+	install -d ${STAGING_INCDIR}/curl
+	install -m 0644 ${S}/include/curl/*.h ${STAGING_INCDIR}/curl/
+	oe_libinstall -so -a -C lib libcurl ${STAGING_LIBDIR}
+}
+
+PACKAGES += "${PN}-certs libcurl libcurl-dev libcurl-doc"
+
+FILES_${PN} = "${bindir}/curl"
+
+FILES_${PN}-certs = "${datadir}/curl/curl-*"
+PACKAGE_ARCH_${PN}-certs = "all"
+
+FILES_${PN}-doc = "${mandir}/man1/curl.1"
+
+FILES_lib${PN} = "${libdir}/lib*.so.*"
+RRECOMMENDS_lib${PN} += "${PN}-certs"
+FILES_lib${PN}-dev = "${includedir} \
+                      ${libdir}/lib*.so \
+                      ${libdir}/lib*.a \
+                      ${libdir}/lib*.la \
+                      ${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 000000000..e02316a73
--- /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 ----------------------------------------------------
-- 
cgit v1.2.3