Charalampos Stratakis
parent
cfce4a3ce4
commit
e8383dc408
|
|
@ -0,0 +1 @@
|
|||
/packaging-21.3.tar.gz
|
||||
|
|
@ -0,0 +1,62 @@
|
|||
From c3476c3207efef576a185a047e6596b3b0cbcb42 Mon Sep 17 00:00:00 2001
|
||||
From: Tzu-ping Chung <uranusjr@gmail.com>
|
||||
Date: Wed, 20 Apr 2022 10:00:07 +0800
|
||||
Subject: [PATCH 1/2] Correctly parse ELF for musllinux on Big Endian
|
||||
|
||||
---
|
||||
packaging/_musllinux.py | 8 +++++---
|
||||
1 file changed, 5 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/packaging/_musllinux.py b/packaging/_musllinux.py
|
||||
index 8ac3059b..d5d3e044 100644
|
||||
--- a/packaging/_musllinux.py
|
||||
+++ b/packaging/_musllinux.py
|
||||
@@ -39,9 +39,11 @@ def _parse_ld_musl_from_elf(f: IO[bytes]) -> Optional[str]:
|
||||
# p_fmt: Format for section header.
|
||||
# p_idx: Indexes to find p_type, p_offset, and p_filesz.
|
||||
e_fmt, p_fmt, p_idx = {
|
||||
- 1: ("IIIIHHH", "IIIIIIII", (0, 1, 4)), # 32-bit.
|
||||
- 2: ("QQQIHHH", "IIQQQQQQ", (0, 2, 5)), # 64-bit.
|
||||
- }[ident[4]]
|
||||
+ (1, 1): ("<IIIIHHH", "<IIIIIIII", (0, 1, 4)), # 32-bit LSB.
|
||||
+ (1, 2): (">IIIIHHH", ">IIIIIIII", (0, 1, 4)), # 32-bit MSB.
|
||||
+ (2, 1): ("<QQQIHHH", "<IIQQQQQQ", (0, 2, 5)), # 64-bit LSB.
|
||||
+ (2, 2): (">QQQIHHH", ">IIQQQQQQ", (0, 2, 5)), # 64-bit MSB.
|
||||
+ }[(ident[4], ident[5])]
|
||||
except KeyError:
|
||||
return None
|
||||
else:
|
||||
|
||||
From a339dd3374b334a1a999481f3014f68a7389dacc Mon Sep 17 00:00:00 2001
|
||||
From: Tzu-ping Chung <uranusjr@gmail.com>
|
||||
Date: Sun, 29 May 2022 11:55:30 +0800
|
||||
Subject: [PATCH 2/2] Always use LSB to parse binary in tests
|
||||
|
||||
---
|
||||
tests/test_musllinux.py | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tests/test_musllinux.py b/tests/test_musllinux.py
|
||||
index d2c87ca1..2623bdbc 100644
|
||||
--- a/tests/test_musllinux.py
|
||||
+++ b/tests/test_musllinux.py
|
||||
@@ -101,14 +101,15 @@ def test_parse_ld_musl_from_elf_no_interpreter_section():
|
||||
with BIN_MUSL_X86_64.open("rb") as f:
|
||||
data = f.read()
|
||||
|
||||
- # Change all sections to *not* PT_INTERP.
|
||||
- unpacked = struct.unpack("16BHHIQQQIHHH", data[:58])
|
||||
+ # Change all sections to *not* PT_INTERP. We are explicitly using LSB rules
|
||||
+ # because the binaries are in LSB.
|
||||
+ unpacked = struct.unpack("<16BHHIQQQIHHH", data[:58])
|
||||
*_, e_phoff, _, _, _, e_phentsize, e_phnum = unpacked
|
||||
for i in range(e_phnum + 1):
|
||||
sb = e_phoff + e_phentsize * i
|
||||
se = sb + 56
|
||||
- section = struct.unpack("IIQQQQQQ", data[sb:se])
|
||||
- data = data[:sb] + struct.pack("IIQQQQQQ", 0, *section[1:]) + data[se:]
|
||||
+ section = struct.unpack("<IIQQQQQQ", data[sb:se])
|
||||
+ data = data[:sb] + struct.pack("<IIQQQQQQ", 0, *section[1:]) + data[se:]
|
||||
|
||||
assert _parse_ld_musl_from_elf(io.BytesIO(data)) is None
|
||||
|
||||
|
|
@ -0,0 +1,287 @@
|
|||
%global pypi_name packaging
|
||||
|
||||
# Specify --with bootstrap to build in bootstrap mode
|
||||
# This mode is needed, because python3-rpm-generators need packaging
|
||||
# When bootstrapping, disable tests and docs as well.
|
||||
%bcond_with bootstrap
|
||||
|
||||
%if %{without bootstrap}
|
||||
# Specify --without docs to prevent the dependency loop on python-sphinx
|
||||
%bcond_without docs
|
||||
|
||||
# Specify --without tests to prevent the dependency loop on python-pytest
|
||||
%bcond_without tests
|
||||
%else
|
||||
%bcond_with docs
|
||||
%bcond_with tests
|
||||
%endif
|
||||
|
||||
Name: python-%{pypi_name}
|
||||
Version: 21.3
|
||||
Release: 7%{?dist}
|
||||
Summary: Core utilities for Python packages
|
||||
|
||||
License: BSD or ASL 2.0
|
||||
URL: https://github.com/pypa/packaging
|
||||
Source0: %{url}/archive/%{version}/%{pypi_name}-%{version}.tar.gz
|
||||
|
||||
# Correctly parse ELF for musllinux on Big Endian
|
||||
# Merged upstream
|
||||
Patch: https://github.com/pypa/packaging/pull/538.patch
|
||||
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: python%{python3_pkgversion}-devel
|
||||
BuildRequires: pyproject-rpm-macros
|
||||
|
||||
%if %{with bootstrap}
|
||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
||||
%endif
|
||||
|
||||
# Upstream uses nox for testing, we specify the test deps manually as well.
|
||||
%if %{with tests}
|
||||
BuildRequires: python%{python3_pkgversion}-pytest
|
||||
BuildRequires: python%{python3_pkgversion}-pretend
|
||||
%endif
|
||||
%if %{with docs}
|
||||
BuildRequires: python%{python3_pkgversion}-sphinx
|
||||
%endif
|
||||
|
||||
|
||||
%global _description %{expand:
|
||||
python-packaging provides core utilities for Python packages like utilities for
|
||||
dealing with versions, specifiers, markers etc.}
|
||||
|
||||
%description %_description
|
||||
|
||||
|
||||
%package -n python%{python3_pkgversion}-%{pypi_name}
|
||||
Summary: %{summary}
|
||||
|
||||
# This is kept for compatibility with Fedora < 33 only:
|
||||
%py_provides python%{python3_pkgversion}-%{pypi_name}
|
||||
|
||||
%if %{with bootstrap}
|
||||
Provides: python%{python3_pkgversion}dist(packaging) = %{version}
|
||||
Provides: python%{python3_version}dist(packaging) = %{version}
|
||||
Requires: python%{python3_version}dist(pyparsing)
|
||||
Requires: python(abi) = %{python3_version}
|
||||
%endif
|
||||
|
||||
%description -n python%{python3_pkgversion}-%{pypi_name} %_description
|
||||
|
||||
|
||||
%if %{with docs}
|
||||
%package -n python-%{pypi_name}-doc
|
||||
Summary: python-packaging documentation
|
||||
|
||||
%description -n python-%{pypi_name}-doc
|
||||
Documentation for python-packaging
|
||||
%endif
|
||||
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{pypi_name}-%{version}
|
||||
|
||||
# Do not use furo as HTML theme in docs
|
||||
# furo is not available in Fedora
|
||||
sed -i '/html_theme = "furo"/d' docs/conf.py
|
||||
|
||||
%if %{without bootstrap}
|
||||
%generate_buildrequires
|
||||
%pyproject_buildrequires -r
|
||||
%endif
|
||||
|
||||
|
||||
%build
|
||||
%if %{with bootstrap}
|
||||
%py3_build
|
||||
%else
|
||||
%pyproject_wheel
|
||||
%endif
|
||||
|
||||
%if %{with docs}
|
||||
# generate html docs
|
||||
sphinx-build-3 docs html
|
||||
# remove the sphinx-build leftovers
|
||||
rm -rf html/.{doctrees,buildinfo}
|
||||
# Do not bundle fonts
|
||||
rm -rf html/_static/fonts/
|
||||
%endif
|
||||
|
||||
|
||||
%install
|
||||
%if %{with bootstrap}
|
||||
%py3_install
|
||||
echo '%{python3_sitelib}/packaging*' > %{pyproject_files}
|
||||
%else
|
||||
%pyproject_install
|
||||
%pyproject_save_files %{pypi_name}
|
||||
%endif
|
||||
|
||||
|
||||
%if %{with tests}
|
||||
%check
|
||||
%pytest
|
||||
%endif
|
||||
|
||||
|
||||
%files -n python%{python3_pkgversion}-%{pypi_name} -f %{pyproject_files}
|
||||
%license LICENSE LICENSE.APACHE LICENSE.BSD
|
||||
%doc README.rst CHANGELOG.rst CONTRIBUTING.rst
|
||||
|
||||
|
||||
%if %{with docs}
|
||||
%files -n python-%{pypi_name}-doc
|
||||
%doc html
|
||||
%license LICENSE LICENSE.APACHE LICENSE.BSD
|
||||
%endif
|
||||
|
||||
|
||||
%changelog
|
||||
* Tue Aug 23 2022 Miro Hrončok <mhroncok@redhat.com> - 21.3-7
|
||||
- Fix tests on Big Endian builders
|
||||
|
||||
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.3-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Tue Jul 19 2022 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 21.3-5
|
||||
- Rebuilt for pyparsing-3.0.9
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 21.3-4
|
||||
- Rebuilt for Python 3.11
|
||||
|
||||
* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 21.3-3
|
||||
- Bootstrap for Python 3.11
|
||||
|
||||
* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.3-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Thu Nov 18 2021 Lumír Balhar <lbalhar@redhat.com> - 21.3-1
|
||||
- Update to 21.3
|
||||
Resolves: rhbz#2024413
|
||||
|
||||
* Mon Nov 01 2021 Lumír Balhar <lbalhar@redhat.com> - 21.2-1
|
||||
- Update to 21.2
|
||||
Resolves: rhbz#2018534
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jul 07 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0-1
|
||||
- Update to 21.0
|
||||
Resolves: rhbz#1978925
|
||||
|
||||
* Thu Jun 03 2021 Python Maint <python-maint@redhat.com> - 20.9-3
|
||||
- Rebuilt for Python 3.10
|
||||
|
||||
* Tue Jun 01 2021 Python Maint <python-maint@redhat.com> - 20.9-2
|
||||
- Bootstrap for Python 3.10
|
||||
|
||||
* Mon Feb 01 2021 Lumír Balhar <lbalhar@redhat.com> - 20.9-1
|
||||
- Update to 20.9
|
||||
Resolves: rhbz#1922545
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 20.8-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Mon Dec 14 2020 Lumír Balhar <lbalhar@redhat.com> - 20.8-1
|
||||
- Update to 20.8 (#1906985)
|
||||
|
||||
* Mon Nov 30 2020 Lumír Balhar <lbalhar@redhat.com> - 20.7-1
|
||||
- Update to 20.7 (#1902369)
|
||||
|
||||
* Fri Oct 02 2020 Miro Hrončok <mhroncok@redhat.com> - 20.4-3
|
||||
- Drop the dependency on six to make the package lighter
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.4-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Mon Jun 01 2020 Lumír Balhar <lbalhar@redhat.com> - 20.4-1
|
||||
- Update to 20.4 (#1838285)
|
||||
|
||||
* Sat May 23 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-3
|
||||
- Rebuilt for Python 3.9
|
||||
|
||||
* Fri May 22 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-2
|
||||
- Bootstrap for Python 3.9
|
||||
|
||||
* Fri Mar 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.3-1
|
||||
- Update to 20.3 (#1810738)
|
||||
|
||||
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||
|
||||
* Mon Jan 27 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1-1
|
||||
- Update to 20.1 (#1794865)
|
||||
|
||||
* Mon Jan 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0-2
|
||||
- Ignore broken tests
|
||||
|
||||
* Mon Jan 06 2020 Lumír Balhar <lbalhar@redhat.com> - 20.0-1
|
||||
- Update to 20.0 (#1788012)
|
||||
|
||||
* Thu Sep 26 2019 Lumír Balhar <lbalhar@redhat.com> - 19.2-1
|
||||
- New upstream version 19.2 (bz#1742388)
|
||||
|
||||
* Mon Sep 23 2019 Lumír Balhar <lbalhar@redhat.com> - 19.0-6
|
||||
- Remove Python 2 subpackage
|
||||
- Make spec fedora-specific
|
||||
|
||||
* Mon Sep 02 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0-5
|
||||
- Reduce Python 2 build time dependencies
|
||||
|
||||
* Fri Aug 16 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0-4
|
||||
- Rebuilt for Python 3.8
|
||||
|
||||
* Thu Aug 15 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0-3
|
||||
- Bootstrap for Python 3.8
|
||||
|
||||
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||
|
||||
* Mon Feb 04 2019 Lumír Balhar <lbalhar@redhat.com> - 19.0-1
|
||||
- New upstream version
|
||||
|
||||
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 17.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||
|
||||
* Tue Jul 31 2018 Charalampos Stratakis <cstratak@redhat.com> - 17.1-1
|
||||
- Update to 17.1
|
||||
|
||||
* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 16.8-11
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||
|
||||
* Sat Jun 16 2018 Miro Hrončok <mhroncok@redhat.com> - 16.8-10
|
||||
- Rebuilt for Python 3.7
|
||||
|
||||
* Thu Jun 14 2018 Miro Hrončok <mhroncok@redhat.com> - 16.8-9
|
||||
- Bootstrap for Python 3.7
|
||||
|
||||
* Fri Feb 09 2018 Iryna Shcherbina <ishcherb@redhat.com> - 16.8-8
|
||||
- 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> - 16.8-7
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
|
||||
|
||||
* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.8-6
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
|
||||
|
||||
* Wed Mar 22 2017 Lumir Balhar <lbalhar@redhat.com> - 16.8-5
|
||||
- Epel7 compatible spec/package
|
||||
|
||||
* Mon Feb 13 2017 Charalampos Stratakis <cstratak@redhat.com> - 16.8-4
|
||||
- Rebuild as wheel
|
||||
|
||||
* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 16.8-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
|
||||
|
||||
* Mon Dec 19 2016 Miro Hrončok <mhroncok@redhat.com> - 16.8-2
|
||||
- Rebuild for Python 3.6
|
||||
|
||||
* Wed Nov 02 2016 Lumir Balhar <lbalhar@redhat.com> - 16.8-1
|
||||
- New upstream version
|
||||
|
||||
* Fri Sep 16 2016 Lumir Balhar <lbalhar@redhat.com> - 16.7-1
|
||||
- Initial package.
|
||||
Loading…
Reference in New Issue