Patchwork libmicrohttpd: bump to version 0.9.30

login
register
mail settings
Submitter Gustavo Zacarias
Date Sept. 3, 2013, 10:59 a.m.
Message ID <1378205948-24286-1-git-send-email-gustavo@zacarias.com.ar>
Download mbox | patch
Permalink /patch/272200/
State Accepted
Commit b189f2d327abfb2aafa4bb8bcf5a7a605b7381f7
Headers show

Comments

Gustavo Zacarias - Sept. 3, 2013, 10:59 a.m.
Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar>
---
 .../libmicrohttpd-01-openssl-conditional.patch       | 20 --------------------
 package/libmicrohttpd/libmicrohttpd.mk               |  3 +--
 2 files changed, 1 insertion(+), 22 deletions(-)
 delete mode 100644 package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch
Peter Korsgaard - Sept. 3, 2013, 2:41 p.m.
>>>>> "Gustavo" == Gustavo Zacarias <gustavo@zacarias.com.ar> writes:

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

Committed, thanks.

Patch

diff --git a/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch b/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch
deleted file mode 100644
index 37d5e1e..0000000
--- a/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch
+++ /dev/null
@@ -1,20 +0,0 @@ 
-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"
diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk
index d0501ee..48dace7 100644
--- a/package/libmicrohttpd/libmicrohttpd.mk
+++ b/package/libmicrohttpd/libmicrohttpd.mk
@@ -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+