From 36d6ec9c9876aa31c085be2764666ab864d548c5 Mon Sep 17 00:00:00 2001 From: webbuilder_pel7x64builder0 Date: Thu, 7 May 2020 18:06:22 +0200 Subject: [PATCH] nghttp2 package update Signed-off-by: webbuilder_pel7x64builder0 --- SPECS/nghttp2.spec | 114 ++++++++++----------------------------------- 1 file changed, 25 insertions(+), 89 deletions(-) diff --git a/SPECS/nghttp2.spec b/SPECS/nghttp2.spec index 34ddfd0..7f0ae64 100644 --- a/SPECS/nghttp2.spec +++ b/SPECS/nghttp2.spec @@ -1,28 +1,24 @@ -Summary: Experimental HTTP/2 client, server and proxy Name: nghttp2 -Version: 1.31.1 -Release: 2%{?dist} +Version: 1.34.0 +Release: 1%{?dist} +Summary: Experimental HTTP/2 client, server and proxy License: MIT Group: Applications/Internet URL: https://nghttp2.org/ Source0: https://github.com/tatsuhiro-t/nghttp2/releases/download/v%{version}/nghttp2-%{version}.tar.xz - -# backport security fixes from nghttp2-1.39.2 (CVE-2019-9511 and CVE-2019-9513) -Patch1: nghttp2-1.31.1-CVE-2019-9511-and-CVE-2019-9513.patch BuildRequires: automake BuildRequires: libtool - -BuildRequires: CUnit-devel +#BuildRequires: CUnit-devel BuildRequires: c-ares-devel BuildRequires: gcc-c++ BuildRequires: libev-devel BuildRequires: openssl-devel BuildRequires: systemd-devel BuildRequires: zlib-devel - Requires: libnghttp2%{?_isa} = %{version}-%{release} %{?systemd_requires} + %description This package contains the HTTP/2 client, server and proxy programs. @@ -30,7 +26,6 @@ This package contains the HTTP/2 client, server and proxy programs. %package -n libnghttp2 Summary: A library implementing the HTTP/2 protocol Group: Development/Libraries - %description -n libnghttp2 libnghttp2 is a library implementing the Hypertext Transfer Protocol version 2 (HTTP/2) protocol in C. @@ -41,7 +36,6 @@ Summary: Files needed for building applications with libnghttp2 Group: Development/Libraries Requires: libnghttp2%{?_isa} = %{version}-%{release} Requires: pkgconfig - %description -n libnghttp2-devel The libnghttp2-devel package includes libraries and header files needed for building applications with libnghttp2. @@ -49,15 +43,17 @@ for building applications with libnghttp2. %prep %setup -q -%patch1 -p1 -autoreconf -fiv +#autoreconf -fiv +# make fetch-ocsp-response use Python 3 +sed -e '1 s|^#!/.*python|&3|' -i script/fetch-ocsp-response %build -%configure \ - --disable-python-bindings \ - --disable-static \ - --without-libxml2 \ +%configure PYTHON=%{__python3} \ + --disable-hpack-tools \ + --disable-python-bindings \ + --disable-static \ + --without-libxml2 \ --without-spdylay # avoid using rpath @@ -70,30 +66,28 @@ make %{?_smp_mflags} V=1 %install %make_install -install -D -m0444 -p contrib/nghttpx.service \ - "$RPM_BUILD_ROOT%{_unitdir}/nghttpx.service" - +install -D -m0444 -p contrib/nghttpx.service "$RPM_BUILD_ROOT%{_unitdir}/nghttpx.service" # not needed on Fedora/RHEL rm -f "$RPM_BUILD_ROOT%{_libdir}/libnghttp2.la" - # will be installed via %%doc rm -f "$RPM_BUILD_ROOT%{_datadir}/doc/nghttp2/README.rst" -%post -n libnghttp2 -p /sbin/ldconfig +%post -n libnghttp2 -p /sbin/ldconfig %postun -n libnghttp2 -p /sbin/ldconfig + %post %systemd_post nghttpx.service - %postun %systemd_postun nghttpx.service -%check -# test the just built library instead of the system one, without using rpath -export "LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH" -make %{?_smp_mflags} check + +#%check +## test the just built library instead of the system one, without using rpath +#export "LD_LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir}:$LD_LIBRARY_PATH" +#make %{?_smp_mflags} check %files @@ -101,8 +95,8 @@ make %{?_smp_mflags} check %{_bindir}/nghttp %{_bindir}/nghttpd %{_bindir}/nghttpx -%{_bindir}/deflatehd -%{_bindir}/inflatehd +#%{_bindir}/deflatehd +#%{_bindir}/inflatehd %{_datadir}/nghttp2 %{_mandir}/man1/h2load.1* %{_mandir}/man1/nghttp.1* @@ -110,11 +104,13 @@ make %{?_smp_mflags} check %{_mandir}/man1/nghttpx.1* %{_unitdir}/nghttpx.service + %files -n libnghttp2 %{_libdir}/libnghttp2.so.* %{!?_licensedir:%global license %%doc} %license COPYING + %files -n libnghttp2-devel %{_includedir}/nghttp2 %{_libdir}/pkgconfig/libnghttp2.pc @@ -123,63 +119,3 @@ make %{?_smp_mflags} check %changelog -* Mon Aug 19 2019 Kamil Dudka 1.31.1-2 -- backport security fixes from nghttp2-1.39.2 (CVE-2019-9511 and CVE-2019-9513) - -* Fri Apr 13 2018 Kamil Dudka 1.31.1-1 -- update to the latest upstream release (fixes CVE-2018-1000168) - -* Mon Apr 10 2017 Kamil Dudka 1.21.1-1 -- update to the latest upstream release - -* Mon Apr 03 2017 Kamil Dudka 1.21.0-1 -- update to the latest upstream release (#1438364) -- package systemd unit file (#1426929) - -* Thu Feb 11 2016 Kamil Dudka 1.7.1-1 -- update to the latest upstream release (fixes CVE-2016-1544) - -* Fri Feb 05 2016 Kamil Dudka 1.7.0-3 -- make the package compile with gcc-6 - -* Thu Feb 04 2016 Fedora Release Engineering - 1.7.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Mon Jan 25 2016 Kamil Dudka 1.7.0-1 -- update to the latest upstream release - -* Fri Dec 25 2015 Kamil Dudka 1.6.0-1 -- update to the latest upstream release (fixes CVE-2015-8659) - -* Thu Nov 26 2015 Kamil Dudka 1.5.0-1 -- update to the latest upstream release - -* Mon Oct 26 2015 Kamil Dudka 1.4.0-1 -- update to the latest upstream release - -* Thu Sep 24 2015 Kamil Dudka 1.3.4-1 -- update to the latest upstream release - -* Wed Sep 23 2015 Kamil Dudka 1.3.3-1 -- update to the latest upstream release - -* Wed Sep 16 2015 Kamil Dudka 1.3.2-1 -- update to the latest upstream release - -* Mon Sep 14 2015 Kamil Dudka 1.3.1-1 -- update to the latest upstream release - -* Mon Aug 31 2015 Kamil Dudka 1.3.0-1 -- update to the latest upstream release - -* Mon Aug 17 2015 Kamil Dudka 1.2.1-1 -- update to the latest upstream release - -* Sun Aug 09 2015 Kamil Dudka 1.2.0-1 -- update to the latest upstream release - -* Wed Jul 15 2015 Kamil Dudka 1.1.1-1 -- update to the latest upstream release - -* Tue Jun 30 2015 Kamil Dudka 1.0.5-1 -- packaged for Fedora (#1237247)