diff --git a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.recipe similarity index 87% rename from net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe rename to net-libs/libmicrohttpd/libmicrohttpd-0.9.55.recipe index 4e5ae698f..dbc8be60f 100644 --- a/net-libs/libmicrohttpd/libmicrohttpd-0.9.44.recipe +++ b/net-libs/libmicrohttpd/libmicrohttpd-0.9.55.recipe @@ -26,19 +26,19 @@ standalone HTTP server, there are many other projects out there that provide \ that kind of functionality already. However, if you want to be able to serve \ simple WWW pages from within your C or C++ application, check it out." HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/" -COPYRIGHT="2015 Free Software Foundation, Inc." +COPYRIGHT="2017 Free Software Foundation, Inc." LICENSE="GNU LGPL v2.1" -REVISION="3" +REVISION="1" SOURCE_URI="http://ftp.gnu.org/gnu/libmicrohttpd/libmicrohttpd-$portVersion.tar.gz" -CHECKSUM_SHA256="f2739cc05112dc00a5ebe1a470174970ca3a3fd71dcd67fb7539af9d83b8411e" -PATCHES="libmicrohttpd-0.9.44.patchset" +CHECKSUM_SHA256="0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8" +PATCHES="libmicrohttpd-$portVersion.patchset" ARCHITECTURES="x86_gcc2 x86 x86_64" SECONDARY_ARCHITECTURES="x86" PROVIDES=" libmicrohttpd$secondaryArchSuffix = $portVersion - lib:libmicrohttpd$secondaryArchSuffix = 10.34.0 compat >= 10 + lib:libmicrohttpd$secondaryArchSuffix = 12.43.0 compat >= 12 lib:libmicrospdy$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES=" @@ -52,7 +52,7 @@ REQUIRES=" PROVIDES_devel=" libmicrohttpd${secondaryArchSuffix}_devel = $portVersion - devel:libmicrohttpd$secondaryArchSuffix = 10.34.0 compat >= 0 + devel:libmicrohttpd$secondaryArchSuffix = 12.43.0 compat >= 12 devel:libmicrospdy$secondaryArchSuffix = 0.0.0 compat >= 0 " REQUIRES_devel=" @@ -62,7 +62,6 @@ REQUIRES_devel=" BUILD_REQUIRES=" haiku${secondaryArchSuffix}_devel -# devel:libcurl$secondaryArchSuffix devel:libcrypto$secondaryArchSuffix devel:libgcrypt$secondaryArchSuffix devel:libgpg_error$secondaryArchSuffix @@ -70,15 +69,16 @@ BUILD_REQUIRES=" devel:libssl$secondaryArchSuffix " BUILD_PREREQUIRES=" + cmd:aclocal + cmd:autoconf + cmd:automake + cmd:autoreconf cmd:awk cmd:gcc$secondaryArchSuffix - cmd:make - cmd:pkg_config$secondaryArchSuffix - cmd:autoreconf - cmd:aclocal cmd:libtoolize$secondaryArchSuffix - cmd:automake - cmd:autoconf + cmd:make + cmd:makeinfo + cmd:pkg_config$secondaryArchSuffix " BUILD() @@ -92,11 +92,11 @@ INSTALL() { make install - rm $libDir/libmicrohttpd.la $libDir/libmicrospdy.la + rm $libDir/libmicrohttpd.la fixPkgconfig prepareInstalledDevelLibs \ - libmicrohttpd libmicrospdy + libmicrohttpd packageEntries devel \ $developDir } diff --git a/net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.44.patchset b/net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.55.patchset similarity index 71% rename from net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.44.patchset rename to net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.55.patchset index 1dc281ed7..8e68e3049 100644 --- a/net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.44.patchset +++ b/net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.55.patchset @@ -1,11 +1,11 @@ -From 2af8c2cccc2f4f103ecbf55e920bbb9c74c1e8a7 Mon Sep 17 00:00:00 2001 +From fe37b34023559ad4db38253d980ccaf431e83697 Mon Sep 17 00:00:00 2001 From: Sergei Reznikov -Date: Mon, 19 Oct 2015 13:10:56 +0300 +Date: Fri, 4 Aug 2017 10:06:12 +0300 Subject: Fix gcc2 build diff --git a/doc/examples/responseheaders.c b/doc/examples/responseheaders.c -index 273a1e5..2e5a87d 100644 +index aa5cd7e..4ea73e7 100644 --- a/doc/examples/responseheaders.c +++ b/doc/examples/responseheaders.c @@ -29,6 +29,7 @@ answer_to_connection (void *cls, struct MHD_Connection *connection, @@ -16,30 +16,30 @@ index 273a1e5..2e5a87d 100644 if (0 != strcmp (method, "GET")) return MHD_NO; -@@ -39,7 +40,7 @@ answer_to_connection (void *cls, struct MHD_Connection *connection, - /* error accessing file */ - if (fd != -1) - (void) close (fd); +@@ -36,7 +37,7 @@ answer_to_connection (void *cls, struct MHD_Connection *connection, + if ( (-1 == (fd = open (FILENAME, O_RDONLY))) || + (0 != fstat (fd, &sbuf)) ) + { - const char *errorstr = + errorstr = "An internal server error has occured!\ "; - response = + /* error accessing file */ -- -2.2.2 +2.13.1 -From d5d3b6e41568dca24b88cbbf783c6c3ed58a3439 Mon Sep 17 00:00:00 2001 +From cbc92847fcba8b6e1455bfba24dfa020618c9506 Mon Sep 17 00:00:00 2001 From: Kacper Kasper -Date: Mon, 30 Jan 2017 00:35:20 +0100 +Date: Fri, 4 Aug 2017 10:06:42 +0300 Subject: Fix linker errors. diff --git a/configure.ac b/configure.ac -index 6609aaa..7c2431c 100644 +index 0fd671a..d900d26 100644 --- a/configure.ac +++ b/configure.ac -@@ -201,6 +201,12 @@ netbsd*) +@@ -326,6 +326,12 @@ netbsd*) mhd_host_os='OS/390' AC_MSG_RESULT([[$mhd_host_os]]) ;; @@ -53,5 +53,5 @@ index 6609aaa..7c2431c 100644 mhd_host_os='unrecognised OS' AC_MSG_RESULT([[$mhd_host_os]]) -- -2.2.2 +2.13.1