From 248b5ba901475e764779e481f37d55fee8c998d7 Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Thu, 3 Oct 2019 10:03:25 +0200 Subject: libmicrohttpd: version bump 0.9.59 -> 0.9.66 Signed-off-by: Michael Olbrich --- ...o-not-compile-tests-for-disabled-features.patch | 37 ---------------------- patches/libmicrohttpd-0.9.59/autogen.sh | 1 - patches/libmicrohttpd-0.9.59/series | 4 --- rules/libmicrohttpd.in | 5 ++- rules/libmicrohttpd.make | 6 ++-- 5 files changed, 5 insertions(+), 48 deletions(-) delete mode 100644 patches/libmicrohttpd-0.9.59/0001-Do-not-compile-tests-for-disabled-features.patch delete mode 120000 patches/libmicrohttpd-0.9.59/autogen.sh delete mode 100644 patches/libmicrohttpd-0.9.59/series diff --git a/patches/libmicrohttpd-0.9.59/0001-Do-not-compile-tests-for-disabled-features.patch b/patches/libmicrohttpd-0.9.59/0001-Do-not-compile-tests-for-disabled-features.patch deleted file mode 100644 index 358c23c06..000000000 --- a/patches/libmicrohttpd-0.9.59/0001-Do-not-compile-tests-for-disabled-features.patch +++ /dev/null @@ -1,37 +0,0 @@ -From: Juergen Borleis -Date: Mon, 18 Apr 2016 15:58:59 +0200 -Subject: [PATCH] Do not compile tests for disabled features - -Signed-off-by: Juergen Borleis ---- - doc/examples/Makefile.am | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/doc/examples/Makefile.am b/doc/examples/Makefile.am -index 7bb02daccda0..1866188f61b5 100644 ---- a/doc/examples/Makefile.am -+++ b/doc/examples/Makefile.am -@@ -12,7 +12,6 @@ endif - - # example programs - noinst_PROGRAMS = \ -- basicauthentication \ - hellobrowser \ - logging \ - responseheaders -@@ -29,10 +28,15 @@ if HAVE_W32 - AM_CPPFLAGS += -DWINDOWS - endif - -+if ENABLE_BAUTH -+noinst_PROGRAMS += \ -+ basicauthentication -+ - basicauthentication_SOURCES = \ - basicauthentication.c - basicauthentication_LDADD = \ - $(top_builddir)/src/microhttpd/libmicrohttpd.la -+endif - - hellobrowser_SOURCES = \ - hellobrowser.c diff --git a/patches/libmicrohttpd-0.9.59/autogen.sh b/patches/libmicrohttpd-0.9.59/autogen.sh deleted file mode 120000 index 9f8a4cb7d..000000000 --- a/patches/libmicrohttpd-0.9.59/autogen.sh +++ /dev/null @@ -1 +0,0 @@ -../autogen.sh \ No newline at end of file diff --git a/patches/libmicrohttpd-0.9.59/series b/patches/libmicrohttpd-0.9.59/series deleted file mode 100644 index f8bfab519..000000000 --- a/patches/libmicrohttpd-0.9.59/series +++ /dev/null @@ -1,4 +0,0 @@ -# generated by git-ptx-patches -#tag:base --start-number 1 -0001-Do-not-compile-tests-for-disabled-features.patch -# 502fecbd4d242ba6649ff061c5e9ac48 - git-ptx-patches magic diff --git a/rules/libmicrohttpd.in b/rules/libmicrohttpd.in index ea6501594..e3dd45018 100644 --- a/rules/libmicrohttpd.in +++ b/rules/libmicrohttpd.in @@ -2,9 +2,8 @@ menuconfig LIBMICROHTTPD tristate - select LIBC_PTHREAD if RUNTIME - select GNUTLS if LIBMICROHTTPD_HTTPS - select LIBGCRYPT if LIBMICROHTTPD_HTTPS + select LIBC_PTHREAD if RUNTIME + select GNUTLS if LIBMICROHTTPD_HTTPS prompt "libmicrohttpd " help Library embedding HTTP server functionality diff --git a/rules/libmicrohttpd.make b/rules/libmicrohttpd.make index 9abbb8fe3..e79b29ce4 100644 --- a/rules/libmicrohttpd.make +++ b/rules/libmicrohttpd.make @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBMICROHTTPD) += libmicrohttpd # # Paths and names # -LIBMICROHTTPD_VERSION := 0.9.59 -LIBMICROHTTPD_MD5 := 8ab5123535549195aff19e91b4e49f48 +LIBMICROHTTPD_VERSION := 0.9.66 +LIBMICROHTTPD_MD5 := ce4050e75cc40d68506e2b403e1a76f9 LIBMICROHTTPD := libmicrohttpd-$(LIBMICROHTTPD_VERSION) LIBMICROHTTPD_SUFFIX := tar.gz LIBMICROHTTPD_URL := $(call ptx/mirror, GNU, libmicrohttpd/$(LIBMICROHTTPD).$(LIBMICROHTTPD_SUFFIX)) @@ -38,7 +38,7 @@ LIBMICROHTTPD_CONF_OPT := \ --disable-curl \ --$(call ptx/endis, PTXCONF_LIBMICROHTTPD_MESSAGES)-messages \ --$(call ptx/endis, PTXCONF_LIBMICROHTTPD_HTTPS)-https \ - --disable-bauth \ + --enable-bauth \ --disable-dauth \ --disable-coverage -- cgit v1.2.3