.gitignore

@@ -1 +1 @@
-SOURCES/idna-2.8.tar.gz
+SOURCES/idna-2.5.tar.gz

.python-idna.metadata

@@ -1 +1 @@
-c1e59def26dac74a2ec53181032df76d40368657 SOURCES/idna-2.8.tar.gz
+499531b72bf0440ded6ce7f079a1f979270ae2d0 SOURCES/idna-2.5.tar.gz

SPECS/python-idna.spec

@@ -1,30 +1,42 @@
-%global with_python3 1
 %global srcname idna
 
-# Prepared for Python 2 removal
+%if 0%{?fedora} || 0%{?rhel} >= 8
+%bcond_without python3
+%else
+%bcond_with python3
+%endif
+
+%if 0%{?rhel} > 7
+# Disable python2 build by default
 %bcond_with python2
+%else
+%bcond_without python2
+%endif
 
 Name:           python-%{srcname}
-Version:        2.8
+Version:        2.5
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 
 License:        BSD and Python and Unicode
 URL:            https://github.com/kjd/idna
 Source0:        https://pypi.io/packages/source/i/%{srcname}/%{srcname}-%{version}.tar.gz
-BuildArch:      noarch
-# Exclude i686 arch. Due to a modularity issue it's being added to the
-# x86_64 compose of CRB, but we don't want to ship it at all.
-# See: https://projects.engineering.redhat.com/browse/RCM-72605
-ExcludeArch:    i686
 
-%if %{with python2}
+# Security fix for CVE-2024-3651
+# Upstream: https://github.com/kjd/idna/commit/5beb28b9dd77912c0dd656d8b0fdba3eb80222e7
+# Tracking bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2274779
+Patch:          CVE-2024-3651.patch
+
+BuildArch:      noarch
+
+%if 0%{?with_python2}
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
-%endif
+%endif # with_python2
+%if 0%{?with_python3}
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
-BuildRequires:  python%{python3_pkgversion}-rpm-macros
+%endif # with_python3
 
 %description
 A library to support the Internationalised Domain Names in Applications (IDNA)
@@ -36,7 +48,7 @@ The library is also intended to act as a suitable drop-in replacement for the
 "encodings.idna" module that comes with the Python standard library but
 currently only supports the older 2003 specification.
 
-%if %{with python2}
+%if 0%{?with_python2}
 %package -n python2-%{srcname}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 %{?python_provide:%python_provide python2-%{srcname}}
@@ -50,8 +62,9 @@ different results from the earlier standard from 2003.
 The library is also intended to act as a suitable drop-in replacement for the
 "encodings.idna" module that comes with the Python standard library but
 currently only supports the older 2003 specification.
-%endif
+%endif # with_python2
 
+%if 0%{?with_python3}
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        Internationalized Domain Names in Applications (IDNA)
 %{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
@@ -65,6 +78,7 @@ different results from the earlier standard from 2003.
 The library is also intended to act as a suitable drop-in replacement for the
 "encodings.idna" module that comes with the Python standard library but
 currently only supports the older 2003 specification.
+%endif # with_python3
 
 %prep
 %autosetup -p1 -n %{srcname}-%{version}
@@ -72,69 +86,59 @@ currently only supports the older 2003 specification.
 rm -rf %{srcname}.egg-info
 
 %build
-%if %{with python2}
+%if 0%{?with_python2}
 %py2_build
-%endif
+%endif # with_python2
+
+%if 0%{?with_python3}
 %py3_build
+%endif # with_python3
 
 %install
+%if 0%{?with_python3}
 %py3_install
-%if %{with python2}
+%endif # with_python3
+
+%if 0%{?with_python2}
 %py2_install
-%endif
+%endif # with_python2
 
 %check
-%if %{with python2}
+%if 0%{?with_python2}
 %{__python2} setup.py test
-%endif
+%endif # with_python2
+
+%if 0%{?with_python3}
 %{__python3} setup.py test
+%endif # with_python3
 
-
+%if 0%{?with_python2}
-%if %{with python2}
 %files -n python2-%{srcname}
 %license LICENSE.rst
 %doc README.rst HISTORY.rst
 %{python2_sitelib}/%{srcname}
 %{python2_sitelib}/%{srcname}-%{version}-py%{python2_version}.egg-info
-%endif
+%endif # with_python2
 
+%if 0%{?with_python3}
 %files -n python%{python3_pkgversion}-%{srcname}
 %license LICENSE.rst
 %doc README.rst HISTORY.rst
 %{python3_sitelib}/%{srcname}
 %{python3_sitelib}/%{srcname}-%{version}-py%{python3_version}.egg-info
+%endif # with_python3
 
 %changelog
-* Fri Dec 13 2019 Tomas Orsava <torsava@redhat.com> - 2.8-6
+* Thu Apr 25 2024 Lumír Balhar <lbalhar@redhat.com> - 2.5-7
-- Exclude unsupported i686 arch
+- Fix patch application for security fix for CVE-2024-3651
+Resolves: RHEL-32703
 
-* Wed Nov 20 2019 Lumír Balhar <lbalhar@redhat.com> - 2.8-5
+* Tue Apr 23 2024 Lumír Balhar <lbalhar@redhat.com> - 2.5-6
-- Adjusted for Python 3.8 module in RHEL 8
+- Security fix for CVE-2024-3651
+Resolves: RHEL-32703
 
-* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8-4
+* Thu Jun 28 2018 Christian Heimes <cheimes@redhat.com> - 2.5-5
-- Rebuilt for Python 3.8.0rc1 (#1748018)
+- Drop Python 2 subpackage from RHEL 8, fixes RHBZ#1590399
-
-* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 2.8-3
-- Rebuilt for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Tue May 28 2019 Jeremy Cline <jcline@redhat.com> - 2.8-1
-- Update to v2.8
-- Drop python version conditionals
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.7-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 2.7-2
-- Rebuilt for Python 3.7
-
-* Tue Jun 12 2018 Jeremy Cline <jeremy@jcline.org> - 2.7-1
-- Update to v2.7 (rhbz 1589803)
 
 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.5-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
@@ -153,7 +157,7 @@ rm -rf %{srcname}.egg-info
 - Update to version 2.4
 
 * Tue Feb 28 2017 Paul Wouters <pwouters@redhat.com> - 2.3-1
-- Resolves bugzilla 1427499 Update to 2.3 for IDNAError bugfix and memory improvement
+- Resolves: rhbz#1427499 Update to 2.3 for IDNAError bugfix and memory improvement
 
 * Thu Feb 09 2017 Jeremy Cline <jeremy@jcline.org> - 2.2-1
 - Update to version 2.2 (#1406757)