diff options
| author |   Adrian Bunk <bunk@stusta.de> | 2019-10-30 12:52:50 +0200 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-11-01 17:22:52 -0700 |
| commit | 9529a8f5ce0bc8db9ae3b2b605436db8e69ea95b (patch) | |
| tree | 5141b283c541e4fbb9446ba95fa0f01fcff14df2 /meta-oe/recipes-support/libmicrohttpd | |
| parent | e83d44b5b47be4ca6466fe210bade76b2d60379e (diff) | |
| download | meta-openembedded-contrib-9529a8f5ce0bc8db9ae3b2b605436db8e69ea95b.tar.gz | |
libmicrohttpd: Upgrade 0.9.66 -> 0.9.67
Backported patch removed.
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-support/libmicrohttpd')
| -rw-r--r-- | meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch | 32 | ||||
| -rw-r--r-- | meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb (renamed from meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb) | 5 |
2 files changed, 2 insertions, 35 deletions
diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch deleted file mode 100644 index 61a7ac0a60..0000000000 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd/fix-build-with-older-gnutls.patch +++ /dev/null @@ -1,32 +0,0 @@ -From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001 -From: Christian Grothoff <christian@grothoff.org> -Date: Fri, 2 Aug 2019 15:43:44 +0200 -Subject: trying to fix #5806 - -Upstream-Status: Backport from 0.9.67 [https://git.gnunet.org/libmicrohttpd.git/commit/?id=b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f] - ---- - src/microhttpd/daemon.c | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c -index bf01ba9b..a8fc98c6 100644 ---- a/src/microhttpd/daemon.c -+++ b/src/microhttpd/daemon.c -@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon, - else - { - #ifdef HTTPS_SUPPORT -- gnutls_init_flags_t flags; -+#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500) -+ gnutls_init_flags_t -+#else -+ unsigned int -+#endif -+ flags; - - flags = GNUTLS_SERVER; - #if (GNUTLS_VERSION_NUMBER+0 >= 0x030402) --- -cgit v1.2.1 - diff --git a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb index 6b54170049..c400462e02 100644 --- a/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.66.bb +++ b/meta-oe/recipes-support/libmicrohttpd/libmicrohttpd_0.9.67.bb @@ -7,10 +7,9 @@ SECTION = "net" DEPENDS = "file" SRC_URI = "${GNU_MIRROR}/libmicrohttpd/${BPN}-${PV}.tar.gz \ - file://fix-build-with-older-gnutls.patch \ " -SRC_URI[md5sum] = "ce4050e75cc40d68506e2b403e1a76f9" -SRC_URI[sha256sum] = "4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b" +SRC_URI[md5sum] = "e28e04e3d3eca62f5754efb844d17812" +SRC_URI[sha256sum] = "7e1f852723d099d4827d7ebde4d02dd00fd8da62149526fdb9fae058c5a60495" inherit autotools lib_package pkgconfig gettext |