[packages/nghttp2] up to 1.55.1 (fixes CVE-2023-35945)

Thu Aug 3 21:23:02 CEST 2023

commit 034d7d03b51696bee275a4a7a29a63ead286bf04
Author: Jan Palus <atler at pld-linux.org>
Date:   Thu Aug 3 21:08:11 2023 +0200

    up to 1.55.1 (fixes CVE-2023-35945)
    
    - python bindings dropped in 1.52.0
    - nghttp2 asio library moved to independent project

 nghttp2-link.patch   |  10 ------
 nghttp2-python.patch |  11 ------
 nghttp2.spec         | 100 ++-------------------------------------------------
 3 files changed, 3 insertions(+), 118 deletions(-)
---

diff --git a/nghttp2.spec b/nghttp2.spec
index 0862c12..d9804e0 100644
--- a/nghttp2.spec
+++ b/nghttp2.spec
@@ -1,7 +1,6 @@
 # TODO: mruby, neverbleed?
 #
 # Conditional build:
-%bcond_without	asio		# libnghttp2_asio C++ library
 %bcond_with	http3		# experimental HTTP/3 support
 %bcond_with	libbpf		# BPF support (requires CC=clang)
 %bcond_without	static_libs	# static libraries
@@ -11,20 +10,17 @@
 Summary:	HTTP/2.0 C library
 Summary(pl.UTF-8):	Biblioteka C HTTP/2.0
 Name:		nghttp2
-Version:	1.50.0
+Version:	1.55.1
 Release:	1
 License:	MIT
 Group:		Libraries
 #Source0Download: https://github.com/nghttp2/nghttp2/releases
 Source0:	https://github.com/nghttp2/nghttp2/releases/download/v%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	4168ccacaa009665b6a7fe455842f95b
-Patch0:		%{name}-link.patch
-Patch1:		%{name}-python.patch
+# Source0-md5:	5af6a7ee55dc96661aa8649636b68763
 URL:		https://nghttp2.org/
 %{?with_tests:BuildRequires:	CUnit >= 2.1}
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake
-%{?with_asio:BuildRequires:	boost-devel >= 1.54.0}
 BuildRequires:	c-ares-devel >= 1.7.5
 BuildRequires:	jansson-devel >= 2.5
 %{?with_libbpf:BuildRequires:	libbpf-devel >= 0.7.0}
@@ -41,10 +37,6 @@ BuildRequires:	openssl-devel >= 1.0.1
 %{?with_http3:BuildRequires:	openssl-devel(quic)}
 BuildRequires:	pkgconfig >= 1:0.20
 BuildRequires:	python3 >= 1:3.8
-BuildRequires:	python3-Cython >= 0.19
-BuildRequires:	python3-devel >= 1:3.8
-BuildRequires:	python3-setuptools
-BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.734
 BuildRequires:	sed >= 4.0
 %{?with_systemd:BuildRequires:	systemd-devel >= 1:209}
@@ -73,6 +65,7 @@ Ta biblioteka jest eksperymentalną implementacją protokołu HTTP
 Summary:	A library implementing the HTTP/2 protocol
 Summary(pl.UTF-8):	Biblioteka implementująca protokół HTTP/2
 Group:		Libraries
+Obsoletes:	python3-nghttp2 < 1.55.1
 Conflicts:	nghttp2 < 1.11.1-2
 
 %description libs
@@ -107,63 +100,8 @@ Static libnghttp2 library.
 %description static -l pl.UTF-8
 Statyczna biblioteka libnghttp2.
 
