From 6624b53c7e6b415a1bfecbde772cd6d00bcc7b86 Mon Sep 17 00:00:00 2001 From: Robert-André Mauchin Date: Jun 23 2022 22:04:54 +0000 Subject: Update to 22.4.0 Close: rhbz#2046562 rhbz#2073115 rhbz#2060972 rhbz#2059508 Security fix CVE-2022-24801 Security fix for CVE-2022-21716 Security fix for CVE-2022-21712 --- diff --git a/.gitignore b/.gitignore index 0bb707c..7fc8fa3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ /Twisted-20.3.0.tar.bz2 /Twisted-21.2.0.tar.gz /Twisted-21.7.0.tar.gz +/twisted-22.4.0.tar.gz diff --git a/python-twisted.spec b/python-twisted.spec index e2a1576..0d8203c 100644 --- a/python-twisted.spec +++ b/python-twisted.spec @@ -1,19 +1,19 @@ -%global pypi_name twisted +%global srcname twisted %global common_description %{expand: Twisted is a networking engine written in Python, supporting numerous protocols. It contains a web server, numerous chat clients, chat servers, mail servers and more.} -Name: python-%{pypi_name} -Version: 21.7.0 +Name: python-%{srcname} +Version: 22.4.0 Release: %autorelease Summary: Twisted is a networking engine written in Python License: MIT URL: http://twistedmatrix.com/ VCS: https://github.com/twisted/twisted -Source0: %{pypi_source Twisted} +Source0: %vcs/archive/%{srcname}-%{version}/%{srcname}-%{version}.tar.gz # Import gobject from gi.repository for Python 3 # https://twistedmatrix.com/trac/ticket/9642 Patch1: 0001-Import-gobject-from-gi.repository-in-Python-3.patch @@ -22,50 +22,50 @@ BuildArch: noarch %description %{common_description} -%package -n python3-%{pypi_name} +%package -n python3-%{srcname} Summary: %{summary} BuildRequires: gcc BuildRequires: git-core BuildRequires: python3-devel >= 3.3 -BuildRequires: python3dist(pip) >= 19 -BuildRequires: python3dist(packaging) -BuildRequires: python3dist(setuptools) >= 40.8 -BuildRequires: python3dist(wheel) -BuildRequires: python3-Cython -BuildRequires: python3dist(appdirs) >= 1.4 -BuildRequires: python3dist(automat) >= 0.8 -BuildRequires: python3dist(attrs) >= 19.2.0 -BuildRequires: python3dist(bcrypt) >= 3.0.0 -BuildRequires: python3dist(constantly) >= 15.1 -BuildRequires: python3dist(cryptography) >= 2.6 -BuildRequires: (python3dist(h2) >= 3 with python3dist(h2) < 5) -BuildRequires: python3dist(pyhamcrest) >= 1.9 -BuildRequires: python3dist(hyperlink) >= 17.1.1 -BuildRequires: python3dist(idna) >= 2.4 -BuildRequires: python3dist(incremental) >= 21.3 -BuildRequires: (python3dist(priority) >= 1.1 with python3dist(priority) < 3) -BuildRequires: python3dist(pyasn1) -BuildRequires: python3dist(pyopenssl) >= 16 -BuildRequires: python3dist(pyserial) >= 3 -BuildRequires: python3dist(service-identity) >= 18.1 -BuildRequires: python3dist(setuptools) -BuildRequires: python3dist(sphinx) >= 1.3.1 -BuildRequires: python3dist(sphinx-rtd-theme) -BuildRequires: python3dist(typing-extensions) >= 3.6.5 -BuildRequires: python3dist(zope-interface) >= 4.4.2 - -%{?python_extras_subpkg:Recommends: python3-%{pypi_name}+tls} -%{!?python_extras_subpkg:Recommends: python3dist(service-identity) >= 18.1} - -%description -n python3-%{pypi_name} %{common_description} - -%{?python_extras_subpkg:%python_extras_subpkg -n python3-%{pypi_name} -i %{python3_sitelib}/*.dist-info tls} +# BuildRequires: python3dist(pip) >= 19 +# BuildRequires: python3dist(packaging) +# BuildRequires: python3dist(setuptools) >= 40.8 +# BuildRequires: python3dist(wheel) +# BuildRequires: python3-Cython +# BuildRequires: python3dist(appdirs) >= 1.4 +# BuildRequires: python3dist(automat) >= 0.8 +# BuildRequires: python3dist(attrs) >= 19.2.0 +# BuildRequires: python3dist(bcrypt) >= 3.0.0 +# BuildRequires: python3dist(constantly) >= 15.1 +# BuildRequires: python3dist(cryptography) >= 2.6 +# BuildRequires: (python3dist(h2) >= 3 with python3dist(h2) < 5) +# BuildRequires: python3dist(pyhamcrest) >= 1.9 +# BuildRequires: python3dist(hyperlink) >= 17.1.1 +# BuildRequires: python3dist(idna) >= 2.4 +# BuildRequires: python3dist(incremental) >= 21.3 +# BuildRequires: (python3dist(priority) >= 1.1 with python3dist(priority) < 3) +# BuildRequires: python3dist(pyasn1) +# BuildRequires: python3dist(pyopenssl) >= 16 +# BuildRequires: python3dist(pyserial) >= 3 +# BuildRequires: python3dist(service-identity) >= 18.1 +# BuildRequires: python3dist(setuptools) +# BuildRequires: python3dist(sphinx) >= 1.3.1 +# BuildRequires: python3dist(sphinx-rtd-theme) +# BuildRequires: python3dist(typing-extensions) >= 3.6.5 +# BuildRequires: python3dist(zope-interface) >= 4.4.2 + +Recommends: python3-%{srcname}+tls + +%description -n python3-%{srcname} %{common_description} + +%pyproject_extras_subpkg -n python3-%{srcname} tls %prep -%autosetup -p1 -n Twisted-%{version} -# Relax python priority dep -sed -i "s|priority >= 1.1.0, < 2.0|priority >= 1.1.0, < 3.0|" setup.cfg +%autosetup -p1 -n %{srcname}-%{srcname}-%{version} + +%generate_buildrequires +%pyproject_buildrequires %build %pyproject_wheel @@ -80,35 +80,24 @@ cp -a docs/$s/man/*.1 %{buildroot}%{_mandir}/man1/ done # Packages that install arch-independent twisted plugins install here. -# https://bugzilla.redhat.com/show_bug.cgi?id=1252140 +# https:# bugzilla.redhat.com/show_bug.cgi?id=1252140 mkdir -p %{buildroot}%{python3_sitelib}/twisted/plugins # Move and symlink python3 scripts -# no-manual-page-for-binary: man page is trial and twistd -mv %{buildroot}%{_bindir}/trial %{buildroot}%{_bindir}/trial-%{python3_version} -ln -s ./trial-%{python3_version} %{buildroot}%{_bindir}/trial-3 -ln -s ./trial-%{python3_version} %{buildroot}%{_bindir}/trial - -mv %{buildroot}%{_bindir}/twistd %{buildroot}%{_bindir}/twistd-%{python3_version} -ln -s ./twistd-%{python3_version} %{buildroot}%{_bindir}/twistd-3 -ln -s ./twistd-%{python3_version} %{buildroot}%{_bindir}/twistd - -# ambiguous shebangs -pathfix.py -pn -i %{__python3} %{buildroot}%{python3_sitelib} +ln -s ./trial %{buildroot}%{_bindir}/trial-3 +ln -s ./twistd %{buildroot}%{_bindir}/twistd-3 -%pyproject_save_files twisted +%pyproject_save_files %{srcname} echo "%ghost %{python3_sitelib}/twisted/plugins/dropin.cache" >> %{pyproject_files} %check # can't get this to work within the buildroot yet due to multicast -# https://twistedmatrix.com/trac/ticket/7494 -PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python3_sitelib} %{buildroot}%{_bindir}/trial twisted ||: +# https:# twistedmatrix.com/trac/ticket/7494 +PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{pyproject_build_lib} %{buildroot}%{_bindir}/trial twisted ||: %files -n python3-twisted -f %{pyproject_files} %doc NEWS.rst README.rst %license LICENSE -%{_bindir}/trial-3* -%{_bindir}/twistd-3* %{_bindir}/cftp %{_bindir}/ckeygen %{_bindir}/conch @@ -118,6 +107,8 @@ PATH=%{buildroot}%{_bindir}:$PATH PYTHONPATH=%{buildroot}%{python3_sitelib} %{bu %{_bindir}/trial %{_bindir}/twist %{_bindir}/twistd +%{_bindir}/trial-3 +%{_bindir}/twistd-3 %{_mandir}/man1/cftp.1* %{_mandir}/man1/ckeygen.1* %{_mandir}/man1/conch.1* diff --git a/sources b/sources index 78eed83..4dddcc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (Twisted-21.7.0.tar.gz) = d73a70efec24ea5b7fec450b5af0366523ecdecc884ba0314073ee46c5fc94423540d8d4be9d0d272a157327595f7518c410ca7950f4ae0468e09adf32f5b796 +SHA512 (twisted-22.4.0.tar.gz) = 776d36040bcefb9ca65e471d9058fe1067ffc8171a501cb451e9d4824a88dd83f79dc9b27a127ca898451587454ee661000acbce6c4c39b069aeadd64710f103