Accepting request 742821 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/742821
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmicrohttpd?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2019-11-04 16:00:39 +00:00 committed by Git OBS Bridge
commit c1f058dd98
8 changed files with 38 additions and 36 deletions

View File

@ -1,31 +0,0 @@
From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Fri, 2 Aug 2019 15:43:44 +0200
Subject: [PATCH] trying to fix #5806
References: https://bugs.gnunet.org/view.php?id=5806
---
src/microhttpd/daemon.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
index bf01ba9b..a8fc98c6 100644
--- a/src/microhttpd/daemon.c
+++ b/src/microhttpd/daemon.c
@@ -2536,7 +2536,12 @@ internal_add_connection (struct MHD_Daemon *daemon,
else
{
#ifdef HTTPS_SUPPORT
- gnutls_init_flags_t flags;
+#if (GNUTLS_VERSION_NUMBER+0 >= 0x030500)
+ gnutls_init_flags_t
+#else
+ unsigned int
+#endif
+ flags;
flags = GNUTLS_SERVER;
#if (GNUTLS_VERSION_NUMBER+0 >= 0x030402)
--
2.16.4

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b
size 1877096

Binary file not shown.

View File

@ -0,0 +1,25 @@
From 093c83c2270e18294811f394c9af87a2cb56ea20 Mon Sep 17 00:00:00 2001
From: Christian Grothoff <christian@grothoff.org>
Date: Thu, 17 Oct 2019 23:10:34 +0200
Subject: fix missing ret, thanks, Markus
---
src/microhttpd/mhd_sockets.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/microhttpd/mhd_sockets.c b/src/microhttpd/mhd_sockets.c
index 7929c07a..ad2f91bc 100644
--- a/src/microhttpd/mhd_sockets.c
+++ b/src/microhttpd/mhd_sockets.c
@@ -530,6 +530,8 @@ MHD_socket_cork_ (MHD_socket sock,
return 0; /* even force flush failed!? */
return 1; /* success */
}
+#else
+ return 1; /* success */
#endif
#else
/* do not have MHD_TCP_CORK_NOPUSH at all */
--
cgit v1.2.1

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7e1f852723d099d4827d7ebde4d02dd00fd8da62149526fdb9fae058c5a60495
size 1881973

Binary file not shown.

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu Oct 24 19:45:52 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
- update to 0.9.67:
* improvements that eliminate system and C library calls
- drop libmicrohttpd-0.9.66-fix-gnutls-dependency.patch, upstream
- add libmicrohttpd-0.9.67-fix-nonvoid-return.patch from upstream
-------------------------------------------------------------------
Fri Aug 2 13:53:59 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>

View File

@ -20,7 +20,7 @@
%global sover 12
%global libname %{name}%{sover}
Name: libmicrohttpd
Version: 0.9.66
Version: 0.9.67
Release: 0
Summary: Small Embeddable HTTP Server Library
# Some internal tests are licenced as GPL-3.0+ - they are only used in
@ -31,7 +31,7 @@ URL: https://www.gnu.org/software/libmicrohttpd/
Source0: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz
Source1: https://ftp.gnu.org/gnu/libmicrohttpd/%{name}-%{version}.tar.gz.sig
Source2: https://savannah.gnu.org/project/memberlist-gpgkeys.php?group=%{name}&download=1#/%{name}.keyring
Patch0: libmicrohttpd-0.9.66-fix-gnutls-dependency.patch
Patch0: libmicrohttpd-0.9.67-fix-nonvoid-return.patch
BuildRequires: libtool
BuildRequires: makeinfo
BuildRequires: pkgconfig >= 0.9.0