From 0b8a33d505794598a13520e3570061fea0abe95e Mon Sep 17 00:00:00 2001 From: José Bollo Date: Mon, 29 May 2017 11:16:50 +0200 Subject: libmicrohttp: update to version 0.9.55 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug-AGL: SPEC-632 Change-Id: I89486ee190c56c399f5abbde9825082de84e9d82 Signed-off-by: José Bollo Reviewed-on: https://gerrit.automotivelinux.org/gerrit/9543 Reviewed-by: Stéphane Desneux Reviewed-by: Jan-Simon Moeller Tested-by: Jan-Simon Moeller --- .../Check-response-existence-on-upgrade.patch | 49 ---------------------- .../libmicrohttpd/libmicrohttpd_0.9.54.bb | 28 ------------- .../libmicrohttpd/libmicrohttpd_0.9.55.bb | 25 +++++++++++ 3 files changed, 25 insertions(+), 77 deletions(-) delete mode 100644 meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd/Check-response-existence-on-upgrade.patch delete mode 100644 meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.54.bb create mode 100644 meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb diff --git a/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd/Check-response-existence-on-upgrade.patch b/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd/Check-response-existence-on-upgrade.patch deleted file mode 100644 index de7ff30c4..000000000 --- a/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd/Check-response-existence-on-upgrade.patch +++ /dev/null @@ -1,49 +0,0 @@ -From: jose.bollo@iot.bzh -Date: Thu, 4 May 2017 21:47:38 +0200 -Subject: [PATCH] Check response existence on upgrade -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When a connection upgrade is requested and when the -request sent an error reply, the response is most of -the time already sent when the test on -connection->response->upgrade_handler is made, leading -to dereferencing NULL. - -Two possibilities exist: - - NULL == connection->response || NULL == connection->response->upgrade_handler - -or - - NULL != connection->response && NULL == connection->response->upgrade_handler - -The first is prefered because it is probably safer to close the connection -in that case. - -Upstream-Status: Accepted [https://gnunet.org/git/libmicrohttpd.git/commit/?id=b4216c60fdb5b48f6cfec416301fc63a1167e6cd] - -Change-Id: Ie6e7fc165f7fe3635ade0952bb34a0b937d38716 -Signed-off-by: José Bollo -Signed-off-by: José Bollo ---- - src/microhttpd/connection.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/microhttpd/connection.c b/src/microhttpd/connection.c -index 4753d6e..91a4492 100644 ---- a/src/microhttpd/connection.c -+++ b/src/microhttpd/connection.c -@@ -882,7 +882,7 @@ keepalive_possible (struct MHD_Connection *connection) - #ifdef UPGRADE_SUPPORT - if ( (MHD_str_equal_caseless_ (end, - "upgrade")) && -- (NULL == connection->response->upgrade_handler) ) -+ (NULL == connection->response || NULL == connection->response->upgrade_handler) ) - return MHD_NO; - #endif /* UPGRADE_SUPPORT */ - --- -2.9.3 - diff --git a/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.54.bb b/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.54.bb deleted file mode 100644 index 53dba022a..000000000 --- a/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.54.bb +++ /dev/null @@ -1,28 +0,0 @@ -DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" -HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" -LICENSE = "LGPL-2.1+" -LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" -SECTION = "net" -DEPENDS = "libgcrypt gnutls file" - -SRC_URI = "http://ftp.gnu.org/gnu/libmicrohttpd/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "9ed8171c7ee8cedce86959635c1db3ae" -SRC_URI[sha256sum] = "bcc721895d4a114b0548a39d2241c35caacb9e2e072d40e11b55c60e3d5ddcbe" - -FILESEXTRAPATHS_append := ":${THISDIR}/${PN}" -SRC_URI += " file://Check-response-existence-on-upgrade.patch" - -inherit autotools lib_package pkgconfig gettext - -EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" - -PACKAGECONFIG ?= "curl" -PACKAGECONFIG_append_class-target = "\ - ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ -" -PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," -PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," - -do_compile_append() { - sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc -} diff --git a/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb b/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb new file mode 100644 index 000000000..bb650ce23 --- /dev/null +++ b/meta-app-framework/recipes-support/libmicrohttpd/libmicrohttpd_0.9.55.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "A small C library that is supposed to make it easy to run an HTTP server as part of another application" +HOMEPAGE = "http://www.gnu.org/software/libmicrohttpd/" +LICENSE = "LGPL-2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=9331186f4f80db7da0e724bdd6554ee5" +SECTION = "net" +DEPENDS = "libgcrypt gnutls file" + +SRC_URI = "http://ftp.gnu.org/gnu/libmicrohttpd/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "1c20f84a8b9cf692dd50b558b3571a3a" +SRC_URI[sha256sum] = "0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8" + +inherit autotools lib_package pkgconfig gettext + +EXTRA_OECONF += "--disable-static --with-gnutls=${STAGING_LIBDIR}/../" + +PACKAGECONFIG ?= "curl" +PACKAGECONFIG_append_class-target = "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'largefile', '', d)} \ +" +PACKAGECONFIG[largefile] = "--enable-largefile,--disable-largefile,," +PACKAGECONFIG[curl] = "--enable-curl,--disable-curl,curl," + +do_compile_append() { + sed -i s:-L${STAGING_LIBDIR}::g libmicrohttpd.pc +} -- cgit 1.2.3-korg