-%package -n python3-nghttp2
-Summary:	Python binding to nghttp2 library
-Summary(pl.UTF-8):	Wiązanie Pythona do biblioteki nghttp2
-Group:		Libraries/Python
-Requires:	%{name} = %{version}-%{release}
-Requires:	python3-libs >= 1:3.8
-Obsoletes:	python-nghttp2 < 1.43.0
-
-%description -n python3-nghttp2
-Python binding to nghttp2 library.
-
-%description -n python3-nghttp2 -l pl.UTF-8
-Wiązanie Pythona do biblioteki nghttp2.
-
-%package asio
-Summary:	HTTP/2.0 C++ library
-Summary(pl.UTF-8):	Biblioteka C++ HTTP/2.0
-Group:		Libraries
-Requires:	%{name}-libs = %{version}-%{release}
-Requires:	openssl >= 1.0.1
-
-%description asio
-HTTP/2.0 C++ library.
-
-%description asio -l pl.UTF-8
-Biblioteka C++ HTTP/2.0.
-
-%package asio-devel
-Summary:	Header file for nghttp2_asio library
-Summary(pl.UTF-8):	Plik nagłówkowy biblioteki nghttp2_asio
-Group:		Development/Libraries
-Requires:	%{name}-asio = %{version}-%{release}
-Requires:	%{name}-devel = %{version}-%{release}
-Requires:	libstdc++-devel >= 6:5
-
-%description asio-devel
-Header file for nghttp2_asio library.
-
-%description asio-devel -l pl.UTF-8
-Plik nagłówkowy biblioteki nghttp2_asio.
-
-%package asio-static
-Summary:	Static libnghttp2_asio library
-Summary(pl.UTF-8):	Statyczna biblioteka libnghttp2_asio
-Group:		Development/Libraries
-Requires:	%{name}-asio-devel = %{version}-%{release}
-
-%description asio-static
-Static libnghttp2_asio library.
-
-%description asio-static -l pl.UTF-8
-Statyczna biblioteka libnghttp2_asio.
-
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
 
 %{__sed} -i -e '1s,/usr/bin/env python,%{__python3},' script/fetch-ocsp-response
 
@@ -175,13 +113,10 @@ Statyczna biblioteka libnghttp2_asio.
 %{__automake}
 %configure \
 	--enable-app \
-	%{?with_asio:--enable-asio-lib} \
 	--enable-hpack-tools \
 	%{?with_http3:--enable-http3} \
-	--enable-python-bindings \
 	--disable-silent-rules \
 	%{!?with_static_libs:--disable-static} \
-	--with-cython=/usr/bin/cython3 \
 	--without-jemalloc \
 	%{?with_libbpf:--with-libbpf}
 
@@ -208,9 +143,6 @@ rm -rf $RPM_BUILD_ROOT
 %post	libs -p /sbin/ldconfig
 %postun	libs -p /sbin/ldconfig
 
-%post	asio -p /sbin/ldconfig
-%postun	asio -p /sbin/ldconfig
-
 %files
 %defattr(644,root,root,755)
 %doc AUTHORS COPYING ChangeLog README.rst
@@ -244,29 +176,3 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{_libdir}/libnghttp2.a
 %endif
-
-%files -n python3-nghttp2
-%defattr(644,root,root,755)
-%attr(755,root,root) %{py3_sitedir}/nghttp2.cpython-*.so
-%{py3_sitedir}/python_nghttp2-%{version}-py*.egg-info
-
-%if %{with asio}
-%files asio
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnghttp2_asio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnghttp2_asio.so.1
-
-%files asio-devel
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libnghttp2_asio.so
-%{_includedir}/nghttp2/asio_http2.h
-%{_includedir}/nghttp2/asio_http2_client.h
-%{_includedir}/nghttp2/asio_http2_server.h
-%{_pkgconfigdir}/libnghttp2_asio.pc
-
-%if %{with static_libs}
-%files asio-static
-%defattr(644,root,root,755)
-%{_libdir}/libnghttp2_asio.a
-%endif
-%endif
diff --git a/nghttp2-link.patch b/nghttp2-link.patch
deleted file mode 100644
index 1f81de2..0000000
--- a/nghttp2-link.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- nghttp2-1.3.0/src/Makefile.am.orig	2015-09-06 17:57:30.052519494 +0200
-+++ nghttp2-1.3.0/src/Makefile.am	2015-09-06 18:20:57.609127150 +0200
-@@ -216,6 +216,6 @@
- 	${BOOST_LDFLAGS} \
- 	${BOOST_ASIO_LIB} \
- 	${BOOST_THREAD_LIB} \
--	${BOOST_SYSTEM_LIB}
-+	${BOOST_SYSTEM_LIB} -lpthread
- 
- endif # ENABLE_ASIO_LIB
diff --git a/nghttp2-python.patch b/nghttp2-python.patch
deleted file mode 100644
index 7a2ebdd..0000000
--- a/nghttp2-python.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nghttp2-1.3.0/python/Makefile.am.orig	2015-08-30 12:02:56.000000000 +0200
-+++ nghttp2-1.3.0/python/Makefile.am	2015-09-06 20:09:36.208853530 +0200
-@@ -33,7 +33,7 @@
- 	$(PYTHON) setup.py build
- 
- install-exec-local:
--	$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix)
-+	$(PYTHON) setup.py install --root=$(DESTDIR) --prefix=$(prefix)
- 
- uninstall-local:
- 	rm -f $(DESTDIR)$(libdir)/python*/site-packages/nghttp2.so
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nghttp2.git/commitdiff/034d7d03b51696bee275a4a7a29a63ead286bf04

