From fbb6be87477a1a3b9aeffee08c1939784213b46e98a676b6266e01680416968b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Sun, 20 Dec 2015 14:47:22 +0000 Subject: [PATCH] Accepting request 349707 from home:pluskalm:branches:devel:libraries:c_c++ - Update to 0.9.4 - Update dependencies OBS-URL: https://build.opensuse.org/request/show/349707 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=62 --- disable-stalling-test.patch | 6 +++--- libmicrohttpd-0.9.47.tar.gz | 3 --- libmicrohttpd-0.9.47.tar.gz.sig | Bin 543 -> 0 bytes libmicrohttpd-0.9.48.tar.gz | 3 +++ libmicrohttpd-0.9.48.tar.gz.sig | Bin 0 -> 543 bytes libmicrohttpd.changes | 18 ++++++++++++++++++ libmicrohttpd.spec | 3 ++- libmicrohttpd_test_data.patch | 18 +++++++++--------- 8 files changed, 35 insertions(+), 16 deletions(-) delete mode 100644 libmicrohttpd-0.9.47.tar.gz delete mode 100644 libmicrohttpd-0.9.47.tar.gz.sig create mode 100644 libmicrohttpd-0.9.48.tar.gz create mode 100644 libmicrohttpd-0.9.48.tar.gz.sig diff --git a/disable-stalling-test.patch b/disable-stalling-test.patch index 22f819c..6b02943 100644 --- a/disable-stalling-test.patch +++ b/disable-stalling-test.patch @@ -1,7 +1,7 @@ -Index: libmicrohttpd-0.9.42/src/testcurl/test_start_stop.c +Index: libmicrohttpd-0.9.48/src/testcurl/test_start_stop.c =================================================================== ---- libmicrohttpd-0.9.42.orig/src/testcurl/test_start_stop.c -+++ libmicrohttpd-0.9.42/src/testcurl/test_start_stop.c +--- libmicrohttpd-0.9.48.orig/src/testcurl/test_start_stop.c ++++ libmicrohttpd-0.9.48/src/testcurl/test_start_stop.c @@ -108,21 +108,6 @@ main (int argc, char *const *argv) { unsigned int errorCount = 0; diff --git a/libmicrohttpd-0.9.47.tar.gz b/libmicrohttpd-0.9.47.tar.gz deleted file mode 100644 index 0028911..0000000 --- a/libmicrohttpd-0.9.47.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96bdab4352a09fd3952a346bc01898536992f50127d0adea1c3096a8ec9f658c -size 1075636 diff --git a/libmicrohttpd-0.9.47.tar.gz.sig b/libmicrohttpd-0.9.47.tar.gz.sig deleted file mode 100644 index bfd78d62ff68978ca068554413937acca012cab276590ef7190ab1e4a6e65ebb..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-!KkA46O2@sQ>YvJOb!_4C`5CESE=KE^vt_;9!f<{8CZGH5FN~?}8FQ8Z)T<6?_W!zT*Ru7aMcj3h@r@Z>?!>Sn$l~Eq zJ0;pbi2~fY--GnX_#-#gdK5=gS>DFrN0tl5jPd&0Jw{7&77ekkxxj$2)3pxQEV3Z2f*z!-am6^kwO`9*P1`SL0FP^KSRrg#(k?relqP3M-Yh^z6?K9sv9iPrvtw7XNO318=$~Wof?CWQC zDf-tK@Fcg!c&+QA4{Z(P(8k`HdkI)z+IV}aF4zNJX)CFAqo?M&^MOnX$@PVtQ^r&C z|2nIF+59vBzZEsr|=G{m0(O h%Xz(qk1VTi`vqoU!-aEDWR}1jD&8nyC|%rzt0p$)Aq@Zk diff --git a/libmicrohttpd-0.9.48.tar.gz b/libmicrohttpd-0.9.48.tar.gz new file mode 100644 index 0000000..35b911d --- /dev/null +++ b/libmicrohttpd-0.9.48.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:87667e158f2bf8c691a002e256ffe30885d4121a9ee4143af0320c47cdf8a2a4 +size 1077473 diff --git a/libmicrohttpd-0.9.48.tar.gz.sig b/libmicrohttpd-0.9.48.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..15609943fca6c1b11d4b73cdfbc0b092f68bf670b1843560121edd0e39acb0fa GIT binary patch literal 543 zcmV+)0^t3L0vrSY0RjL91p-!dAKU;62@sQ>YvJOb!_1&^5CF{(ERP5fMA~G(W|Dk{ zB6}!tHEtVF;Sxeoi2~+L2T!-txCHEV7*Hw8e$wiqKG;)Ko5sX^XE8+qk`~?RLq`Ad zN{JUl5%#7u(|PgZ*mg)A?2!_GqYMq#%b8!rPI?bH>K4sjk+~!aHd~+biF~T7lw=Qc z>V2OzE@8Qv9C19=5o%AA>(Vr90LV1NSR5}>ZkX&f4XQxiCPo*>s31}6wK@w#WVpnM zemVGf%{=7KS{fnDP!ViI%%CwKhq+>ofobm{*AA)meHNRV)^2cxON9=%&UbE0 z(VuKQYur+KcSV0P4yc#%{nX7yNBEQV3e_qyuL=+n+C^%D85%S7%_n?wf6RhhyiY(_ zZoP9p$V1(@PbWZX-br_*(7NaxD>7-e{G_t0wRYW88iRC%4g3~&RPw?{2z+Za?Qfak zzGo-lEKC)VO^;&%{V*lb?8s(dQfTi{7mftQzet}gXU6XN7o;Svt4KtmFdFr)j#)B<~Q2ECX|N6jH{FEu5etMr*)ARunl hl;c4K`!*86-ic0}rC31<0`0;8mJ{FcQkj*c^^T%(|IYvb literal 0 HcmV?d00001 diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index e825c3a..e8a448b 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Sun Dec 20 09:24:05 UTC 2015 - mpluskal@suse.com + +- Update to 0.9.4 + * Improved compatibility with VS2010 and other older compilers. + * Default backlog size for listen socket was changed from 32 to + SOMAXCONN, added new option MHD_OPTION_LISTEN_BACKLOG_SIZE to + override default backlog size. + * If not all connections can be handled by MHD_select() than at + least some of connections will be processed instead of failing + without any processing. + * Fixed redefenition of FD_SETSIZE on W32 so select() will work + with 2000 connections instead of 64. + * Better handled redefenition of FD_SETSIZE on all platforms. + * Close sockets more aggressively in multi-threaded mode + (possibly relevant for idle servers). +- Update dependencies + ------------------------------------------------------------------- Sat Dec 5 09:22:32 UTC 2015 - mpluskal@suse.com diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 351ec25..c73d7bd 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -19,7 +19,7 @@ %global libmicrohttpd libmicrohttpd12 Name: libmicrohttpd -Version: 0.9.47 +Version: 0.9.48 Release: 0 Summary: Small Embeddable HTTP Server Library License: LGPL-2.1+ @@ -41,6 +41,7 @@ BuildRequires: libtool BuildRequires: makeinfo BuildRequires: openssl-devel BuildRequires: pkg-config +BuildRequires: socat BuildRoot: %{_tmppath}/%{name}-%{version}-build %description diff --git a/libmicrohttpd_test_data.patch b/libmicrohttpd_test_data.patch index 1c1f879..b3f6531 100644 --- a/libmicrohttpd_test_data.patch +++ b/libmicrohttpd_test_data.patch @@ -1,7 +1,7 @@ -Index: libmicrohttpd-0.9.42/src/testcurl/https/test_https_sni.c +Index: libmicrohttpd-0.9.48/src/testcurl/https/test_https_sni.c =================================================================== ---- libmicrohttpd-0.9.42.orig/src/testcurl/https/test_https_sni.c -+++ libmicrohttpd-0.9.42/src/testcurl/https/test_https_sni.c +--- libmicrohttpd-0.9.48.orig/src/testcurl/https/test_https_sni.c ++++ libmicrohttpd-0.9.48/src/testcurl/https/test_https_sni.c @@ -186,7 +186,7 @@ do_get (const char *url) size_t len; struct curl_slist *dns_info; @@ -20,10 +20,10 @@ Index: libmicrohttpd-0.9.42/src/testcurl/https/test_https_sni.c { fprintf (stderr, "Error: local file & received file differ.\n"); free (cbc.buf); -Index: libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.c +Index: libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.c =================================================================== ---- libmicrohttpd-0.9.42.orig/src/testcurl/https/tls_test_common.c -+++ libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.c +--- libmicrohttpd-0.9.48.orig/src/testcurl/https/tls_test_common.c ++++ libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.c @@ -74,7 +74,7 @@ test_daemon_get (void *cls, char url[255]; size_t len; @@ -74,10 +74,10 @@ Index: libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.c len) != 0) ) { fprintf (stderr, "Error: local file & received file differ.\n"); -Index: libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.h +Index: libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.h =================================================================== ---- libmicrohttpd-0.9.42.orig/src/testcurl/https/tls_test_common.h -+++ libmicrohttpd-0.9.42/src/testcurl/https/tls_test_common.h +--- libmicrohttpd-0.9.48.orig/src/testcurl/https/tls_test_common.h ++++ libmicrohttpd-0.9.48/src/testcurl/https/tls_test_common.h @@ -34,7 +34,7 @@ #define DEAMON_TEST_PORT 4233