mirror of
https://github.com/yann64/haikuports.git
synced 2026-04-22 11:40:06 +02:00
libmicrohttpd, bump version (#7523)
This commit is contained in:
Schrijvers Luc
GitHub
@@ -28,18 +28,20 @@ simple WWW pages from within your C or C++ application, check it out."
|
||||
HOMEPAGE="https://www.gnu.org/software/libmicrohttpd/"
|
||||
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="0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8"
|
||||
CHECKSUM_SHA256="0ae825f8e0d7f41201fd44a0df1cf454c1cb0bc50fe9d59c26552260264c2ff8"
|
||||
PATCHES="libmicrohttpd-$portVersion.patchset"
|
||||
|
||||
ARCHITECTURES="all"
|
||||
ARCHITECTURES="all ?x86_gcc2"
|
||||
SECONDARY_ARCHITECTURES="x86"
|
||||
|
||||
libVersion="12.57.0"
|
||||
libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
|
||||
|
||||
PROVIDES="
|
||||
libmicrohttpd$secondaryArchSuffix = $portVersion
|
||||
lib:libmicrohttpd$secondaryArchSuffix = 12.43.0 compat >= 12
|
||||
lib:libmicrospdy$secondaryArchSuffix = 0.0.0 compat >= 0
|
||||
lib:libmicrohttpd$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES="
|
||||
haiku$secondaryArchSuffix
|
||||
@@ -52,8 +54,7 @@ REQUIRES="
|
||||
|
||||
PROVIDES_devel="
|
||||
libmicrohttpd${secondaryArchSuffix}_devel = $portVersion
|
||||
devel:libmicrohttpd$secondaryArchSuffix = 12.43.0 compat >= 12
|
||||
devel:libmicrospdy$secondaryArchSuffix = 0.0.0 compat >= 0
|
||||
devel:libmicrohttpd$secondaryArchSuffix = $libVersionCompat
|
||||
"
|
||||
REQUIRES_devel="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
@@ -63,6 +64,7 @@ REQUIRES_devel="
|
||||
BUILD_REQUIRES="
|
||||
haiku${secondaryArchSuffix}_devel
|
||||
devel:libcrypto$secondaryArchSuffix
|
||||
devel:libcurl$secondaryArchSuffix
|
||||
devel:libgcrypt$secondaryArchSuffix
|
||||
devel:libgnutls$secondaryArchSuffix
|
||||
devel:libgpg_error$secondaryArchSuffix
|
||||
@@ -72,6 +74,7 @@ BUILD_PREREQUIRES="
|
||||
cmd:aclocal
|
||||
cmd:autoconf
|
||||
cmd:automake
|
||||
cmd:autopoint$secondaryArchSuffix
|
||||
cmd:autoreconf
|
||||
cmd:awk
|
||||
cmd:gcc$secondaryArchSuffix
|
||||
@@ -94,9 +97,14 @@ INSTALL()
|
||||
|
||||
rm $libDir/libmicrohttpd.la
|
||||
|
||||
prepareInstalledDevelLib libmicrohttpd
|
||||
fixPkgconfig
|
||||
prepareInstalledDevelLibs \
|
||||
libmicrohttpd
|
||||
|
||||
packageEntries devel \
|
||||
$developDir
|
||||
}
|
||||
|
||||
TEST()
|
||||
{
|
||||
make check
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
From fe37b34023559ad4db38253d980ccaf431e83697 Mon Sep 17 00:00:00 2001
|
||||
From: Sergei Reznikov <diver@gelios.net>
|
||||
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 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,
|
||||
int fd;
|
||||
int ret;
|
||||
struct stat sbuf;
|
||||
+ char errorstr;
|
||||
|
||||
if (0 != strcmp (method, "GET"))
|
||||
return MHD_NO;
|
||||
@@ -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 =
|
||||
"<html><body>An internal server error has occured!\
|
||||
</body></html>";
|
||||
/* error accessing file */
|
||||
--
|
||||
2.13.1
|
||||
|
||||
|
||||
From cbc92847fcba8b6e1455bfba24dfa020618c9506 Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Fri, 4 Aug 2017 10:06:42 +0300
|
||||
Subject: Fix linker errors.
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 0fd671a..d900d26 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -326,6 +326,12 @@ netbsd*)
|
||||
mhd_host_os='OS/390'
|
||||
AC_MSG_RESULT([[$mhd_host_os]])
|
||||
;;
|
||||
+haiku*)
|
||||
+ AC_DEFINE_UNQUOTED(HAIKU,1,[This is a Haiku system])
|
||||
+ mhd_host_os='Haiku'
|
||||
+ AC_MSG_RESULT([[$mhd_host_os]])
|
||||
+ AC_SEARCH_LIBS(gethostbyname, network)
|
||||
+ ;;
|
||||
*)
|
||||
mhd_host_os='unrecognised OS'
|
||||
AC_MSG_RESULT([[$mhd_host_os]])
|
||||
--
|
||||
2.13.1
|
||||
|
||||
26
net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.72.patchset
Normal file
26
net-libs/libmicrohttpd/patches/libmicrohttpd-0.9.72.patchset
Normal file
@@ -0,0 +1,26 @@
|
||||
From cbc92847fcba8b6e1455bfba24dfa020618c9506 Mon Sep 17 00:00:00 2001
|
||||
From: Kacper Kasper <kacperkasper@gmail.com>
|
||||
Date: Fri, 4 Aug 2017 10:06:42 +0300
|
||||
Subject: Fix linker errors.
|
||||
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 844ea46..6528d57 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -366,6 +366,12 @@ AS_CASE(["$host_os"],
|
||||
mhd_host_os='GNU Hurd'
|
||||
AC_MSG_RESULT([[$mhd_host_os]])
|
||||
],
|
||||
+ [haiku*],
|
||||
+ [AC_DEFINE_UNQUOTED(HAIKU,1,[This is a Haiku system])
|
||||
+ mhd_host_os='Haiku'
|
||||
+ AC_MSG_RESULT([[$mhd_host_os]])
|
||||
+ AC_SEARCH_LIBS(gethostbyname, network)
|
||||
+ ],
|
||||
[
|
||||
mhd_host_os='unrecognised OS'
|
||||
AC_MSG_RESULT([[$mhd_host_os]])
|
||||
--
|
||||
2.37.3
|
||||
|
||||
Reference in New Issue
Block a user