Accepting request 720699 from devel:libraries:c_c++

OBS-URL: https://build.opensuse.org/request/show/720699
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libmicrohttpd?expand=0&rev=35

libmicrohttpd-0.9.65.tar.gz

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

libmicrohttpd-0.9.66-fix-gnutls-dependency.patch

@@ -0,0 +1,31 @@
+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
+

libmicrohttpd-0.9.66.tar.gz

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

libmicrohttpd.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Fri Aug  2 13:53:59 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- fix build with SLE 12 with older GnuTLS:
+  * libmicrohttpd-0.9.66-fix-gnutls-dependency.patch
+
+-------------------------------------------------------------------
+Fri Aug  2 10:53:30 UTC 2019 - Andreas Stieger <andreas.stieger@gmx.de>
+
+- update to 0.9.66:
+  * Fix issue with discarding unhandled upload data discovered
+  * Fix hanging situation with large transmission over upgraded
+    (i.e. Web socket) connection with epoll() and HTTPS enabled
+  * Add MHD_OPTION_HTTPS_CERT_CALLBACK2 to allow OCSP stapling
+    and MHD_FEATURE_HTTPS_CERT_CALLBACK2 to check for
+- clean up build dependency list
+
 -------------------------------------------------------------------
 Sat Jul  6 11:02:36 UTC 2019 - Martin Hauke <mardnh@gmx.de>
 

libmicrohttpd.spec

@@ -20,28 +20,24 @@
 %global sover   12
 %global libname %{name}%{sover}
 Name:           libmicrohttpd
-Version:        0.9.65
+Version:        0.9.66
 Release:        0
 Summary:        Small Embeddable HTTP Server Library
 # Some internal tests are licenced as GPL-3.0+ - they are only used in
 # check phase and not shipped further
 License:        LGPL-2.1-or-later AND GPL-3.0-or-later
 Group:          Productivity/Networking/Web/Servers
-Url:            https://www.gnu.org/software/libmicrohttpd/
+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
-BuildRequires:  curl
+Patch0:         libmicrohttpd-0.9.66-fix-gnutls-dependency.patch
-BuildRequires:  file-devel
-BuildRequires:  libgcrypt-devel >= 1.2.4
 BuildRequires:  libtool
 BuildRequires:  makeinfo
-BuildRequires:  openssl-devel
+BuildRequires:  pkgconfig >= 0.9.0
-BuildRequires:  pkgconfig
 BuildRequires:  socat
-BuildRequires:  pkgconfig(gnutls)
+BuildRequires:  pkgconfig(gnutls) >= 2.8.6
-BuildRequires:  pkgconfig(libcurl)
+BuildRequires:  pkgconfig(libcurl) >= 7.16.4
-BuildRequires:  pkgconfig(libtasn1)
 
 %description
 GNU libmicrohttpd is a small C library that is supposed to make it easy to run
@@ -82,10 +78,10 @@ Summary:        Small Embeddable HTTP Server Library
 License:        LGPL-2.1-or-later
 Group:          Development/Libraries/C and C++
 Requires:       %{libname} = %{version}
-Requires:       pkgconfig
+Requires:       pkgconfig >= 0.9.0
-Requires:       pkgconfig(gnutls)
+Requires:       pkgconfig(gnutls) >= 2.8.6
-Requires(post): info
+Requires(post): %{install_info_prereq}
-Requires(preun): info
+Requires(preun): %{install_info_prereq}
 
 %description devel
 Headers, pkg-config files, so link and other development files for %{name}
@@ -93,6 +89,7 @@ Headers, pkg-config files, so link and other development files for %{name}
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %configure \
@@ -102,18 +99,19 @@ Headers, pkg-config files, so link and other development files for %{name}
   --enable-messages \
   --enable-postprocessor \
   --enable-https \
+  --enable-curl \
   --disable-static \
-  --disable-examples \
+  --disable-examples
-  --enable-curl
+
 make %{?_smp_mflags}
 
 %install
 %make_install
 find %{buildroot} -type f -name "*.la" -delete -print
-rm -f %{buildroot}%{_infodir}/%{name}_performance_data.png
+rm -v %{buildroot}%{_infodir}/%{name}_performance_data.png
 
 %check
-# Paralel execution of tests fail
+# Parallel execution of tests fail
 # Tests randomly fail so keep them in log for inspection rather than for valid
 # verification of anything.
 make -j1 check || :
@@ -129,15 +127,16 @@ make -j1 check || :
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info}
 
 %files -n %{libname}
-%doc COPYING
+%license COPYING
 %{_libdir}/%{name}.so.%{sover}*
 
 %files devel
+%license COPYING
 %doc ChangeLog
 %{_includedir}/microhttpd.h
 %{_libdir}/%{name}.so
 %{_libdir}/pkgconfig/%{name}.pc
-%{_infodir}/%{name}*.info%{ext_info}
+%{_infodir}/%{name}*.info%{?ext_info}
-%{_mandir}/man3/%{name}.3%{ext_man}
+%{_mandir}/man3/%{name}.3%{?ext_man}
 
 %changelog