Skip to contentSkip to conversation

curl, curl-native: add 7.19.6

PATCH In review Michael Smith 2 participants 3 messages Oct 23, 2009

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 curl, curl-native: add 7.19.6

---

format-patch doesn't recognize the copies with 1-line changes, so:

curl-native 7.18.2 and 7.19.6 recipes are identical other than PR.

curl 7.19.5 and 7.19.6 recipes are identical except .6 no longer needs curl-add_all_algorithms.patch.

 conf/checksums.ini                 |    4 ++++
 recipes/curl/curl-native_7.19.6.bb |   11 +++++++++++
 recipes/curl/curl_7.19.6.bb        |    4 ++++
 3 files changed, 19 insertions(+), 0 deletions(-)
 create mode 100644 recipes/curl/curl-native_7.19.6.bb
 create mode 100644 recipes/curl/curl_7.19.6.bb
conf/checksums.ini +4 -0
index f91cd4e..14dfd57 100644
@@ -4606,6 +4606,10 @@ sha256=a0e28b019f022942650ffa4bdf46e4c09bd8ec18e6ca5f08ad273668115f51f7
 md5=426d161661dce70c8ea9ad8f553363a3
 sha256=05ad84a9c8d340917370f357ad9fdce5ea595deb11f4cb70f946fa48c7b02cd0
 
+[http://curl.haxx.se/download/curl-7.19.6.tar.bz2]
+md5=8402c1f654c51ad7287aad57c3aa79be
+sha256=ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
+
 [http://downloads.sourceforge.net/curlftpfs/curlftpfs-0.9.2.tar.gz]
 md5=b452123f755114cd4461d56c648d9f12
 sha256=4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958
recipes/curl/curl-native_7.19.6.bb new file +11 -0
new file mode 100644
index 0000000..2f49ad1
@@ -0,0 +1,11 @@
+require curl-common.inc
+inherit native
+DEPENDS = "zlib-native"
+
+do_stage () {
+	autotools_stage_all
+}
+
+do_install() {
+	:
+}
recipes/curl/curl_7.19.6.bb new file +4 -0
new file mode 100644
index 0000000..d5ca1bb
@@ -0,0 +1,4 @@
+require curl-common.inc
+require curl-target.inc
+
+SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
Signature · 1 line
1.6.3
#1 lore raw

PATCH 2/2 curl: support openssl in CURL_FEATURES.

Default is still gnutls.

Bump PR for curl-7.19.6.

---
 recipes/curl/curl-common.inc |    8 ++++++--
 recipes/curl/curl_7.19.6.bb  |    1 +
 2 files changed, 7 insertions(+), 2 deletions(-)
recipes/curl/curl-common.inc +6 -2
index ce4f5f2..06d539f 100644
@@ -7,7 +7,7 @@ SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
 S = "${WORKDIR}/curl-${PV}"
 
 CURL_FEATURES ?= "zlib,gnutls,cookies,crypto-auth,dict,file,ftp,http,telnet,tftp"
-# other allowed features: ipv6, ares
+# other allowed features: ipv6, ares, openssl
 
 inherit autotools pkgconfig binconfig
 
@@ -15,7 +15,6 @@ EXTRA_OECONF = " \
                 --without-libssh2 \
 		--with-random=/dev/urandom \
 		--without-libidn \
-                --without-ssl \
 		"
 
 python __anonymous() {
@@ -37,6 +36,11 @@ python __anonymous() {
                 deps.append("gnutls")
         else:
                 oeconf += " --without-gnutls"
+        if 'openssl' in f:
+                oeconf += " --with-ssl=${STAGING_LIBDIR}/../"
+                deps.append("openssl")
+        else:
+                oeconf += " --without-ssl"
         if 'ares' in f:
                 oeconf += " --enable-ares"
                 deps.append("c-ares")
recipes/curl/curl_7.19.6.bb +1 -0
index d5ca1bb..f67dcdb 100644
@@ -2,3 +2,4 @@ require curl-common.inc
 require curl-target.inc
 
 SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
+PR = "r1"
Signature · 1 line
1.6.3
Acked-by on v1 1/2
#2 lore raw
In reply to Michael Smith
Quoted 6 lines · Michael Smith

---

format-patch doesn't recognize the copies with 1-line changes, so:

curl-native 7.18.2 and 7.19.6 recipes are identical other than PR.

Looks ok. You could also make it use INC_PR when you are at it.

Quoted 62 lines

curl 7.19.5 and 7.19.6 recipes are identical except .6 no longer needs curl-add_all_algorithms.patch.

 conf/checksums.ini                 |    4 ++++ recipes/curl/curl-native_7.19.6.bb |   11 +++++++++++ recipes/curl/curl_7.19.6.bb        |    4 ++++

 3 files changed, 19 insertions(+), 0 deletions(-)

 create mode 100644 recipes/curl/curl-native_7.19.6.bb create mode 100644 recipes/curl/curl_7.19.6.bb

conf/checksums.ini +0 -0
index f91cd4e..14dfd57 100644
@@ -4606,6 +4606,10 @@ sha256=a0e28b019f022942650ffa4bdf46e4c09bd8ec18e6ca5f08ad273668115f51f7

 md5=426d161661dce70c8ea9ad8f553363a3 sha256=05ad84a9c8d340917370f357ad9fdce5ea595deb11f4cb70f946fa48c7b02cd0

+[http://curl.haxx.se/download/curl-7.19.6.tar.bz2]

conf/checksums.ini +3 -0
+md5=8402c1f654c51ad7287aad57c3aa79be
+sha256=ea88f48c8415f7d3af482e4d241277b2bdbfaffaf285e8001c88c1376cbc1021
+

 [http://downloads.sourceforge.net/curlftpfs/curlftpfs-0.9.2.tar.gz]
 md5=b452123f755114cd4461d56c648d9f12 sha256=4eb44739c7078ba0edde177bdd266c4cfb7c621075f47f64c85a06b12b3c6958

recipes/curl/curl-native_7.19.6.bb new file +11 -0
new file mode 100644
index 0000000..2f49ad1
@@ -0,0 +1,11 @@
+require curl-common.inc
+inherit native
+DEPENDS = "zlib-native"
+
+do_stage () {
+       autotools_stage_all
+}
+
+do_install() {
+       :
+}
recipes/curl/curl_7.19.6.bb new file +4 -1
new file mode 100644
index 0000000..d5ca1bb
@@ -0,0 +1,4 @@
+require curl-common.inc
+require curl-target.inc
+
+SRC_URI += "file://off_t_abi_fix.patch;patch=1;pnum=0"
--

1.6.3

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel