From 8c85e4d812dcc2d3e839fd7f06c3d2652d6519b7a3ea52eac433e293d122c8e8 Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Mon, 10 Aug 2015 14:14:34 +0000 Subject: [PATCH] - Update to 1.2.0 - Changes for 1.1.2 * Fix linker error with libnghttp2_asio * Allow custom installation location for Python bindings - Drop no longer needed missing_nghttp2_timegm.patch OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=30 --- missing_nghttp2_timegm.patch | 21 -------------------- nghttp2-1.1.1.tar.xz | 3 --- nghttp2-1.2.0.tar.xz | 3 +++ nghttp2-remove-python-build.patch | 8 ++++---- nghttp2.changes | 33 +++++++++++++++++++++++++++++++ nghttp2.spec | 10 ++++------ 6 files changed, 44 insertions(+), 34 deletions(-) delete mode 100644 missing_nghttp2_timegm.patch delete mode 100644 nghttp2-1.1.1.tar.xz create mode 100644 nghttp2-1.2.0.tar.xz diff --git a/missing_nghttp2_timegm.patch b/missing_nghttp2_timegm.patch deleted file mode 100644 index f0c25b7..0000000 --- a/missing_nghttp2_timegm.patch +++ /dev/null @@ -1,21 +0,0 @@ -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.1.1.tar.xz b/nghttp2-1.1.1.tar.xz deleted file mode 100644 index 87fa156..0000000 --- a/nghttp2-1.1.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d36ba13066f4e0594c741a6448547f0b492e31043e0149bd39d2503854d6411c -size 918464 diff --git a/nghttp2-1.2.0.tar.xz b/nghttp2-1.2.0.tar.xz new file mode 100644 index 0000000..e9a11a3 --- /dev/null +++ b/nghttp2-1.2.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e4a419c835b6cfa08ff9743f823638d32d8516aa3abfc86598272d173bc558f +size 937040 diff --git a/nghttp2-remove-python-build.patch b/nghttp2-remove-python-build.patch index dbfe5d6..d9c1c32 100644 --- a/nghttp2-remove-python-build.patch +++ b/nghttp2-remove-python-build.patch @@ -1,7 +1,7 @@ -Index: nghttp2-1.1.1/python/Makefile.am +Index: nghttp2-1.2.0/python/Makefile.am =================================================================== ---- nghttp2-1.1.1.orig/python/Makefile.am -+++ nghttp2-1.1.1/python/Makefile.am +--- nghttp2-1.2.0.orig/python/Makefile.am ++++ nghttp2-1.2.0/python/Makefile.am @@ -29,16 +29,6 @@ EXTRA_DIST = cnghttp2.pxd nghttp2.pyx if ENABLE_PYTHON_BINDINGS @@ -14,7 +14,7 @@ Index: nghttp2-1.1.1/python/Makefile.am - -uninstall-local: - rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so -- rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg-info +- rm -f $(DESTDIR)$(libdir)/python*/site-packages/python_nghttp2-*.egg - clean-local: $(PYTHON) setup.py clean --all diff --git a/nghttp2.changes b/nghttp2.changes index 85f0a73..2c547b7 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Mon Aug 10 14:10:20 UTC 2015 - mpluskal@suse.com + +- Update to 1.2.0 + * Fix crash if response or data is submitted to closing stream + * Header table size UINT32_MAX must be accepted + * Use PROTOCOL_ERROR against DATA sent to idle stream + * Allow multiple in-flight SETTINGS + * Strictly check occurrence of dynamic table size update + * Fix configure warning that 'missing' is missing or too old + * Fix rm: cannot remove ‘*.rst’: No such file or directory when + "make clean" (Patch from Alexis La Goutte) + * doc: Reword some of the server and client tutorial (Patch + from Tom Harwood) + * src: Remove monotonic_clock replacement macro for gcc-4.6 + * nghttpx: Add TLS ticket key sharing among nghttpx instances + using memcached + * nghttpx: Add shared session cache using memcached + * nghttpx: Set SSL/TLS session timeout to 12 hours + * nghttpx: Enable session resumption on HTTP/2 backend + * nghttpx: Don't rewrite host header field by default + * nghttpx: Generate new ticket key every 1hr and its life time + is now 12hrs + * nghttpx: Don't reuse backend connection if it is not clean + * nghttpx: Add AES-256-CBC encryption for TLS session ticket + * nghttpd: Fix the bug that 304 response has non-empty body + * h2load: Add -r and -C options to h2load (Patch from + Nora Shoemaker) +- Changes for 1.1.2 + * Fix linker error with libnghttp2_asio + * Allow custom installation location for Python bindings +- Drop no longer needed missing_nghttp2_timegm.patch + ------------------------------------------------------------------- Thu Jul 16 06:58:40 UTC 2015 - mpluskal@suse.com diff --git a/nghttp2.spec b/nghttp2.spec index 63b8989..fa95f21 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.1.1 +Version: 1.2.0 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C License: MIT @@ -27,8 +27,6 @@ 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 @@ -107,7 +105,6 @@ server and proxy. %prep %setup -q -%patch0 -p1 %patch1 -p1 %build @@ -115,11 +112,11 @@ autoreconf -fiv %configure \ --disable-silent-rules \ --enable-asio-lib \ - --enable-python-bindings \ + --enable-python-bindings \ --disable-static make %{?_smp_mflags} all html pushd python -make nghttp2.c +make %{?_smp_mflags} nghttp2.c python setup.py build popd @@ -131,6 +128,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} pushd python python setup.py install --prefix=%{_prefix} --root=%{buildroot} popd +# do not ship these find %{buildroot} -type f -name "*.la" -delete -print # none of applications using these man pages is built rm -rf %{buildroot}%{_mandir}/man1/*