|
|
|
|
@@ -1,25 +1,40 @@
|
|
|
|
|
%global pypi_name defusedxml
|
|
|
|
|
%global base_version 0.7.1
|
|
|
|
|
#global prerel ...
|
|
|
|
|
%global upstream_version %{base_version}%{?prerel}
|
|
|
|
|
# Enable Python 3 builds for Fedora + EPEL >6
|
|
|
|
|
%if 0%{?fedora} || 0%{?rhel} > 6
|
|
|
|
|
# If the definition isn't available for python3_pkgversion, define it
|
|
|
|
|
%{?!python3_pkgversion:%global python3_pkgversion 3}
|
|
|
|
|
%bcond_without python3
|
|
|
|
|
%else
|
|
|
|
|
%bcond_with python3
|
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
%global pypi_name defusedxml
|
|
|
|
|
# define the license macro as doc if licensedir is not defined for
|
|
|
|
|
# compatibility with EPEL
|
|
|
|
|
%{!?_licensedir:%global license %%doc}
|
|
|
|
|
|
|
|
|
|
Name: python-%{pypi_name}
|
|
|
|
|
Version: %{base_version}%{?prerel:~%{prerel}}
|
|
|
|
|
Release: 12%{?dist}
|
|
|
|
|
Version: 0.5.0
|
|
|
|
|
Release: 3%{?dist}
|
|
|
|
|
Summary: XML bomb protection for Python stdlib modules
|
|
|
|
|
License: Python
|
|
|
|
|
URL: https://github.com/tiran/defusedxml
|
|
|
|
|
Source0: %{pypi_source %{pypi_name} %{upstream_version}}
|
|
|
|
|
|
|
|
|
|
# Drop deprecated unittest.makeSuite()
|
|
|
|
|
# From https://github.com/tiran/defusedxml/commit/4e6cea5f5b
|
|
|
|
|
# (This no longer skips lxml tests when lxml is not installed.)
|
|
|
|
|
Patch: drop-makeSuite.patch
|
|
|
|
|
Source0: https://files.pythonhosted.org/packages/source/d/%{pypi_name}/%{pypi_name}-%{version}.tar.gz
|
|
|
|
|
|
|
|
|
|
BuildArch: noarch
|
|
|
|
|
|
|
|
|
|
BuildRequires: python2-devel
|
|
|
|
|
# No python2-setuptools on EL 7
|
|
|
|
|
BuildRequires: python-setuptools
|
|
|
|
|
|
|
|
|
|
%if 0%{with_python3}
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-devel
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-setuptools
|
|
|
|
|
BuildRequires: python%{python3_pkgversion}-lxml
|
|
|
|
|
|
|
|
|
|
%if 0%{?with_python3_other}
|
|
|
|
|
BuildRequires: python%{python3_other_pkgversion}-setuptools
|
|
|
|
|
BuildRequires: python%{python3_other_pkgversion}-devel
|
|
|
|
|
%endif # with_python3_other
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
%description
|
|
|
|
|
The defusedxml package contains several Python-only workarounds and fixes for
|
|
|
|
|
@@ -28,9 +43,20 @@ to benefit from the protection you just have to import and use the listed
|
|
|
|
|
functions / classes from the right defusedxml module instead of the original
|
|
|
|
|
module.
|
|
|
|
|
|
|
|
|
|
%package -n python2-%{pypi_name}
|
|
|
|
|
Summary: XML bomb protection for Python stdlib modules
|
|
|
|
|
%{?python_provide:%python_provide python2-%{pypi_name}}
|
|
|
|
|
|
|
|
|
|
%description -n python2-%{pypi_name}
|
|
|
|
|
The defusedxml package contains several Python-only workarounds and fixes for
|
|
|
|
|
denial of service and other vulnerabilities in Python's XML libraries. In order
|
|
|
|
|
to benefit from the protection you just have to import and use the listed
|
|
|
|
|
functions / classes from the right defusedxml module instead of the original
|
|
|
|
|
module. This is the Python 2 build.
|
|
|
|
|
|
|
|
|
|
%if 0%{with_python3}
|
|
|
|
|
%package -n python%{python3_pkgversion}-%{pypi_name}
|
|
|
|
|
Summary: %{summary}
|
|
|
|
|
Summary: XML bomb protection for Python stdlib modules
|
|
|
|
|
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
|
|
|
|
|
|
|
|
|
|
%description -n python%{python3_pkgversion}-%{pypi_name}
|
|
|
|
|
@@ -40,116 +66,76 @@ to benefit from the protection you just have to import and use the listed
|
|
|
|
|
functions / classes from the right defusedxml module instead of the original
|
|
|
|
|
module. This is the python%{python3_pkgversion} build.
|
|
|
|
|
|
|
|
|
|
%if 0%{?with_python3_other}
|
|
|
|
|
%package -n python%{python3_other_pkgversion}-%{pypi_name}
|
|
|
|
|
Summary: XML bomb protection for Python stdlib modules
|
|
|
|
|
%{?python_provide:%python_provide python%{python3_pkgversion}-%{pypi_name}}
|
|
|
|
|
|
|
|
|
|
%description -n python%{python3_other_pkgversion}-%{pypi_name}
|
|
|
|
|
The defusedxml package contains several Python-only workarounds and fixes for
|
|
|
|
|
denial of service and other vulnerabilities in Python's XML libraries. In order
|
|
|
|
|
to benefit from the protection you just have to import and use the listed
|
|
|
|
|
functions / classes from the right defusedxml module instead of the original
|
|
|
|
|
module. This is the python%{python3_other_pkgversion} build.
|
|
|
|
|
%endif # with_python3_other
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
%prep
|
|
|
|
|
%autosetup -p1 -n %{pypi_name}-%{upstream_version}
|
|
|
|
|
%setup -q -n %{pypi_name}-%{version}
|
|
|
|
|
|
|
|
|
|
%build
|
|
|
|
|
%py2_build
|
|
|
|
|
%if 0%{with_python3}
|
|
|
|
|
%py3_build
|
|
|
|
|
%if 0%{?with_python3_other}
|
|
|
|
|
%py3_other_build
|
|
|
|
|
%endif # with_python3_other
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
%install
|
|
|
|
|
%py2_install
|
|
|
|
|
%if 0%{with_python3}
|
|
|
|
|
%py3_install
|
|
|
|
|
%if 0%{?with_python3_other}
|
|
|
|
|
%py3_other_install
|
|
|
|
|
%endif # with_python3_other
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
%check
|
|
|
|
|
%{python3} tests.py
|
|
|
|
|
%{__python2} tests.py
|
|
|
|
|
%if 0%{with_python3}
|
|
|
|
|
%{__python3} tests.py
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
%files -n python2-%{pypi_name}
|
|
|
|
|
%doc README.txt README.html CHANGES.txt
|
|
|
|
|
%license LICENSE
|
|
|
|
|
%{python2_sitelib}/%{pypi_name}
|
|
|
|
|
%{python2_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
|
|
|
|
|
|
|
|
|
%if 0%{with_python3}
|
|
|
|
|
%files -n python%{python3_pkgversion}-%{pypi_name}
|
|
|
|
|
%doc README.txt README.html CHANGES.txt
|
|
|
|
|
%license LICENSE
|
|
|
|
|
%{python3_sitelib}/%{pypi_name}/
|
|
|
|
|
%{python3_sitelib}/%{pypi_name}-%{upstream_version}-py%{python3_version}.egg-info/
|
|
|
|
|
%{python3_sitelib}/%{pypi_name}
|
|
|
|
|
%{python3_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
|
|
|
|
|
|
|
|
|
%if 0%{?with_python3_other}
|
|
|
|
|
%files -n python%{python3_other_pkgversion}-%{pypi_name}
|
|
|
|
|
%doc README.txt README.html CHANGES.txt
|
|
|
|
|
%license LICENSE
|
|
|
|
|
%{python3_other_sitelib}/%{pypi_name}
|
|
|
|
|
%{python3__other_sitelib}/%{pypi_name}-%{version}-py?.?.egg-info
|
|
|
|
|
%endif # with_python3_other
|
|
|
|
|
%endif # with_python3
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
|
* Fri Jan 26 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-12
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
* Thu Aug 24 2023 Miro Hrončok <mhroncok@redhat.com> - 0.5.0-3
|
|
|
|
|
- Rebuilt to provide python3-defusedxml
|
|
|
|
|
- Fixes: rhbz#2233752
|
|
|
|
|
|
|
|
|
|
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-11
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Oct 24 2023 Miro Hrončok <mhroncok@redhat.com> - 0.7.1-10
|
|
|
|
|
- Run lxml tests during build, avoid deprecated unittest.makeSuite()
|
|
|
|
|
|
|
|
|
|
* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-9
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 0.7.1-8
|
|
|
|
|
- Rebuilt for Python 3.12
|
|
|
|
|
|
|
|
|
|
* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-7
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-6
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 0.7.1-5
|
|
|
|
|
- Rebuilt for Python 3.11
|
|
|
|
|
|
|
|
|
|
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Tue Jul 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.1-3
|
|
|
|
|
- Second attempt - Rebuilt for
|
|
|
|
|
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 0.7.1-2
|
|
|
|
|
- Rebuilt for Python 3.10
|
|
|
|
|
|
|
|
|
|
* Mon May 03 2021 Tomas Hrnciar <thrnciar@redhat.com> - 0.7.1-1
|
|
|
|
|
- Update to 0.7.1
|
|
|
|
|
- Fixes: rhbz#1935032
|
|
|
|
|
|
|
|
|
|
* Wed Jan 27 2021 Miro Hrončok <mhroncok@redhat.com> - 0.7.0~rc2-1
|
|
|
|
|
- Update to 0.7.0rc2
|
|
|
|
|
- Fixes: rhbz#1915522
|
|
|
|
|
|
|
|
|
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0~rc1-4
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.7.0~rc1-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 0.7.0~rc1-2
|
|
|
|
|
- Rebuilt for Python 3.9
|
|
|
|
|
|
|
|
|
|
* Mon May 04 2020 Miro Hrončok <mhroncok@redhat.com> - 0.7.0~rc1-1
|
|
|
|
|
- Update to 0.7.0rc1
|
|
|
|
|
|
|
|
|
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-5
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Oct 03 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-4
|
|
|
|
|
- Rebuilt for Python 3.8.0rc1 (#1748018)
|
|
|
|
|
|
|
|
|
|
* Sun Aug 18 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-3
|
|
|
|
|
- Rebuilt for Python 3.8
|
|
|
|
|
|
|
|
|
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.6.0-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu May 09 2019 Miro Hrončok <mhroncok@redhat.com> - 0.6.0-1
|
|
|
|
|
- Update to 0.6.0 (#1699639)
|
|
|
|
|
- Remove Python 2 subpackage
|
|
|
|
|
|
|
|
|
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-7
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-6
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 0.5.0-5
|
|
|
|
|
- Rebuilt for Python 3.7
|
|
|
|
|
|
|
|
|
|
* Mon Feb 12 2018 Iryna Shcherbina <ishcherb@redhat.com> - 0.5.0-4
|
|
|
|
|
- Update Python 2 dependency declarations to new packaging standards
|
|
|
|
|
(See https://fedoraproject.org/wiki/FinalizingFedoraSwitchtoPython3)
|
|
|
|
|
|
|
|
|
|
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-3
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
|
|
|
|
|
|
|
|
|
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.5.0-2
|
|
|
|
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
|
|
|
|
* Thu Mar 07 2019 Troy Dawson <tdawson@redhat.com> - 0.5.0-2
|
|
|
|
|
- Rebuilt to change main python from 3.4 to 3.6
|
|
|
|
|
|
|
|
|
|
* Fri Feb 10 2017 Adam Williamson <awilliam@redhat.com> - 0.5.0-1
|
|
|
|
|
- Update to 0.5.0, drop merged/superseded patches
|
|
|
|
|
|
