Commit b189f2d3 authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

libmicrohttpd: bump to version 0.9.30 



Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent 09b74417

package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
Subject: [PATCH] Fix configure failure for --disable-spdy



The @HAVE_OPENSSL@ conditional is used in src/Makefile.in so when SPDY

support is forcibly disabled the AM_CONDITIONAL is never executed, causing

configure to bail out.



Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>



diff -Nura libmicrohttpd-0.9.29.orig/configure.ac libmicrohttpd-0.9.29/configure.ac

--- libmicrohttpd-0.9.29.orig/configure.ac	2013-09-02 06:17:44.660620584 -0300

+++ libmicrohttpd-0.9.29/configure.ac	2013-09-02 06:36:44.598189751 -0300

@@ -341,6 +341,8 @@

                    enable_spdy="yes"], 

                    [AM_CONDITIONAL(HAVE_OPENSSL, false)

                    enable_spdy="no"])

+else

+ AM_CONDITIONAL(HAVE_OPENSSL, false)

 fi

 

 if test "$enable_spdy" = "yes"

package/libmicrohttpd/libmicrohttpd.mk

+1 −2
Original line number Diff line number Diff line
@@ -4,12 +4,11 @@ 
#

################################################################################



LIBMICROHTTPD_VERSION = 0.9.29

LIBMICROHTTPD_VERSION = 0.9.30

LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd

LIBMICROHTTPD_LICENSE_FILES = COPYING

LIBMICROHTTPD_INSTALL_STAGING = YES

LIBMICROHTTPD_CONF_OPT = --disable-spdy

LIBMICROHTTPD_AUTORECONF = YES



ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y)

LIBMICROHTTPD_LICENSE = LGPLv2.1+