From a2d5806f5d5eebea3828b18cffa3cb0df327a9b8 Mon Sep 17 00:00:00 2001
From: Joshua Lock <josh@linux.intel.com>
Date: Thu, 25 Mar 2010 12:16:45 +0000
Subject: curl: Bump to 7.20

Newer libcurl is needed by newer pycurl which is needed by newer yum

Signed-off-by: Joshua Lock <josh@linux.intel.com>
---
 meta/packages/curl/curl/pkgconfig_fix.patch | 20 ++++++------
 meta/packages/curl/curl_7.18.0.bb           | 49 -----------------------------
 meta/packages/curl/curl_7.20.0.bb           | 49 +++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 59 deletions(-)
 delete mode 100644 meta/packages/curl/curl_7.18.0.bb
 create mode 100644 meta/packages/curl/curl_7.20.0.bb

(limited to 'meta')

diff --git a/meta/packages/curl/curl/pkgconfig_fix.patch b/meta/packages/curl/curl/pkgconfig_fix.patch
index e02316a73..a59d39b8b 100644
--- a/meta/packages/curl/curl/pkgconfig_fix.patch
+++ b/meta/packages/curl/curl/pkgconfig_fix.patch
@@ -1,22 +1,22 @@
-Index: curl-7.16.4/libcurl.pc.in
+Index: curl-7.20.0/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 @@
+--- 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: @VERSION@
--Libs: -L${libdir} -lcurl @LDFLAGS@ @LIBS@
+-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.16.4/configure.ac
+Index: curl-7.20.0/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 @@
+--- 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 @@
         AC_SUBST(USE_GNUTLS, [1])
         GNUTLS_ENABLED=1
         USE_GNUTLS="yes"
@@ -24,7 +24,7 @@ Index: curl-7.16.4/configure.ac
         curl_ssl_msg="enabled (GnuTLS)"
         ],
         [
-@@ -1387,6 +1388,8 @@
+@@ -1696,6 +1697,8 @@
  
  fi dnl OPENSSL != 1
  
diff --git a/meta/packages/curl/curl_7.18.0.bb b/meta/packages/curl/curl_7.18.0.bb
deleted file mode 100644
index 19b46faf2..000000000
--- a/meta/packages/curl/curl_7.18.0.bb
+++ /dev/null
@@ -1,49 +0,0 @@
-DESCRIPTION = "Command line tool and library for client-side URL transfers."
-LICENSE = "MIT"
-DEPENDS = "zlib gnutls"
-DEPENDS_virtclass-native = "zlib-native"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-SECTION = "console/network"
-PR = "r1"
-
-SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
-           file://pkgconfig_fix.patch;patch=1"
-
-inherit autotools_stage 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
-}
-
-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"
-
-BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file
diff --git a/meta/packages/curl/curl_7.20.0.bb b/meta/packages/curl/curl_7.20.0.bb
new file mode 100644
index 000000000..19b46faf2
--- /dev/null
+++ b/meta/packages/curl/curl_7.20.0.bb
@@ -0,0 +1,49 @@
+DESCRIPTION = "Command line tool and library for client-side URL transfers."
+LICENSE = "MIT"
+DEPENDS = "zlib gnutls"
+DEPENDS_virtclass-native = "zlib-native"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
+SECTION = "console/network"
+PR = "r1"
+
+SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
+           file://pkgconfig_fix.patch;patch=1"
+
+inherit autotools_stage 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
+}
+
+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"
+
+BBCLASSEXTEND = "native nativesdk"
\ No newline at end of file
-- 
cgit v1.2.3