Accepting request 547134 from devel:libraries:c_c++

- Install copying

- Update to version 0.9.57:
  * See provided Changelog for details
- Drop no longer needed patches:
  * libmicrohttpd_test_data.patch
  * disable-stalling-test.patch

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

disable-stalling-test.patch

@@ -1,26 +0,0 @@
-Index: src/testcurl/test_start_stop.c
-===================================================================
---- src/testcurl/test_start_stop.c.orig
-+++ src/testcurl/test_start_stop.c
-@@ -108,21 +108,6 @@ main (int argc, char *const *argv)
- {
-   unsigned int errorCount = 0;
- 
--  errorCount += testInternalGet (0);
--  errorCount += testMultithreadedGet (0);
--  errorCount += testMultithreadedPoolGet (0);
--  errorCount += testExternalGet ();
--  if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_POLL))
--    {
--      errorCount += testInternalGet(MHD_USE_POLL);
--      errorCount += testMultithreadedGet(MHD_USE_POLL);
--      errorCount += testMultithreadedPoolGet(MHD_USE_POLL);
--    }
--  if (MHD_YES == MHD_is_feature_supported(MHD_FEATURE_EPOLL))
--    {
--      errorCount += testInternalGet(MHD_USE_EPOLL);
--      errorCount += testMultithreadedPoolGet(MHD_USE_EPOLL);
--    }
-   if (errorCount != 0)
-     fprintf (stderr, "Error (code: %u)\n", errorCount);
-   return errorCount != 0;       /* 0 == pass */

libmicrohttpd-0.9.55.tar.gz

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

libmicrohttpd-0.9.57.tar.gz

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

libmicrohttpd.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Fri Dec  1 14:05:56 UTC 2017 - tchvatal@suse.com
+
+- Install copying
+
+-------------------------------------------------------------------
+Thu Nov 30 15:01:33 UTC 2017 - mpluskal@suse.com
+
+- Update to version 0.9.57:
+  * See provided Changelog for details
+- Drop no longer needed patches:
+  * libmicrohttpd_test_data.patch
+  * disable-stalling-test.patch
+
 -------------------------------------------------------------------
 Mon May 29 09:38:20 UTC 2017 - tchvatal@suse.com
 

libmicrohttpd.spec

@@ -17,22 +17,20 @@
 #
 
 
-%global libmicrohttpd libmicrohttpd12
+%global sover   12
+%global libname %{name}%{sover}
 Name:           libmicrohttpd
-Version:        0.9.55
+Version:        0.9.57
 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+ and GPL-3.0+
+License:        LGPL-2.1+ AND GPL-3.0+
 Group:          Productivity/Networking/Web/Servers
 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
-# PATCH-WORKAROUND-OPENSUSE: the threads have a problem deadlocking (in OBS)
-Patch1:         disable-stalling-test.patch
-Patch2:         libmicrohttpd_test_data.patch
 BuildRequires:  curl
 BuildRequires:  file-devel
 BuildRequires:  libgcrypt-devel >= 1.2.4
@@ -71,19 +69,19 @@ other projects out there that provide that kind of functionality already. Howeve
 if you want to be able to serve simple WWW pages from within your C or C++
 application, check it out.
 
-%package -n %{libmicrohttpd}
+%package -n %{libname}
 Summary:        Small embeddable http server library
 License:        LGPL-2.1+
 Group:          System/Libraries
 
-%description -n %{libmicrohttpd}
+%description -n %{libname}
 Shared library for %{name} (%{summary}).
 
 %package devel
 Summary:        Small Embeddable HTTP Server Library
 License:        LGPL-2.1+
 Group:          Development/Libraries/C and C++
-Requires:       %{libmicrohttpd} = %{version}
+Requires:       %{libname} = %{version}
 Requires:       pkgconfig
 Requires:       pkgconfig(gnutls)
 Requires(post): info
@@ -95,8 +93,6 @@ Headers, pkg-config files, so link and other development files for %{name}
 
 %prep
 %setup -q
-%patch1
-%patch2
 
 %build
 %configure \
@@ -112,7 +108,7 @@ Headers, pkg-config files, so link and other development files for %{name}
 make %{?_smp_mflags}
 
 %install
-make %{?_smp_mflags} DESTDIR=%{buildroot} install
+%make_install
 find %{buildroot} -type f -name "*.la" -delete -print
 
 %check
@@ -121,9 +117,8 @@ find %{buildroot} -type f -name "*.la" -delete -print
 # verification of anything.
 make -j1 check || :
 
