Compare commits

..

No commits in common. "c8" and "c8-stream-3.8" have entirely different histories.

4 changed files with 53 additions and 3380 deletions

2
.gitignore vendored
View File

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

View File

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

File diff suppressed because it is too large Load Diff

View File

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