From 4a0dae1c1ac244c4876d88d51622f2a9e1fc845714f341866d0e5ce390e8748e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 2 Aug 2019 12:58:39 +0000 Subject: [PATCH 1/2] Accepting request 720591 from home:AndreasStieger:branches:devel:libraries:c_c++ libmicrohttpd 0.9.66 OBS-URL: https://build.opensuse.org/request/show/720591 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=93 --- libmicrohttpd-0.9.65.tar.gz | 3 --- libmicrohttpd-0.9.65.tar.gz.sig | Bin 566 -> 0 bytes libmicrohttpd-0.9.66.tar.gz | 3 +++ libmicrohttpd-0.9.66.tar.gz.sig | Bin 0 -> 566 bytes libmicrohttpd.changes | 11 +++++++++ libmicrohttpd.spec | 41 ++++++++++++++++---------------- 6 files changed, 34 insertions(+), 24 deletions(-) delete mode 100644 libmicrohttpd-0.9.65.tar.gz delete mode 100644 libmicrohttpd-0.9.65.tar.gz.sig create mode 100644 libmicrohttpd-0.9.66.tar.gz create mode 100644 libmicrohttpd-0.9.66.tar.gz.sig diff --git a/libmicrohttpd-0.9.65.tar.gz b/libmicrohttpd-0.9.65.tar.gz deleted file mode 100644 index 3cda31c..0000000 --- a/libmicrohttpd-0.9.65.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f2467959c5dd5f7fdf8da8d260286e7be914d18c99b898e22a70dafd2237b3c9 -size 1633346 diff --git a/libmicrohttpd-0.9.65.tar.gz.sig b/libmicrohttpd-0.9.65.tar.gz.sig deleted file mode 100644 index 353dc31b5400baa099e1239bd44ad7518d96d3c70e979660d0f47894fca7ab13..0000000000000000000000000000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 566 zcmV-60?GY}0y6{v0SEvc79j-cfi1rJT7L0;sPe%^3Nd^$Cep420$m@m%m4}r5Jn0y zd^0A}u3pIx{0heWMuVWNyIWi5&bNC07JcvW*HfE~!^-GoLZQmP+YZB{I_aqTjglLx ziZpBQw#2*ZkxzH)7bMTn?|BIsLThHSky79G)f_$_7(t^H5927w6=Cz~U=$MfRLZnl zW$KW_n`*aLj*O&@KPt=z(kG?0d5s+Q)Jx%SGgf+h+BlF54QNPzW^nWRofUMb7Bk^? z;=etbb5smH6Kv5ZCAvb!bhCfKu&hIN{SLdZREgvIv=>`YnvhGKII zMpg!kTu@}O?WAa<0N!r;XoJ*A020@dq6gzrn`JuV30*U3%P(ENNfUr#JuV9`XvsdQ z#Qu#hlVP!cp>$kZML9MHAYNN2{W_k*kEvtgHx*<+*kk0Jbczp+X2cZ& zsUO^fdw}%RkXs4^s@|c|4H?yNH42G}fbt>u=0)JU3W}$7OWqKveMuZfyE6q(8)w-q z>gpe67XM7bcX7vwcFF*A;O=ir;_IJXl>6w(=@s-|H&R)?z$lJF11d%*!pl_^Ubh6s ED+T=$`~Uy| diff --git a/libmicrohttpd-0.9.66.tar.gz b/libmicrohttpd-0.9.66.tar.gz new file mode 100644 index 0000000..e9aa524 --- /dev/null +++ b/libmicrohttpd-0.9.66.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4e66d4db1574f4912fbd2690d10d227cc9cc56df6a10aa8f4fc2da75cea7ab1b +size 1877096 diff --git a/libmicrohttpd-0.9.66.tar.gz.sig b/libmicrohttpd-0.9.66.tar.gz.sig new file mode 100644 index 0000000000000000000000000000000000000000000000000000000000000000..f6ad8a9f6f17864a5040db15abebbe9dff9e5eacf6d27dc62e6cd0023b3e2f89 GIT binary patch literal 566 zcmV-60?GY}0y6{v0SW*e79j-KLOaVcYDG7~Iu^D5X7MCU@R6ye@?i2l;eUd=_`_my@?1(a_{v+22z1a!6KlC^tSO0;2Htt` zS8|>DA~`X~lHI*aO$srbTc|K@S%DQaSB!U}jP2*qZ7l{S&A)DgnrxV;iM$@PrnHfg zR6GH#^gu@;+G*_G$&WQqO=-30U0XIuLWSjJKb@naF9C88|6^3cfY;0M>%v_L9isMR z_fYw3`~vRyIl{YzPbVLH_z$&JI9L+Q;^a-TWh;2|N0HAi35ZG_DQzi$H_HsGEBr|R zv~xAN33-_1AiXYZr$dt|J)-nJYhS%sSRE+Vb$1K25^XKlLp&|osHt)aab~P}2|>9j zNFvQik|_zDpHt)?Xpc{nHqAmObH%j9>TG88^GgP_MYDQ5Ka=oDrTGa5ov>O*qM>Nl E=8(4v`Tzg` literal 0 HcmV?d00001 diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index 1e1b6ba..deb9e30 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Fri Aug 2 10:53:30 UTC 2019 - Andreas Stieger + +- 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 diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index 2b6274c..abbd245 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -20,28 +20,25 @@ %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 -BuildRequires: file-devel -BuildRequires: libgcrypt-devel >= 1.2.4 BuildRequires: libtool BuildRequires: makeinfo -BuildRequires: openssl-devel -BuildRequires: pkgconfig +BuildRequires: pkgconfig >= 0.9.0 BuildRequires: socat -BuildRequires: pkgconfig(gnutls) -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libtasn1) +# see https://bugs.gnunet.org/view.php?id=5806 +# BuildRequires: pkgconfig(gnutls) >= 2.8.6 +BuildRequires: pkgconfig(gnutls) >= 3.5.0 +BuildRequires: pkgconfig(libcurl) >= 7.16.4 %description GNU libmicrohttpd is a small C library that is supposed to make it easy to run @@ -82,10 +79,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(gnutls) -Requires(post): info -Requires(preun): info +Requires: pkgconfig >= 0.9.0 +Requires: pkgconfig(gnutls) >= 2.8.6 +Requires(post): %{install_info_prereq} +Requires(preun): %{install_info_prereq} %description devel Headers, pkg-config files, so link and other development files for %{name} @@ -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 \ - --enable-curl + --disable-examples + 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} -%{_mandir}/man3/%{name}.3%{ext_man} +%{_infodir}/%{name}*.info%{?ext_info} +%{_mandir}/man3/%{name}.3%{?ext_man} %changelog From dc138b50d141d5ef851494642054a8408c2d96214e894341aef44030981a0b5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 2 Aug 2019 15:52:35 +0000 Subject: [PATCH 2/2] Accepting request 720664 from home:AndreasStieger:branches:devel:libraries:c_c++ fix build with SLE 12 with older GnuTLS OBS-URL: https://build.opensuse.org/request/show/720664 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libmicrohttpd?expand=0&rev=94 --- ...rohttpd-0.9.66-fix-gnutls-dependency.patch | 31 +++++++++++++++++++ libmicrohttpd.changes | 6 ++++ libmicrohttpd.spec | 6 ++-- 3 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 libmicrohttpd-0.9.66-fix-gnutls-dependency.patch diff --git a/libmicrohttpd-0.9.66-fix-gnutls-dependency.patch b/libmicrohttpd-0.9.66-fix-gnutls-dependency.patch new file mode 100644 index 0000000..4e2bdc9 --- /dev/null +++ b/libmicrohttpd-0.9.66-fix-gnutls-dependency.patch @@ -0,0 +1,31 @@ +From b84ee1fa41c53c43aa7ed1583c36af5cb7c77a0f Mon Sep 17 00:00:00 2001 +From: Christian Grothoff +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 + diff --git a/libmicrohttpd.changes b/libmicrohttpd.changes index deb9e30..df19c34 100644 --- a/libmicrohttpd.changes +++ b/libmicrohttpd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Aug 2 13:53:59 UTC 2019 - Andreas Stieger + +- 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 diff --git a/libmicrohttpd.spec b/libmicrohttpd.spec index abbd245..51be710 100644 --- a/libmicrohttpd.spec +++ b/libmicrohttpd.spec @@ -31,13 +31,12 @@ 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 +Patch0: libmicrohttpd-0.9.66-fix-gnutls-dependency.patch BuildRequires: libtool BuildRequires: makeinfo BuildRequires: pkgconfig >= 0.9.0 BuildRequires: socat -# see https://bugs.gnunet.org/view.php?id=5806 -# BuildRequires: pkgconfig(gnutls) >= 2.8.6 -BuildRequires: pkgconfig(gnutls) >= 3.5.0 +BuildRequires: pkgconfig(gnutls) >= 2.8.6 BuildRequires: pkgconfig(libcurl) >= 7.16.4 %description @@ -90,6 +89,7 @@ Headers, pkg-config files, so link and other development files for %{name} %prep %setup -q +%patch0 -p1 %build %configure \