From a4e7a9d7c7c353ee4335b4aa8c232992179696e45f142e1758210d94fad84204 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Thu, 16 Jul 2015 12:54:32 +0000 Subject: [PATCH] Accepting request 317158 from home:pluskalm:branches:devel:libraries:c_c++ - Update to 1.1.1 OBS-URL: https://build.opensuse.org/request/show/317158 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=28 --- missing_nghttp2_timegm.patch | 21 +++++++++++++++++++++ nghttp2-1.0.5.tar.xz | 3 --- nghttp2-1.1.1.tar.xz | 3 +++ nghttp2-remove-python-build.patch | 21 +++++++++++++++++++++ nghttp2.changes | 27 +++++++++++++++++++++++++++ nghttp2.spec | 25 ++++++++++++++++++++++--- 6 files changed, 94 insertions(+), 6 deletions(-) create mode 100644 missing_nghttp2_timegm.patch delete mode 100644 nghttp2-1.0.5.tar.xz create mode 100644 nghttp2-1.1.1.tar.xz create mode 100644 nghttp2-remove-python-build.patch diff --git a/missing_nghttp2_timegm.patch b/missing_nghttp2_timegm.patch new file mode 100644 index 0000000..f0c25b7 --- /dev/null +++ b/missing_nghttp2_timegm.patch @@ -0,0 +1,21 @@ +From c470ac7b0021d3cae80ef1c5b6460a108f2e5bdb Mon Sep 17 00:00:00 2001 +From: Tatsuhiro Tsujikawa +Date: Thu, 16 Jul 2015 14:01:18 +0900 +Subject: [PATCH] asio: Fix missing nghttp2_timegm + +--- + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +Index: nghttp2-1.1.1/src/Makefile.am +=================================================================== +--- nghttp2-1.1.1.orig/src/Makefile.am ++++ nghttp2-1.1.1/src/Makefile.am +@@ -176,6 +176,7 @@ lib_LTLIBRARIES = libnghttp2_asio.la + libnghttp2_asio_la_SOURCES = \ + util.cc util.h http2.cc http2.h \ + ssl.cc ssl.h \ ++ timegm.c timegm.h \ + asio_common.cc asio_common.h \ + asio_io_service_pool.cc asio_io_service_pool.h \ + asio_server_http2.cc \ diff --git a/nghttp2-1.0.5.tar.xz b/nghttp2-1.0.5.tar.xz deleted file mode 100644 index 0e6b975..0000000 --- a/nghttp2-1.0.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8515822015016008ac536de92a7e3652c7dd4f67315ee415f26a30a505f8c821 -size 910360 diff --git a/nghttp2-1.1.1.tar.xz b/nghttp2-1.1.1.tar.xz new file mode 100644 index 0000000..87fa156 --- /dev/null +++ b/nghttp2-1.1.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d36ba13066f4e0594c741a6448547f0b492e31043e0149bd39d2503854d6411c +size 918464 diff --git a/nghttp2-remove-python-build.patch b/nghttp2-remove-python-build.patch new file mode 100644 index 0000000..dbfe5d6 --- /dev/null +++ b/nghttp2-remove-python-build.patch @@ -0,0 +1,21 @@ +Index: nghttp2-1.1.1/python/Makefile.am +=================================================================== +--- nghttp2-1.1.1.orig/python/Makefile.am ++++ nghttp2-1.1.1/python/Makefile.am +@@ -29,16 +29,6 @@ EXTRA_DIST = cnghttp2.pxd nghttp2.pyx + + if ENABLE_PYTHON_BINDINGS + +-all-local: nghttp2.c +- $(PYTHON) setup.py build +- +-install-exec-local: +- $(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) +- +-uninstall-local: +- rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so +- rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg-info +- + clean-local: + $(PYTHON) setup.py clean --all + -rm -f $(builddir)/nghttp2.c diff --git a/nghttp2.changes b/nghttp2.changes index 02b0e84..85f0a73 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Jul 16 06:58:40 UTC 2015 - mpluskal@suse.com + +- Update to 1.1.1 + * nghttpx: Fix various stability issues and memory leak bug +- Changes for 1.1.0 + * Fix DATA is not consumed if nghttp2_http_on_data_chunk failed + * nghttp2_submit_response and nghttp2_submit_headers may return + * NGHTTP2_ERR_DATA_EXIST + * msvc build fixes and enchantments (Patch from Gabi Davar) + * Compile with IRIX gcc-4.7 (Patch from Klaus Ziegler) + * nghttp: Add --max-concurrent-streams option + * nghttp: Add comment on HAR on pushed objects (Patch from + acesso) + * nghttpx: Add --include option to read additional configuration + from given file + * nghttpx: Add backend routing based on request host and path by + extending -b option + * nghttpx: Allow log variable to be enclosed by curly braces for + disambiguation + * nghttpx: Add log variables related to SSL/TLS connection + * h2load: Add --ciphers option +- Add patches + * missing_nghttp2_timegm.patch to fix building of asio library + * nghttp2-remove-python-build.patch to fix python bindings + installation when autotools are used + ------------------------------------------------------------------- Tue Jun 30 11:54:06 UTC 2015 - mpluskal@suse.com diff --git a/nghttp2.spec b/nghttp2.spec index 412ffee..63b8989 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -19,7 +19,7 @@ %define lib_name lib%{name}-14 %define lib_name_asio lib%{name}_asio1 Name: nghttp2 -Version: 1.0.5 +Version: 1.1.1 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C License: MIT @@ -27,11 +27,18 @@ Group: Development/Libraries/C and C++ Url: https://nghttp2.org/ #Git-Clone: git://github.com/tatsuhiro-t/nghttp2 Source: https://github.com/tatsuhiro-t/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.xz +# fix for building of asio library from upstream (c470ac7b0021d3cae80ef1c5b6460a108f2e5bdb) +Patch0: missing_nghttp2_timegm.patch +Patch1: nghttp2-remove-python-build.patch +BuildRequires: autoconf +BuildRequires: automake BuildRequires: boost-devel BuildRequires: gcc-c++ +BuildRequires: libtool BuildRequires: pkg-config BuildRequires: python-Cython BuildRequires: python-Sphinx +BuildRequires: python-setuptools BuildRequires: pkgconfig(cunit) BuildRequires: pkgconfig(jansson) BuildRequires: pkgconfig(libevent) @@ -100,19 +107,30 @@ server and proxy. %prep %setup -q +%patch0 -p1 +%patch1 -p1 %build +autoreconf -fiv %configure \ + --disable-silent-rules \ --enable-asio-lib \ --enable-python-bindings \ --disable-static -make %{?_smp_mflags} all html V=1 +make %{?_smp_mflags} all html +pushd python +make nghttp2.c +python setup.py build +popd %check make %{?_smp_mflags} check %install make DESTDIR=%{buildroot} install %{?_smp_mflags} +pushd python +python setup.py install --prefix=%{_prefix} --root=%{buildroot} +popd find %{buildroot} -type f -name "*.la" -delete -print # none of applications using these man pages is built rm -rf %{buildroot}%{_mandir}/man1/* @@ -144,7 +162,8 @@ rm -rf doc/manual/html/.buildinfo %files -n python-%{name} %defattr(-,root,root) -%{python_sitearch}/* +%{python_sitearch}/nghttp2.so +%{python_sitearch}/python_nghttp2-%{version}-py%{py_ver}.egg-info %files -n lib%{name}-devel %defattr(-,root,root)