From 5707eccfb70b92bd80d342f1edd3699a2bd743fe7dedd82016aa1f42968f6aba Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 11 Jan 2019 14:28:51 +0000 Subject: [PATCH 1/4] =?UTF-8?q?-=20Update=20to=20version=201.35.1:=20=20?= =?UTF-8?q?=20*=20nghttpx:=20Fix=20broken=20trailing=20slash=20handling=20?= =?UTF-8?q?(GH-1276)=20-=20Changes=20for=20version=201.35:=20=20=20*=20bui?= =?UTF-8?q?ld:=20cmake:=20Fix=20libevent=20version=20detection=20(Patch=20?= =?UTF-8?q?from=20Jan=20Kundr=C3=A1t)=20(GH-1238)=20=20=20*=20lib:=20Use?= =?UTF-8?q?=20=5F=5Fhas=5Fdeclspec=5Fattribute=20for=20shared=20builds=20(?= =?UTF-8?q?Patch=20from=20Don)=20(GH-1222)=20=20=20*=20src:=20Require=20C+?= =?UTF-8?q?+14=20language=20feature=20=20=20*=20nghttpx:=20Write=20mruby?= =?UTF-8?q?=20send=5Finfo=20early=20=20=20*=20nghttpx:=20Fix=20assertion?= =?UTF-8?q?=20failure=20on=20mruby=20send=5Finfo=20with=20HTTP/1=20fronten?= =?UTF-8?q?d=20=20=20*=20h2load:=20Handle=20HTTP/1=20non-final=20response?= =?UTF-8?q?=20(GH-1259)=20=20=20*=20h2load:=20Clarify=20that=20time=20for?= =?UTF-8?q?=20connect=20includes=20TLS=20handshake?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=89 --- nghttp2-1.34.0.tar.xz | 3 --- nghttp2-1.35.1.tar.xz | 3 +++ nghttp2.changes | 14 ++++++++++++++ nghttp2.spec | 6 +++--- 4 files changed, 20 insertions(+), 6 deletions(-) delete mode 100644 nghttp2-1.34.0.tar.xz create mode 100644 nghttp2-1.35.1.tar.xz diff --git a/nghttp2-1.34.0.tar.xz b/nghttp2-1.34.0.tar.xz deleted file mode 100644 index f3f55dd..0000000 --- a/nghttp2-1.34.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecb0c013141495e24bd6deca022b5a92097a7848a0c17c4e5af1243a97fa622e -size 1612432 diff --git a/nghttp2-1.35.1.tar.xz b/nghttp2-1.35.1.tar.xz new file mode 100644 index 0000000..06a3ad1 --- /dev/null +++ b/nghttp2-1.35.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b7f5b09c3ca40a46118240bf476a5babf4bd93a1e4fde2337c308c4c5c3263a +size 1614460 diff --git a/nghttp2.changes b/nghttp2.changes index 60131b5..854dbef 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 11 14:24:40 UTC 2019 - Martin Pluskal + +- Update to version 1.35.1: + * nghttpx: Fix broken trailing slash handling (GH-1276) +- Changes for version 1.35: + * build: cmake: Fix libevent version detection (Patch from Jan Kundrát) (GH-1238) + * lib: Use __has_declspec_attribute for shared builds (Patch from Don) (GH-1222) + * src: Require C++14 language feature + * nghttpx: Write mruby send_info early + * nghttpx: Fix assertion failure on mruby send_info with HTTP/1 frontend + * h2load: Handle HTTP/1 non-final response (GH-1259) + * h2load: Clarify that time for connect includes TLS handshake + ------------------------------------------------------------------- Mon Oct 8 19:46:51 UTC 2018 - adam.majer@suse.de diff --git a/nghttp2.spec b/nghttp2.spec index 3b7b6ef..e85dbcd 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -1,7 +1,7 @@ # # spec file for package nghttp2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -21,7 +21,7 @@ %define soname_asio libnghttp2_asio %define sover_asio 1 Name: nghttp2 -Version: 1.34.0 +Version: 1.35.1 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C License: MIT From 61738b69915bbaabe1aa7482209336174e132730cc46e9d7feca4b9364265ecd Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 18 Jan 2019 14:37:04 +0000 Subject: [PATCH 2/4] Accepting request 666996 from home:scarabeus_iv:branches:devel:libraries:c_c++ - Use multibuild to not pull in python3 in first build, nghttp2 is low in the system OBS-URL: https://build.opensuse.org/request/show/666996 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=90 --- _multibuild | 3 +++ nghttp2.changes | 6 ++++++ nghttp2.spec | 53 +++++++++++++++++++++++++++++++++++-------------- 3 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 _multibuild diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..81be0c2 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + python + diff --git a/nghttp2.changes b/nghttp2.changes index 854dbef..8b0aa31 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 18 14:35:14 UTC 2019 - Tomáš Chvátal + +- Use multibuild to not pull in python3 in first build, nghttp2 + is low in the system + ------------------------------------------------------------------- Fri Jan 11 14:24:40 UTC 2019 - Martin Pluskal diff --git a/nghttp2.spec b/nghttp2.spec index e85dbcd..10cbe66 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -20,7 +20,15 @@ %define sover 14 %define soname_asio libnghttp2_asio %define sover_asio 1 -Name: nghttp2 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "python" +%define psuffix -python +%bcond_without python +%else +%define psuffix %{nil} +%bcond_with python +%endif +Name: nghttp2%{psuffix} Version: 1.35.1 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C @@ -30,15 +38,13 @@ URL: https://nghttp2.org/ Source: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz Source1: baselibs.conf # PATCH-FIX-OPENSUSE nghttp2-remove-python-build.patch -Patch0: %{name}-remove-python-build.patch +Patch0: nghttp2-remove-python-build.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc-c++ BuildRequires: libtool BuildRequires: pkgconfig BuildRequires: python-rpm-macros -BuildRequires: python3-Cython -BuildRequires: python3-setuptools BuildRequires: pkgconfig(cunit) BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(libcares) @@ -47,8 +53,12 @@ BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(openssl) -BuildRequires: pkgconfig(python3) BuildRequires: pkgconfig(zlib) +%if %{with python} +BuildRequires: pkgconfig(python3) +BuildRequires: python3-Cython +BuildRequires: python3-setuptools +%endif %ifnarch ppc %{arm} BuildRequires: pkgconfig(jemalloc) %endif @@ -84,11 +94,11 @@ Group: System/Libraries Shared libraries for asynchronous implementation of Hypertext Transfer Protocol version 2. -%package -n python3-%{name} +%package -n python3-nghttp2 Summary: Python3 bindings for nghttp2 Group: Development/Libraries/Python -%description -n python3-%{name} +%description -n python3-nghttp2 Python bindings for implementation of Hypertext Transfer Protocol version 2. @@ -120,7 +130,7 @@ Documentation for nghttp2, which includes a shared C library, HTTP/2 client, server and proxy. %prep -%setup -q +%setup -q -n nghttp2-%{version} %patch0 -p1 # fix python shebang sed -i -e 's:#!%{_bindir}/env python:#!%{_bindir}/python3:g' script/fetch-ocsp-response @@ -133,19 +143,27 @@ export PYTHON=%{_bindir}/python3 --disable-silent-rules \ --enable-asio-lib \ --enable-app \ - --enable-python-bindings +%if %{with python} + --enable-python-bindings \ +%else + --disable-python-bindings \ +%endif + %{nil} make %{?_smp_mflags} all +%if %{with python} pushd python make %{?_smp_mflags} nghttp2.c %python3_build popd +%endif %install -%make_install +%if %{with python} pushd python %python3_install popd - +%else +%make_install find %{buildroot} -type f -name "*.la" -delete -print # Do not ship theis @@ -154,16 +172,24 @@ rm -rf %{buildroot}%{_datadir}/doc/nghttp2 # None of applications using these man pages are built. rm -rf %{buildroot}%{_mandir}/man1/* \ doc/manual/html/.buildinfo +%endif %check # One test fails if python-sphinx is not present make %{?_smp_mflags} check ||: +%if !%{with python} %post -n %{soname}-%{sover} -p /sbin/ldconfig %post -n %{soname_asio}%{sover_asio} -p /sbin/ldconfig %postun -n %{soname}-%{sover} -p /sbin/ldconfig %postun -n %{soname_asio}%{sover_asio} -p /sbin/ldconfig +%endif +%if %{with python} +%files -n python3-nghttp2 +%{python3_sitearch}/nghttp2.*.so +%{python3_sitearch}/python_nghttp2-* +%else %files %{_bindir}/deflatehd %{_bindir}/inflatehd @@ -181,10 +207,6 @@ make %{?_smp_mflags} check ||: %license COPYING %{_libdir}/%{soname_asio}.so.%{sover_asio}* -%files -n python3-%{name} -%{python3_sitearch}/nghttp2.*.so -%{python3_sitearch}/python_nghttp2-* - %files -n %{soname}-devel %dir %{_includedir}/%{name}/ %{_includedir}/%{name}/%{name}*.h @@ -196,5 +218,6 @@ make %{?_smp_mflags} check ||: %{_includedir}/%{name}/asio_http2*.h %{_libdir}/%{soname_asio}.so %{_libdir}/pkgconfig/%{soname_asio}.pc +%endif %changelog From 437f3f5ac00a8c4f41ecbaccd8cb936fa8640c0ec55533c73379936eabc3a457 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 18 Jan 2019 14:47:29 +0000 Subject: [PATCH 3/4] Accepting request 667000 from home:scarabeus_iv:branches:devel:libraries:c_c++ OBS-URL: https://build.opensuse.org/request/show/667000 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=91 --- nghttp2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nghttp2.spec b/nghttp2.spec index 10cbe66..f662ed2 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -136,8 +136,12 @@ HTTP/2 client, server and proxy. sed -i -e 's:#!%{_bindir}/env python:#!%{_bindir}/python3:g' script/fetch-ocsp-response %build -autoreconf -fiv +%if %{with python} export PYTHON=%{_bindir}/python3 +%else +sed -i -e '/AM_PATH_PYTHON([2.7],, [:]) /d' configure.ac +%endif +autoreconf -fiv %configure \ --disable-static \ --disable-silent-rules \ From 8ac1f8cbff8f15fd318abe7ffd51b5c93743a1d57134e422fa52d8a61000f281 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 18 Jan 2019 17:16:34 +0000 Subject: [PATCH 4/4] Accepting request 667023 from home:seanlew:branches:devel:libraries:c_c++ Update nghttp2 OBS-URL: https://build.opensuse.org/request/show/667023 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=92 --- nghttp2-1.35.1.tar.xz | 3 --- nghttp2-1.36.0.tar.xz | 3 +++ nghttp2.changes | 14 ++++++++++++++ nghttp2.spec | 2 +- 4 files changed, 18 insertions(+), 4 deletions(-) delete mode 100644 nghttp2-1.35.1.tar.xz create mode 100644 nghttp2-1.36.0.tar.xz diff --git a/nghttp2-1.35.1.tar.xz b/nghttp2-1.35.1.tar.xz deleted file mode 100644 index 06a3ad1..0000000 --- a/nghttp2-1.35.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b7f5b09c3ca40a46118240bf476a5babf4bd93a1e4fde2337c308c4c5c3263a -size 1614460 diff --git a/nghttp2-1.36.0.tar.xz b/nghttp2-1.36.0.tar.xz new file mode 100644 index 0000000..f6e34d0 --- /dev/null +++ b/nghttp2-1.36.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e9bb86157b88eda5a6844a232e039febbb52c1aa44b640acbbfabe729b8287fc +size 1629020 diff --git a/nghttp2.changes b/nghttp2.changes index 8b0aa31..0e4a7db 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Fri Jan 18 16:42:34 UTC 2019 - seanlew@opensuse.org + +- Update to 1.36.0 + * build: disable shared library if ENABLE_SHARED_LIB is off + * third-party: use http-parser to v2.9.0 (GH-1294) + * third-party: Update mruby to 2.0.0 + * nghttpx: Pool h1 backend connection per address (GH-1292) + * nghttpx: Randomize backend address round robin order per thread + (GH-1291) + * nghttpx: Fix getting long SNs for openssl < 1.1 (GH-1287) + * h2load: add an option to write per-request logs (GH-1256) + * asio: added access to # of the current server port (GH-1257) + ------------------------------------------------------------------- Fri Jan 18 14:35:14 UTC 2019 - Tomáš Chvátal diff --git a/nghttp2.spec b/nghttp2.spec index f662ed2..23afc7d 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -29,7 +29,7 @@ %bcond_with python %endif Name: nghttp2%{psuffix} -Version: 1.35.1 +Version: 1.36.0 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C License: MIT