Patchwork curl: upgrade to 7.35.0

login
register
mail settings
Submitter Mike Crowe
Date Feb. 23, 2014, 10:20 p.m.
Message ID <1393194057-2364-1-git-send-email-mac@mcrowe.com>
Download mbox | patch
Permalink /patch/67207/
State New
Headers show

Comments

Mike Crowe - Feb. 23, 2014, 10:20 p.m.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
---
 meta/recipes-support/curl/curl_7.34.0.bb |   63 ------------------------------
 meta/recipes-support/curl/curl_7.35.0.bb |   61 +++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+), 63 deletions(-)
 delete mode 100644 meta/recipes-support/curl/curl_7.34.0.bb
 create mode 100644 meta/recipes-support/curl/curl_7.35.0.bb
Khem Raj - Feb. 25, 2014, 5:33 a.m.
On Sun, Feb 23, 2014 at 2:20 PM, Mike Crowe <mac@mcrowe.com> wrote:
> Signed-off-by: Mike Crowe <mac@mcrowe.com>
> ---
>  meta/recipes-support/curl/curl_7.34.0.bb |   63 ------------------------------
>  meta/recipes-support/curl/curl_7.35.0.bb |   61 +++++++++++++++++++++++++++++

can you generate patches with git format-patch -M ? makes renames
detection better
and patches are simple to review

>  2 files changed, 61 insertions(+), 63 deletions(-)
>  delete mode 100644 meta/recipes-support/curl/curl_7.34.0.bb
>  create mode 100644 meta/recipes-support/curl/curl_7.35.0.bb
>
> diff --git a/meta/recipes-support/curl/curl_7.34.0.bb b/meta/recipes-support/curl/curl_7.34.0.bb
> deleted file mode 100644
> index aba6649..0000000
> --- a/meta/recipes-support/curl/curl_7.34.0.bb
> +++ /dev/null
> @@ -1,63 +0,0 @@
> -SUMMARY = "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"
> -
> -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] = "88491df2bb32e9146e776ae6ac2f8327"
> -SRC_URI[sha256sum] = "10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b"
> -
> -inherit autotools pkgconfig binconfig multilib_header
> -
> -EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
> -                --without-libssh2 \
> -                --with-random=/dev/urandom \
> -                --without-libidn \
> -                --enable-crypto-auth \
> -                --disable-ldap \
> -                --disable-ldaps \
> -                --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
> -                ${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
> -}
> -
> -do_install_append() {
> -       oe_multilib_header curl/curlbuild.h
> -}
> -
> -PACKAGES =+ "libcurl libcurl-dev libcurl-staticdev libcurl-doc"
> -
> -FILES_lib${BPN} = "${libdir}/lib*.so.*"
> -RRECOMMENDS_lib${BPN} += "ca-certificates"
> -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.35.0.bb b/meta/recipes-support/curl/curl_7.35.0.bb
> new file mode 100644
> index 0000000..ddb0384
> --- /dev/null
> +++ b/meta/recipes-support/curl/curl_7.35.0.bb
> @@ -0,0 +1,61 @@
> +SUMMARY = "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"
> +
> +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] = "c18fbdd031adb0529ae09fce399f2d10"
> +SRC_URI[sha256sum] = "d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83"
> +
> +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"
> --
> 1.7.10.4
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
Richard Purdie - Feb. 25, 2014, 7:59 a.m.
On Mon, 2014-02-24 at 21:33 -0800, Khem Raj wrote:
> On Sun, Feb 23, 2014 at 2:20 PM, Mike Crowe <mac@mcrowe.com> wrote:
> > Signed-off-by: Mike Crowe <mac@mcrowe.com>
> > ---
> >  meta/recipes-support/curl/curl_7.34.0.bb |   63 ------------------------------
> >  meta/recipes-support/curl/curl_7.35.0.bb |   61 +++++++++++++++++++++++++++++
> 
> can you generate patches with git format-patch -M ? makes renames
> detection better
> and patches are simple to review

Cristiana sent out a patch for the same upgrade about the same time and
I have to admit I took the other one since it was generated with -M and
I could review it more easily...

Cheers,

Richard
Mike Crowe - Feb. 25, 2014, 11:03 a.m.
On Tuesday 25 February 2014 at 07:59:39 +0000, Richard Purdie wrote:
> On Mon, 2014-02-24 at 21:33 -0800, Khem Raj wrote:
> > On Sun, Feb 23, 2014 at 2:20 PM, Mike Crowe <mac@mcrowe.com> wrote:
> > > Signed-off-by: Mike Crowe <mac@mcrowe.com>
> > > ---
> > >  meta/recipes-support/curl/curl_7.34.0.bb |   63 ------------------------------
> > >  meta/recipes-support/curl/curl_7.35.0.bb |   61 +++++++++++++++++++++++++++++
> > 
> > can you generate patches with git format-patch -M ? makes renames
> > detection better
> > and patches are simple to review
> 
> Cristiana sent out a patch for the same upgrade about the same time and
> I have to admit I took the other one since it was generated with -M and
> I could review it more easily...

It looks like you were wise to do so. Using format-patch -M on my commit
showed that I'd based mine on an old version of curl_7.34.0.bb.

Thanks, Khem, for the -M advice; I shall add it it to my checklist.

Mike.

Patch

diff --git a/meta/recipes-support/curl/curl_7.34.0.bb b/meta/recipes-support/curl/curl_7.34.0.bb
deleted file mode 100644
index aba6649..0000000
--- a/meta/recipes-support/curl/curl_7.34.0.bb
+++ /dev/null
@@ -1,63 +0,0 @@ 
-SUMMARY = "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"
-
-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] = "88491df2bb32e9146e776ae6ac2f8327"
-SRC_URI[sha256sum] = "10beade56b48311499e444783df3413405b22f20a147ed4a1d8a8125f1cc829b"
-
-inherit autotools pkgconfig binconfig multilib_header
-
-EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
-                --without-libssh2 \
-                --with-random=/dev/urandom \
-                --without-libidn \
-                --enable-crypto-auth \
-                --disable-ldap \
-                --disable-ldaps \
-                --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \
-                ${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
-}
-
-do_install_append() {
-	oe_multilib_header curl/curlbuild.h
-}
-
-PACKAGES =+ "libcurl libcurl-dev libcurl-staticdev libcurl-doc"
-
-FILES_lib${BPN} = "${libdir}/lib*.so.*"
-RRECOMMENDS_lib${BPN} += "ca-certificates"
-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.35.0.bb b/meta/recipes-support/curl/curl_7.35.0.bb
new file mode 100644
index 0000000..ddb0384
--- /dev/null
+++ b/meta/recipes-support/curl/curl_7.35.0.bb
@@ -0,0 +1,61 @@ 
+SUMMARY = "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"
+
+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] = "c18fbdd031adb0529ae09fce399f2d10"
+SRC_URI[sha256sum] = "d774d1701454f1b7d331c2075fc4f6dd972bddc2d171f43645ef3647c7fc0d83"
+
+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"