From dbe016dfdcbf3a2a2312d3bd4f5a4db2153275d0c703b5453342fafa6062ac3e Mon Sep 17 00:00:00 2001 From: Martin Pluskal Date: Fri, 26 Feb 2016 13:30:37 +0000 Subject: [PATCH] - Update to 1.8.0 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/nghttp2?expand=0&rev=51 --- nghttp2-1.7.1.tar.xz | 3 -- nghttp2-1.8.0.tar.xz | 3 ++ nghttp2-c++14.patch | 20 ----------- nghttp2-remove-python-build.patch | 6 ++-- nghttp2.changes | 60 +++++++++++++++++++++++++++++++ nghttp2.spec | 10 +++--- 6 files changed, 70 insertions(+), 32 deletions(-) delete mode 100644 nghttp2-1.7.1.tar.xz create mode 100644 nghttp2-1.8.0.tar.xz delete mode 100644 nghttp2-c++14.patch diff --git a/nghttp2-1.7.1.tar.xz b/nghttp2-1.7.1.tar.xz deleted file mode 100644 index d246964..0000000 --- a/nghttp2-1.7.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f1286fdd73d45dce8aac0f45a5923c9b28037c81863a149cc236e70dd741a616 -size 1405620 diff --git a/nghttp2-1.8.0.tar.xz b/nghttp2-1.8.0.tar.xz new file mode 100644 index 0000000..fa2fc55 --- /dev/null +++ b/nghttp2-1.8.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61a545299171893a918d5b3c3cedc6540e73bdaa25dd1fb588eb291819743aec +size 1424864 diff --git a/nghttp2-c++14.patch b/nghttp2-c++14.patch deleted file mode 100644 index 90303b3..0000000 --- a/nghttp2-c++14.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- src/template.h.orig 2016-01-28 15:30:56.549094834 +0100 -+++ src/template.h 2016-01-28 15:42:13.188970636 +0100 -@@ -37,6 +37,9 @@ - - namespace nghttp2 { - -+#if __cplusplus > 201103L -+using std::make_unique; -+#else - template - typename std::enable_if::value, std::unique_ptr>::type - make_unique(U &&... u) { -@@ -48,6 +51,7 @@ - make_unique(size_t size) { - return std::unique_ptr(new typename std::remove_extent::type[size]()); - } -+#endif - - // std::forward is constexpr since C++14 - template diff --git a/nghttp2-remove-python-build.patch b/nghttp2-remove-python-build.patch index 52ed935..95d01e7 100644 --- a/nghttp2-remove-python-build.patch +++ b/nghttp2-remove-python-build.patch @@ -1,7 +1,7 @@ -Index: nghttp2-1.7.0/python/Makefile.am +Index: nghttp2-1.8.0/python/Makefile.am =================================================================== ---- nghttp2-1.7.0.orig/python/Makefile.am -+++ nghttp2-1.7.0/python/Makefile.am +--- nghttp2-1.8.0.orig/python/Makefile.am ++++ nghttp2-1.8.0/python/Makefile.am @@ -29,16 +29,6 @@ EXTRA_DIST = cnghttp2.pxd nghttp2.pyx if ENABLE_PYTHON_BINDINGS diff --git a/nghttp2.changes b/nghttp2.changes index 138954f..fc2d546 100644 --- a/nghttp2.changes +++ b/nghttp2.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Fri Feb 26 13:00:38 UTC 2016 - mpluskal@suse.com + +- Update to 1.8.0 + * Add Architecture documents (work in progress) + * List all contributors in AUTHORS + * doc: fix out-of-tree doc builds (Patch from Peter Wu) + * Wrap AM_PATH_XML2 by m4_ifdef to handle the case when + _PATH_XML2 is not found + * Fix configure script for non-gcc, clang build + * Document compiling apps and include h2load in configure (Patch + from David Beitey) + * Don't check for dlopen/libdl on *BSD (Patch from Bernard Spil) + * Don't taint CXXFLAGS from AX_CXX_COMPILE_STDCXX_11 + * Fixing Windows Makefile version detection (Patch from Reza + Tavakoli) + * lib: Tokenize extra HTTP header fields + * lib: Fix typo in HAVE_CONFIG_H name (Patch from Peter Wu) + * lib: Add HTTP/2 extension framework to send and receive + non-critical frames + * tests: remove unused macros (Patch from Peter Wu) + * src: Update default cipher list + * src: Fix compile error with gcc-6 which enables C++14 by default + * asio: client: Fix connect timeout does not work, return from cb + if session stopped, removing client::session::connect_timeout() + functon + * nghttpd: Start SETTINGS timer after it is written to output + buffer + * nghttpd: Add trailer header field to status responses + * nghttpd: Add -w and -W options to change window size + * nghttpx: Worker wide blocker which is used when socket(2) is + failed + * nghttpx: ConnectBlocker per backend address + * nghttpx: Interleave text/html pushed resources with associated + resource + * nghttpx: Add headers given in add-response-headers for mruby + response + * nghttpx: Deprecate --backend-ipv4 and --backend-ipv6 in favor + of --backend-address-family + * nghttpx: Add options to specify address family of memcached + connections + * nghttpx: Add encryption support for TLS ticket key retrieval + * nghttpx: Add TLS support for session cache memcached connection + * nghttpx: Refactor blacklisted cipher suite check (Patch from + Jay Satiro) + * nghttpx: Add TLS support for HTTP/1 backend + * nghttpx: Add request-header-field-buffer and + max-request-header-fields options, deprecating + header-field-buffer and max-header-fields options. + * nghttpx: Add --no-http2-cipher-black-list to allow black listed + cipher suite + * nghttpx: Limit header fields from backend + * nghttpx: Fix bug that IPv6 address in Forwarded "for" is not + quoted-string + * nghttpx: Support multiple frontend addresses + * integration-tests: support out-of-tree tests (Patch from Peter + Wu) + * examples: fix compile warnings (Patch from Peter Wu) +- Drop upstreamed nghttp2-c++14.patch + ------------------------------------------------------------------- Fri Feb 12 17:21:54 UTC 2016 - mpluskal@suse.com diff --git a/nghttp2.spec b/nghttp2.spec index 64b0e83..f4c38c2 100644 --- a/nghttp2.spec +++ b/nghttp2.spec @@ -21,7 +21,7 @@ %define soname_asio libnghttp2_asio %define sover_asio 1 Name: nghttp2 -Version: 1.7.1 +Version: 1.8.0 Release: 0 Summary: Implementation of Hypertext Transfer Protocol version 2 in C License: MIT @@ -31,7 +31,6 @@ Source: https://github.com/tatsuhiro-t/%{name}/releases/download/v%{vers Source1: baselibs.conf # PATCH-FIX-OPENSUSE nghttp2-remove-python-build.patch Patch0: %{name}-remove-python-build.patch -Patch1: %{name}-c++14.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: boost-devel @@ -115,7 +114,6 @@ HTTP/2 client, server and proxy. %prep %setup -q %patch0 -p1 -%patch1 %build autoreconf -fiv @@ -126,9 +124,9 @@ autoreconf -fiv --enable-app \ --enable-python-bindings -make all html %{?_smp_mflags} +make %{?_smp_mflags} all html pushd python -make nghttp2.c %{?_smp_mflags} +make %{?_smp_mflags} nghttp2.c python2 setup.py build popd @@ -151,7 +149,7 @@ rm -rf %{buildroot}%{_mandir}/man1/* \ doc/manual/html/.buildinfo %check -make check %{?_smp_mflags} +make %{?_smp_mflags} check %post -n %{soname}-%{sover} -p /sbin/ldconfig