Skip to content

Commit a7c7a36

Browse files
[AUTO-CHERRYPICK] [AUTOPATCHER-CORE] Upgrade python-idna to 3.7 CVE-2024-3651 - branch main (#9930)
1 parent cf3bd41 commit a7c7a36

3 files changed

Lines changed: 26 additions & 12 deletions

File tree

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"Signatures": {
3-
"idna-3.3.tar.gz": "34b145ffe35b7872e9a3e0abc3a3a8330db90a0fd58db978725fd05c5c7d9f88"
4-
}
2+
"Signatures": {
3+
"idna-3.7.tar.gz": "07017f753632624abaa31aa2c1b243aea6409367256de4183671d95e019f7d70"
4+
}
55
}

SPECS/python-idna/python-idna.spec

Lines changed: 21 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Summary: Internationalized Domain Names in Applications (IDNA).
22
Name: python-idna
3-
Version: 3.3
3+
Version: 3.7
44
Release: 1%{?dist}
55
License: BSD-like
66
Vendor: Microsoft Corporation
@@ -16,11 +16,15 @@ Support for the Internationalised Domain Names in Applications (IDNA) protocol a
1616

1717
%package -n python3-idna
1818
Summary: Internationalized Domain Names in Applications (IDNA).
19+
BuildRequires: python-flit-core
1920
BuildRequires: python3-devel
21+
BuildRequires: python3-pip
2022
BuildRequires: python3-setuptools
2123
BuildRequires: python3-xml
2224
Requires: python3
23-
25+
%if %{with_check}
26+
BuildRequires: python3-pytest
27+
%endif
2428
%description -n python3-idna
2529
Support for the Internationalised Domain Names in Applications (IDNA) protocol as specified in RFC 5891. This is the latest version of the protocol and is sometimes referred to as “IDNA 2008”.
2630

@@ -30,22 +34,32 @@ This acts as a suitable replacement for the “encodings.idna” module that com
3034

3135
%prep
3236
%autosetup -n idna-%{version}
37+
# Remove bundled egg-info
38+
rm -rf idna.egg-info
39+
40+
%generate_buildrequires
41+
%pyproject_buildrequires
3342

3443
%build
35-
%py3_build
44+
%pyproject_wheel
3645

3746
%install
38-
%py3_install
47+
%pyproject_install
48+
%pyproject_save_files idna
3949

4050
%check
41-
%python3 setup.py test
51+
pip3 install iniconfig
52+
%pytest
4253

43-
%files -n python3-idna
54+
%files -n python3-idna -f %pyproject_files
4455
%defattr(-,root,root,-)
4556
%license LICENSE.md
46-
%{python3_sitelib}/*
57+
%doc README.rst
4758

4859
%changelog
60+
* Tue Jul 23 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 3.7-1
61+
- Auto-upgrade to 3.7 - CVE-2024-3651
62+
4963
* Tue Feb 15 2022 Nick Samson <nisamson@microsoft.com> - 3.3-1
5064
- Updated Source0 and license file.
5165
- Updated to 3.3.

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22904,8 +22904,8 @@
2290422904
"type": "other",
2290522905
"other": {
2290622906
"name": "python-idna",
22907-
"version": "3.3",
22908-
"downloadUrl": "https://github.com/kjd/idna/archive/refs/tags/v3.3.tar.gz"
22907+
"version": "3.7",
22908+
"downloadUrl": "https://github.com/kjd/idna/archive/refs/tags/v3.7.tar.gz"
2290922909
}
2291022910
}
2291122911
},

0 commit comments

Comments
 (0)