From ef1320a5ceb7cf8e523985feafdd6acffca837205f70d96dbf80d85dd07bb166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 30 Nov 2017 15:28:32 +0000 Subject: [PATCH] Accepting request 546778 from home:pluskalm:branches:devel:libraries:c_c++ - 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/546778 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=80 --- disable-stalling-test.patch | 26 ---------- libmicrohttpd-0.9.55.tar.gz | 3 -- libmicrohttpd-0.9.55.tar.gz.sig | Bin 287 -> 0 bytes libmicrohttpd-0.9.57.tar.gz | 3 ++ libmicrohttpd-0.9.57.tar.gz.sig | Bin 0 -> 325 bytes libmicrohttpd.changes | 9 ++++ libmicrohttpd.spec | 31 +++++------ libmicrohttpd_test_data.patch | 89 -------------------------------- 8 files changed, 24 insertions(+), 137 deletions(-) delete mode 100644 disable-stalling-test.patch delete mode 100644 libmicrohttpd-0.9.55.tar.gz delete mode 100644 libmicrohttpd-0.9.55.tar.gz.sig create mode 100644 libmicrohttpd-0.9.57.tar.gz create mode 100644 libmicrohttpd-0.9.57.tar.gz.sig delete mode 100644 libmicrohttpd_test_data.patch diff --git a/disable-stalling-test.patch b/disable-stalling-test.patch deleted file mode 100644 index f419621..0000000 --- a/disable-stalling-test.patch +++ /dev/null @@ -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 */ diff --git a/libmicrohttpd-0.9.55.tar.gz b/libmicrohttpd-0.9.55.tar.gz deleted file mode 100644 index df3f748..0000000 --- a/libmicrohttpd-0.9.55.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c1cab8dc9f2588bd3076a28f77a7f8de9560cbf2d80e53f9a8696ada80ed0f8 -size 1308328 diff --git a/libmicrohttpd-0.9.55.tar.gz.sig b/libmicrohttpd-0.9.55.tar.gz.sig deleted file mode 100644 index 268aaf908dc513292448f412e63acc147982b7a0f03c36835a383986ef250b13..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmV+)0pR|L0UQJX0SEvF1p-+sG~ECS2@t<}#HH%Oy7Wt+2mr0XON>rZ%+&{(J3s^v z2(<*TM5q3LuF{h{><9X8A_bAT+4E2dX^V;>A8Y+NeG1!3fh|))A=f`D?No`*zX^d(_)#cdi}6IuU)#AP#g0c$HTDVt%M~e)Qmd&y@Qen`I54{Z3V8Lel-tU zNQ*FR{aR3c*>Wn~yjHZ=IGM3m0O{X(oNjg$@HJ9f=B13`OFd)F;k6zF7l~+AebOzSFN?8tWdS!sGUEEb=f5qw2$%Jo;|z_3i^l)} diff --git a/libmicrohttpd-0.9.57.tar.gz b/libmicrohttpd-0.9.57.tar.gz new file mode 100644 index 0000000..48b6971 --- /dev/null +++ b/libmicrohttpd-0.9.57.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dec1a76487d7e48ad74b468a888bfda1c05731f185ff950f1e363ca9d39caf4e +size 1332713 diff --git a/libmicrohttpd-0.9.57.tar.gz.sig b/libmicrohttpd-0.9.57.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..97bc1bd3a749b6d2a0d18df0fc279cb21bc593ea60ba6cbf5870683be6543b18 GIT binary patch literal 325 zcmV-L0lNN)0YU@-0SEvr79j*EpXr_xjP}%Xqwvqadc>vb!n*VY0$LnzYYrT1GHXD2 zVQyq)crJ2v0162Zzk0-_>cYD8+As(ITaVvD+Yl0v%jowA{YwF(HnhBt5k;}CFM`hq zAI~}_W#njM0tC8VGd77Dm15ls+}-T@d=8zK!Tn&q_!4XaRyB>C)@pvhj~$dMAXgLJ z#S_|lc=oU37Qw($1+zUXbL1&NS_MEJ zQmRMiqz+Nt^V@@QtC_C@A47}nhx_v_fzigkXgzQM+L5P84RW&$iKWjulx!S~86M`f zdqa=CDs*>3x1|s@=f!0+%$-^HJQ2=UC8MuFnjK}s;1yfisNs$)E8xmy2~HurrGKSu X+-jAgnY{3shAZ?3a=zJ0hzC=;G=7?5 literal 0 HcmV?d00001 diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index 1226e12..e1254fb 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +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 diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index aac2afb..5fab486 100644 --- a/libmicrohttpd.spec +++ b/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 -%postun -n %{libmicrohttpd} -p /sbin/ldconfig - +%post -n %{libname} -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,10 @@ 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} -%defattr(-,root,root) -%{_libdir}/%{name}.so.* +%files -n %{libname} +%{_libdir}/%{name}.so.%{sover}* %files devel -%defattr(-,root,root) %doc ChangeLog %{_includedir}/microhttpd.h %{_libdir}/%{name}.so diff --git a/libmicrohttpd_test_data.patch b/libmicrohttpd_test_data.patch deleted file mode 100644 index 21d8a36..0000000 --- a/libmicrohttpd_test_data.patch +++ /dev/null @@ -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 "Empty pageEmpty page"