From 45b7fe37026e79329105522cbd6bcf2ba548ce44 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Wed, 21 Apr 2021 14:52:14 +0000 Subject: [PATCH] import PyYAML-5.4.1-1.module+el8.5.0+10721+14d8e0d5 --- .PyYAML.metadata | 2 +- .gitignore | 2 +- SPECS/PyYAML.spec | 61 +++++++++++++++++++++++++++++++++++------------ 3 files changed, 48 insertions(+), 17 deletions(-) diff --git a/.PyYAML.metadata b/.PyYAML.metadata index 17964a6..25165c3 100644 --- a/.PyYAML.metadata +++ b/.PyYAML.metadata @@ -1 +1 @@ -0254618e37235cd269811dd821691f99081e3d1c SOURCES/5.3.1.tar.gz +efbe83434843c1963a9e56f36a9afa74a38c60a8 SOURCES/5.4.1.tar.gz diff --git a/.gitignore b/.gitignore index e478f58..2fc0d35 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/5.3.1.tar.gz +SOURCES/5.4.1.tar.gz diff --git a/SPECS/PyYAML.spec b/SPECS/PyYAML.spec index 8787f58..e0d2294 100644 --- a/SPECS/PyYAML.spec +++ b/SPECS/PyYAML.spec @@ -1,15 +1,15 @@ -# Prepared for Python 2 removal -%bcond_with python2 +# RHEL8: disable building python2 in the python39 module +%bcond_with python2 Name: PyYAML -Version: 5.3.1 +Version: 5.4.1 Release: 1%{?dist} %global uversion %{version} Summary: YAML parser and emitter for Python License: MIT URL: https://github.com/yaml/pyyaml -Source0: https://github.com/yaml/pyyaml/archive/%{version}.tar.gz +Source0: https://github.com/yaml/pyyaml/archive/%{uversion}.tar.gz # 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. @@ -25,9 +25,9 @@ BuildRequires: python2-setuptools %endif BuildRequires: python%{python3_pkgversion}-devel +BuildRequires: python%{python3_pkgversion}-rpm-macros BuildRequires: python%{python3_pkgversion}-setuptools BuildRequires: python%{python3_pkgversion}-Cython -BuildRequires: python%{python3_pkgversion}-rpm-macros %global _description\ @@ -53,6 +53,8 @@ Provides: python-yaml = %{version}-%{release} Provides: python-yaml%{?_isa} = %{version}-%{release} Provides: python2-yaml = %{version}-%{release} Provides: python2-yaml%{?_isa} = %{version}-%{release} +Provides: PyYAML = %{version}-%{release} +Provides: PyYAML%{?_isa} = %{version}-%{release} %{?python_provide:%python_provide python2-pyyaml} %description -n python2-pyyaml %_description @@ -70,7 +72,7 @@ Provides: python%{python3_pkgversion}-PyYAML%{?_isa} = %{version}-%{releas %prep -%setup -q -n pyyaml-%{version} +%setup -q -n pyyaml-%{uversion} chmod a-x examples/yaml-highlight/yaml_hl.py # remove pre-generated file @@ -114,18 +116,47 @@ rm -rf ext/_yaml.c %changelog -* Thu Mar 26 2020 Lumír Balhar - 5.3.1-1 -- Rebase to 5.3.1 to fix CVE-2020-1747 -Resolves: rhbz#1807367 +* Tue Mar 23 2021 Tomas Orsava - 5.4.1-1 +- Rebase to version 5.4.1 to fix CVE-2020-14343 +- Resolves: rhbz#1860466 -* Fri Dec 13 2019 Tomas Orsava - 5.1.2-6 -- Exclude unsupported i686 arch +* Mon Jan 18 2021 Tomas Orsava - 5.3.1-6 +- Add PyYAML to the python39 module in RHEL8 +- Resolves: rhbz#1877430 -* Fri Nov 22 2019 Lumír Balhar - 5.1.2-5 -- Removed unwanted Obsoletes +* Mon Nov 23 2020 Miro Hrončok - 5.3.1-5 +- Disable Python 2 build on RHEL 9+ -* Wed Nov 20 2019 Lumír Balhar - 5.1.2-4 -- Adjusted for Python 3.8 module in RHEL 8 +* Mon Jul 27 2020 Fedora Release Engineering - 5.3.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri May 22 2020 Miro Hrončok - 5.3.1-3 +- Rebuilt for Python 3.9 + +* Mon May 18 2020 John Eckersberg - 5.3.1-2 +- Fix fedora conditional macro (rhbz#1836656) + +* Thu Mar 19 2020 John Eckersberg - 5.3.1-1 +- New upstream release 5.3.1 (rhbz#1814882) +- Fixes CVE-2020-1747 (rhbz#1807367,1809011) + +* Tue Mar 10 2020 Kalev Lember - 5.3-4 +- Add back PyYAML provides on F31 and older + +* Mon Mar 2 2020 John Eckersberg - 5.3-3 +- Fix python2 on Fedora < 32 (rhbz#1808812) + +* Tue Jan 28 2020 Fedora Release Engineering - 5.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Mon Jan 6 2020 John Eckersberg - 5.3-1 +- New upstream release 5.3 + +* Tue Dec 3 2019 John Eckersberg - 5.2-1 +- New upstream release 5.2 + +* Fri Nov 22 2019 John Eckersberg - 5.1.2-4 +- Build without python2 by default (rhbz#1775075) * Thu Sep 19 2019 Miro Hrončok - 5.1.2-3 - Stop providing PyYAML from python2-pyyaml, Python now means Python 3