From 8d200b4dd4002556f0c36b23f659046b8ed0abc1bb1aee80877f06cd5b7d46ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Sat, 5 Dec 2015 09:40:35 +0000 Subject: [PATCH] Accepting request 347525 from home:pluskalm:branches:devel:libraries:c_c++ - Update to 0.9.47 OBS-URL: https://build.opensuse.org/request/show/347525 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=60 --- libmicrohttpd-0.9.46.tar.gz | 3 -- libmicrohttpd-0.9.46.tar.gz.sig | Bin 543 -> 0 bytes libmicrohttpd-0.9.47.tar.gz | 3 ++ libmicrohttpd-0.9.47.tar.gz.sig | Bin 0 -> 543 bytes libmicrohttpd.changes | 19 ++++++++ libmicrohttpd.spec | 81 +++----------------------------- 6 files changed, 28 insertions(+), 78 deletions(-) delete mode 100644 libmicrohttpd-0.9.46.tar.gz delete mode 100644 libmicrohttpd-0.9.46.tar.gz.sig create mode 100644 libmicrohttpd-0.9.47.tar.gz create mode 100644 libmicrohttpd-0.9.47.tar.gz.sig diff --git a/libmicrohttpd-0.9.46.tar.gz b/libmicrohttpd-0.9.46.tar.gz deleted file mode 100644 index 4623bcd..0000000 --- a/libmicrohttpd-0.9.46.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:06dbd2654f390fa1e8196fe063fc1449a6c2ed65a38199a49bf29ad8a93b8979 -size 1249529 diff --git a/libmicrohttpd-0.9.46.tar.gz.sig b/libmicrohttpd-0.9.46.tar.gz.sig deleted file mode 100644 index 11017112d92793999511b635287314590d68ba8fc3153e149a60ddd4a0fa0868..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 543 zcmV+)0^t3L0vrSY0RjL91p-z;P;meX2@sQ>YvJOb!_3st5C3*Y`_JbP<$3Ucg7VNU zIERCe7*bSGe>1i-Ypt3pghH<2&8r1TF&-u~=t znbK4R-6&6E)&Lo6ZG<#}f#sUp%4tgmq>^bd$2nmuoDKv2vS}*3=8v8C>0B0RLY;s8 zd7n;g2*1@l8dQ_U@#M1q?yo9pYbv({1RV8@-M)fVs8JEw90?$T#Bk>W40BNs`wgPr z&c9;xPIlDCqX~;StmC`8?z9M_P%K^VZzDB}=@6ZhifwFNSUdW_Xk#CeB8DI6HhqS~&|ml%tnjf?w@mwPuWw_S zGLD8WsvMd)CL$E}_V3}`2Gfmx*u2Rrp*Zb`DGxUS(U{3L8*`#@WE|Lzu_JP58&MsL hxN{k7!&9|gj^Q3qe>Vp8Gk8=5D;dH-?-2-3F4~+22W|iW diff --git a/libmicrohttpd-0.9.47.tar.gz b/libmicrohttpd-0.9.47.tar.gz new file mode 100644 index 0000000..0028911 --- /dev/null +++ b/libmicrohttpd-0.9.47.tar.gz @@ -0,0 +1,3 @@ +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 new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..bfd78d62ff68978ca068554413937acca012cab276590ef7190ab1e4a6e65ebb GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index 719864c..e825c3a 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Sat Dec 5 09:22:32 UTC 2015 - mpluskal@suse.com + +- Update to 0.9.47 + * Reworked VS project files. Used x64 build tools by + efault, many optimizations, fixes. + dded project files for VS 2015. -EG + * SPDY is dead, killing experimental libmicrospdy. -CG + * New logic for controlling socket buffer modes. + Eliminated delay before last packet in response and before + "100 Continue" response on all platforms. Also response + header are pushed to client without waiting for response + body. -EG + * Remove 200ms delay observable with keep-alive on Darwin + and *BSD platfroms. -EG + * Fix issue with shutdown if connection was resumed just + before shutdown. -FC +- Update dependencies + ------------------------------------------------------------------- Fri Nov 13 14:01:04 UTC 2015 - mpluskal@suse.com diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 858ec7d..351ec25 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -18,16 +18,8 @@ %global libmicrohttpd libmicrohttpd12 -%global libmicrospdy libmicrospdy0 - -%if 0%{?suse_version} > 1310 && !0%{?sles_version} -# libmicrosdpy requires openssl >= 1.0.1 -# and spdylay -%define enable_libmicrospdy 1 -%endif - Name: libmicrohttpd -Version: 0.9.46 +Version: 0.9.47 Release: 0 Summary: Small Embeddable HTTP Server Library License: LGPL-2.1+ @@ -39,17 +31,17 @@ Source2: libmicrohttpd.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: libcurl-devel BuildRequires: libgcrypt-devel >= 1.2.4 BuildRequires: libgnutls-devel BuildRequires: libtasn1-devel BuildRequires: libtool +BuildRequires: makeinfo BuildRequires: openssl-devel BuildRequires: pkg-config BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?enable_libmicrospdy} -BuildRequires: spdylay-devel -%endif %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run @@ -84,20 +76,6 @@ Group: System/libraries %description -n %{libmicrohttpd} Shared library for %{name} (%{summary}). -%if 0%{?enable_libmicrospdy} -%package -n %{libmicrospdy} -Summary: Small embeddable http server library -Group: System/libraries - -%description -n %{libmicrospdy} -Shared library for libmicrospdy (%{summary}). - -WARNING: Additionally, a second, still very experimental library is provided -for SPDY (the base for HTTP 2.0) support. libmicrospdy provides a compact API -and implementation of SPDY server. libmicrospdy currently only implements -partially version 3 of SPDY. -%endif - %package devel Summary: Small Embeddable HTTP Server Library Group: Development/Libraries/C and C++ @@ -110,26 +88,6 @@ Requires(preun): info Headers, pkg-config files, so link and other development files for %{name} (%{summary}). -%if 0%{?enable_libmicrospdy} -%package -n libmicrospdy-devel -Summary: Small Embeddable HTTP Server Library -Group: Development/Libraries/C and C++ -Requires: %{libmicrospdy} = %{version} - -%description -n libmicrospdy-devel -Headers for libmicrospdy (%{summary}). - -%package -n microspdy2http -Summary: Proxy translated SPDY requests to https server -Group: System/Libraries - -%description -n microspdy2http -Translates incoming SPDY requests to http server on -localhost. - * Uses libcurl. - * No error handling for curl requests. -%endif - %prep %setup -q %patch1 -p1 @@ -145,11 +103,6 @@ localhost. --enable-https \ --disable-static \ --disable-examples \ -%if 0%{?enable_libmicrospdy} - --enable-spdy \ -%else - --disable-spdy \ -%endif --enable-curl make %{?_smp_mflags} @@ -158,19 +111,13 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} find %{buildroot} -type f -name "*.la" -delete -print %check -# linking fails with spdy enabled -#make -j1 check +# Paralel execution of tests fail +make -j 1 check %post -n %{libmicrohttpd} -p /sbin/ldconfig %postun -n %{libmicrohttpd} -p /sbin/ldconfig -%if 0%{?enable_libmicrospdy} -%post -n %{libmicrospdy} -p /sbin/ldconfig - -%postun -n %{libmicrospdy} -p /sbin/ldconfig -%endif - %post devel %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd.info%{ext_info} %install_info --info-dir=%{_infodir} %{_infodir}/libmicrohttpd-tutorial.info%{ext_info} @@ -192,20 +139,4 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_infodir}/%{name}*.info* %{_mandir}/man3/%{name}.3* -%if 0%{?enable_libmicrospdy} -%files -n %{libmicrospdy} -%defattr(-,root,root) -%{_libdir}/libmicrospdy.so.* - -%files -n libmicrospdy-devel -%defattr(-,root,root) -%{_includedir}/microspdy.h -%{_libdir}/libmicrospdy.so -%{_libdir}/pkgconfig/libmicrospdy.pc - -%files -n microspdy2http -%defattr(-,root,root) -%attr(0755,root,root) %{_bindir}/microspdy2http -%endif - %changelog