update to the latest upstream release (1.8.0)
This commit is contained in:
parent
c60e4cee39
commit
ad7d8cab0e
@ -1,36 +0,0 @@
|
|||||||
From 74bbd628eb904b8aa4d6258692d581edfe3865e5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
|
|
||||||
Date: Sat, 30 Jan 2016 18:41:27 +0900
|
|
||||||
Subject: [PATCH] Fix compile error with gcc-6 which enables C++14 by default
|
|
||||||
|
|
||||||
Upstream-commit: 4e44fccdcf1d0fea6a8cd88916040e06fc75d9db
|
|
||||||
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
||||||
---
|
|
||||||
src/template.h | 4 ++++
|
|
||||||
1 file changed, 4 insertions(+)
|
|
||||||
|
|
||||||
diff --git a/src/template.h b/src/template.h
|
|
||||||
index 0346034..b5862d5 100644
|
|
||||||
--- a/src/template.h
|
|
||||||
+++ b/src/template.h
|
|
||||||
@@ -38,6 +38,9 @@
|
|
||||||
|
|
||||||
namespace nghttp2 {
|
|
||||||
|
|
||||||
+#if __cplusplus > 201103L
|
|
||||||
+using std::make_unique;
|
|
||||||
+#else // __cplusplus <= 201103L
|
|
||||||
template <typename T, typename... U>
|
|
||||||
typename std::enable_if<!std::is_array<T>::value, std::unique_ptr<T>>::type
|
|
||||||
make_unique(U &&... u) {
|
|
||||||
@@ -49,6 +52,7 @@ typename std::enable_if<std::is_array<T>::value, std::unique_ptr<T>>::type
|
|
||||||
make_unique(size_t size) {
|
|
||||||
return std::unique_ptr<T>(new typename std::remove_extent<T>::type[size]());
|
|
||||||
}
|
|
||||||
+#endif // __cplusplus <= 201103L
|
|
||||||
|
|
||||||
// std::forward is constexpr since C++14
|
|
||||||
template <typename... T>
|
|
||||||
--
|
|
||||||
2.5.0
|
|
||||||
|
|
@ -1,15 +1,12 @@
|
|||||||
Summary: Experimental HTTP/2 client, server and proxy
|
Summary: Experimental HTTP/2 client, server and proxy
|
||||||
Name: nghttp2
|
Name: nghttp2
|
||||||
Version: 1.7.1
|
Version: 1.8.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
License: MIT
|
License: MIT
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
URL: https://nghttp2.org/
|
URL: https://nghttp2.org/
|
||||||
Source0: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz
|
Source0: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz
|
||||||
|
|
||||||
# make the package compile with gcc-6
|
|
||||||
Patch1: nghttp2-1.7.0-gcc6.patch
|
|
||||||
|
|
||||||
BuildRequires: CUnit-devel
|
BuildRequires: CUnit-devel
|
||||||
BuildRequires: libev-devel
|
BuildRequires: libev-devel
|
||||||
BuildRequires: openssl-devel
|
BuildRequires: openssl-devel
|
||||||
@ -43,7 +40,6 @@ for building applications with libnghttp2.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -105,6 +101,9 @@ make %{?_smp_mflags} check
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Feb 25 2016 Kamil Dudka <kdudka@redhat.com> 1.8.0-1
|
||||||
|
- update to the latest upstream release
|
||||||
|
|
||||||
* Thu Feb 11 2016 Kamil Dudka <kdudka@redhat.com> 1.7.1-1
|
* Thu Feb 11 2016 Kamil Dudka <kdudka@redhat.com> 1.7.1-1
|
||||||
- update to the latest upstream release (fixes CVE-2016-1544)
|
- update to the latest upstream release (fixes CVE-2016-1544)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user