-%post -n %{libmicrohttpd} -p /sbin/ldconfig
+%post -n %{libname} -p /sbin/ldconfig
-%postun -n %{libmicrohttpd} -p /sbin/ldconfig
+%postun -n %{libname} -p /sbin/ldconfig
-
 %post devel
 %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info}
 %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info}
@@ -132,12 +127,11 @@ make -j1 check || :
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info}
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info}
 
-%files -n %{libmicrohttpd}
+%files -n %{libname}
-%defattr(-,root,root)
+%doc COPYING
-%{_libdir}/%{name}.so.*
+%{_libdir}/%{name}.so.%{sover}*
 
 %files devel
-%defattr(-,root,root)
 %doc ChangeLog
 %{_includedir}/microhttpd.h
 %{_libdir}/%{name}.so

libmicrohttpd_test_data.patch

@@ -1,89 +0,0 @@
-Index: src/testcurl/https/test_https_sni.c
-===================================================================
---- src/testcurl/https/test_https_sni.c.orig
-+++ src/testcurl/https/test_https_sni.c
-@@ -186,7 +186,7 @@ do_get (const char *url)
-   size_t len;
-   struct curl_slist *dns_info;
- 
--  len = strlen (test_data);
-+  len = strlen (microhttpd_test_data);
-   if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
-     {
-       fprintf (stderr, MHD_E_MEM);
-@@ -231,7 +231,7 @@ do_get (const char *url)
- 
-   curl_easy_cleanup (c);
-   curl_slist_free_all (dns_info);
--  if (memcmp (cbc.buf, test_data, len) != 0)
-+  if (memcmp (cbc.buf, microhttpd_test_data, len) != 0)
-     {
-       fprintf (stderr, "Error: local file & received file differ.\n");
-       free (cbc.buf);
-Index: src/testcurl/https/tls_test_common.c
-===================================================================
---- src/testcurl/https/tls_test_common.c.orig
-+++ src/testcurl/https/tls_test_common.c
-@@ -74,7 +74,7 @@ test_daemon_get (void *cls,
-   char url[255];
-   size_t len;
- 
--  len = strlen (test_data);
-+  len = strlen (microhttpd_test_data);
-   if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
-     {
-       fprintf (stderr, MHD_E_MEM);
-@@ -124,7 +124,7 @@ test_daemon_get (void *cls,
- 
-   curl_easy_cleanup (c);
- 
--  if (memcmp (cbc.buf, test_data, len) != 0)
-+  if (memcmp (cbc.buf, microhttpd_test_data, len) != 0)
-     {
-       fprintf (stderr, "Error: local file & received file differ.\n");
-       free (cbc.buf);
-@@ -180,8 +180,8 @@ http_ahc (void *cls, struct MHD_Connecti
-       return MHD_YES;
-     }
-   *ptr = NULL;                  /* reset when done */
--  response = MHD_create_response_from_buffer (strlen (test_data),
--					      (void *) test_data,
-+  response = MHD_create_response_from_buffer (strlen (microhttpd_test_data),
-+					      (void *) microhttpd_test_data,
- 					      MHD_RESPMEM_PERSISTENT);
-   ret = MHD_queue_response (connection, MHD_HTTP_OK, response);
-   MHD_destroy_response (response);
-@@ -321,7 +321,7 @@ test_https_transfer (void *cls, const ch
-   struct CBC cbc;
-   char url[255];
- 
--  len = strlen (test_data);
-+  len = strlen (microhttpd_test_data);
-   if (NULL == (cbc.buf = malloc (sizeof (char) * len)))
-     {
-       fprintf (stderr, MHD_E_MEM);
-@@ -343,9 +343,9 @@ test_https_transfer (void *cls, const ch
-     }
- 
-   /* compare test file & daemon responce */
--  if ( (len != strlen (test_data)) ||
-+  if ( (len != strlen (microhttpd_test_data)) ||
-        (memcmp (cbc.buf, 
--		test_data, 
-+		microhttpd_test_data,
- 		len) != 0) )
-     {
-       fprintf (stderr, "Error: local file & received file differ.\n");
-Index: src/testcurl/https/tls_test_common.h
-===================================================================
---- src/testcurl/https/tls_test_common.h.orig
-+++ src/testcurl/https/tls_test_common.h
-@@ -34,7 +34,7 @@
- 
- #define DEAMON_TEST_PORT 4233
- 
--#define test_data "Hello World\n"
-+#define microhttpd_test_data "Hello World\n"
- #define ca_cert_file_name "tmp_ca_cert.pem"
- 
- #define EMPTY_PAGE "<html><head><title>Empty page</title></head><body>Empty page</body></html>"