From dc4ce5a8adddc985c21967f00b6a764bfe838792 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Fri, 30 Aug 2024 02:09:37 +0000 Subject: [PATCH 1/3] fix python-packaging issue --- SPECS/python-packaging/python-packaging.spec | 5 ++++- toolkit/resources/manifests/package/pkggen_core_aarch64.txt | 2 +- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 2 +- toolkit/resources/manifests/package/toolchain_aarch64.txt | 2 +- toolkit/resources/manifests/package/toolchain_x86_64.txt | 2 +- toolkit/scripts/toolchain/build_official_toolchain_rpms.sh | 3 +++ 6 files changed, 11 insertions(+), 5 deletions(-) diff --git a/SPECS/python-packaging/python-packaging.spec b/SPECS/python-packaging/python-packaging.spec index 4e41ed1101f..5478e620625 100644 --- a/SPECS/python-packaging/python-packaging.spec +++ b/SPECS/python-packaging/python-packaging.spec @@ -2,7 +2,7 @@ Summary: Core utilities for Python packages Name: python-packaging Version: 23.2 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD OR ASL 2.0 Vendor: Microsoft Corporation Distribution: Azure Linux @@ -55,6 +55,9 @@ Core utilities for Python packages %license LICENSE %changelog +* Thu Aug 29 2024 Andrew Phelps - 23.2-3 +- Bump release to rebuild and resolve python3dist provides issue + * Fri Feb 16 2024 Andrew Phelps - 23.2-2 - Disable debuginfo package to fix build with python 3.12 diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index a3354135cab..7d322bdbf02 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -256,7 +256,7 @@ msopenjdk-17-17.0.12-1.aarch64.rpm pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm python3-rpm-generators-14-11.azl3.noarch.rpm -python3-packaging-23.2-2.azl3.noarch.rpm +python3-packaging-23.2-3.azl3.noarch.rpm audit-3.1.2-1.azl3.aarch64.rpm audit-libs-3.1.2-1.azl3.aarch64.rpm libxcrypt-4.4.36-2.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 38abb85de9d..07c6bfac5a5 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -256,7 +256,7 @@ msopenjdk-17-17.0.12-1.x86_64.rpm pyproject-rpm-macros-1.12.0-2.azl3.noarch.rpm pyproject-srpm-macros-1.12.0-2.azl3.noarch.rpm python3-rpm-generators-14-11.azl3.noarch.rpm -python3-packaging-23.2-2.azl3.noarch.rpm +python3-packaging-23.2-3.azl3.noarch.rpm audit-3.1.2-1.azl3.x86_64.rpm audit-libs-3.1.2-1.azl3.x86_64.rpm libxcrypt-4.4.36-2.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index 81a8932ac4c..d0ee51c144b 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -546,7 +546,7 @@ python3-lxml-4.9.3-1.azl3.aarch64.rpm python3-magic-5.45-1.azl3.noarch.rpm python3-markupsafe-2.1.3-1.azl3.aarch64.rpm python3-newt-0.52.23-1.azl3.aarch64.rpm -python3-packaging-23.2-2.azl3.noarch.rpm +python3-packaging-23.2-3.azl3.noarch.rpm python3-pip-24.0-1.azl3.noarch.rpm python3-pygments-2.7.4-1.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 8cf3fef2a86..cb134e6ce1c 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -552,7 +552,7 @@ python3-lxml-4.9.3-1.azl3.x86_64.rpm python3-magic-5.45-1.azl3.noarch.rpm python3-markupsafe-2.1.3-1.azl3.x86_64.rpm python3-newt-0.52.23-1.azl3.x86_64.rpm -python3-packaging-23.2-2.azl3.noarch.rpm +python3-packaging-23.2-3.azl3.noarch.rpm python3-pip-24.0-1.azl3.noarch.rpm python3-pygments-2.7.4-1.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.x86_64.rpm diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index bedd4d8cd21..8f4ed9dcbe2 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -585,6 +585,9 @@ chroot_and_install_rpms pyproject-rpm-macros pyproject-srpm-macros # ocaml and other ocmal packages require ocaml-srpm-macros build_rpm_in_chroot_no_install ocaml-srpm-macros +build_rpm_in_chroot_no_install python-packaging +chroot_and_install_rpms python-packaging python3-packaging +# rebuild python-packaging to resolve circular dependency build_rpm_in_chroot_no_install python-packaging chroot_and_install_rpms python-packaging python3-packaging From 0139ec11a5e4169fa57d3397819dfe54edfd6b6e Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Sat, 31 Aug 2024 21:22:21 +0000 Subject: [PATCH 2/3] update release for python-pygments and python-setuptools --- SPECS/python-pygments/python-pygments.spec | 5 ++++- SPECS/python-setuptools/python-setuptools.spec | 6 +++++- toolkit/resources/manifests/package/pkggen_core_aarch64.txt | 4 ++-- toolkit/resources/manifests/package/pkggen_core_x86_64.txt | 4 ++-- toolkit/resources/manifests/package/toolchain_aarch64.txt | 4 ++-- toolkit/resources/manifests/package/toolchain_x86_64.txt | 4 ++-- toolkit/scripts/toolchain/build_official_toolchain_rpms.sh | 4 ++++ 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/SPECS/python-pygments/python-pygments.spec b/SPECS/python-pygments/python-pygments.spec index 80563a7df5e..1e390b32b9e 100644 --- a/SPECS/python-pygments/python-pygments.spec +++ b/SPECS/python-pygments/python-pygments.spec @@ -1,7 +1,7 @@ Summary: Pygments is a syntax highlighting package written in Python. Name: python-pygments Version: 2.7.4 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD Vendor: Microsoft Corporation Distribution: Azure Linux @@ -57,6 +57,9 @@ it is usable as a command-line tool and as a library. %{_bindir}/* %changelog +* Thu Aug 29 2024 Andrew Phelps - 2.7.4-2 +- Bump release to rebuild and resolve python3dist provides issue + * Wed Jul 10 2024 Muhammad Falak - 2.7.4-1 - Upgrade to version 2.7.4 to address CVEs - Drop un-needed patches diff --git a/SPECS/python-setuptools/python-setuptools.spec b/SPECS/python-setuptools/python-setuptools.spec index f0d79ec6ad9..507500c5dc9 100644 --- a/SPECS/python-setuptools/python-setuptools.spec +++ b/SPECS/python-setuptools/python-setuptools.spec @@ -6,7 +6,7 @@ Setuptools is a fully-featured, actively-maintained, and stable library designed Summary: Easily build and distribute Python packages Name: python-setuptools Version: 69.0.3 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -57,9 +57,13 @@ EOF %{python3_sitelib}/setuptools-%{version}.dist-info/* %changelog +* Thu Aug 29 2024 Andrew Phelps - 69.0.3-3 +- Bump release to rebuild and resolve python3dist provides issue + * Mon Mar 11 2024 Andrew Phelps - 69.0.3-2 - Change Requires from python3-devel to python3 - Add BuildRequires to fix regular package build + * Tue Feb 13 2024 Andrew Phelps - 69.0.3-1 - License verified - Original version for CBL-Mariner diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 7d322bdbf02..533c5f7f89e 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -243,8 +243,8 @@ unzip-6.0-20.azl3.aarch64.rpm python3-3.12.3-2.azl3.aarch64.rpm python3-devel-3.12.3-2.azl3.aarch64.rpm python3-libs-3.12.3-2.azl3.aarch64.rpm -python3-setuptools-69.0.3-2.azl3.noarch.rpm -python3-pygments-2.7.4-1.azl3.noarch.rpm +python3-setuptools-69.0.3-3.azl3.noarch.rpm +python3-pygments-2.7.4-2.azl3.noarch.rpm which-2.21-8.azl3.aarch64.rpm libselinux-3.6-3.azl3.aarch64.rpm slang-2.3.3-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 07c6bfac5a5..f1cae66a4f5 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -243,8 +243,8 @@ unzip-6.0-20.azl3.x86_64.rpm python3-3.12.3-2.azl3.x86_64.rpm python3-devel-3.12.3-2.azl3.x86_64.rpm python3-libs-3.12.3-2.azl3.x86_64.rpm -python3-setuptools-69.0.3-2.azl3.noarch.rpm -python3-pygments-2.7.4-1.azl3.noarch.rpm +python3-setuptools-69.0.3-3.azl3.noarch.rpm +python3-pygments-2.7.4-2.azl3.noarch.rpm which-2.21-8.azl3.x86_64.rpm libselinux-3.6-3.azl3.x86_64.rpm slang-2.3.3-1.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index d0ee51c144b..78bd63004bc 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -548,10 +548,10 @@ python3-markupsafe-2.1.3-1.azl3.aarch64.rpm python3-newt-0.52.23-1.azl3.aarch64.rpm python3-packaging-23.2-3.azl3.noarch.rpm python3-pip-24.0-1.azl3.noarch.rpm -python3-pygments-2.7.4-1.azl3.noarch.rpm +python3-pygments-2.7.4-2.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.aarch64.rpm python3-rpm-generators-14-11.azl3.noarch.rpm -python3-setuptools-69.0.3-2.azl3.noarch.rpm +python3-setuptools-69.0.3-3.azl3.noarch.rpm python3-test-3.12.3-2.azl3.aarch64.rpm python3-tools-3.12.3-2.azl3.aarch64.rpm python3-wheel-0.43.0-1.azl3.noarch.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index cb134e6ce1c..8fa3a83035f 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -554,10 +554,10 @@ python3-markupsafe-2.1.3-1.azl3.x86_64.rpm python3-newt-0.52.23-1.azl3.x86_64.rpm python3-packaging-23.2-3.azl3.noarch.rpm python3-pip-24.0-1.azl3.noarch.rpm -python3-pygments-2.7.4-1.azl3.noarch.rpm +python3-pygments-2.7.4-2.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.x86_64.rpm python3-rpm-generators-14-11.azl3.noarch.rpm -python3-setuptools-69.0.3-2.azl3.noarch.rpm +python3-setuptools-69.0.3-3.azl3.noarch.rpm python3-test-3.12.3-2.azl3.x86_64.rpm python3-tools-3.12.3-2.azl3.x86_64.rpm python3-wheel-0.43.0-1.azl3.noarch.rpm diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index 8f4ed9dcbe2..e170baaab2f 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -591,6 +591,10 @@ chroot_and_install_rpms python-packaging python3-packaging build_rpm_in_chroot_no_install python-packaging chroot_and_install_rpms python-packaging python3-packaging +# Now that python-packaging is built, re-build pygments and setuptools to re-evaluate auto-generated provides +build_rpm_in_chroot_no_install python-pygments +build_rpm_in_chroot_no_install python-setuptools + # python3-lxml requires python3-Cython and libxslt build_rpm_in_chroot_no_install Cython chroot_and_install_rpms python3-Cython From b1414f10768b1244d472195727ad28ec55846e72 Mon Sep 17 00:00:00 2001 From: Andrew Phelps Date: Tue, 3 Sep 2024 21:02:34 +0000 Subject: [PATCH 3/3] remove second install for python-packaging --- toolkit/scripts/toolchain/build_official_toolchain_rpms.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh index e170baaab2f..35eb91499f4 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -589,7 +589,6 @@ build_rpm_in_chroot_no_install python-packaging chroot_and_install_rpms python-packaging python3-packaging # rebuild python-packaging to resolve circular dependency build_rpm_in_chroot_no_install python-packaging -chroot_and_install_rpms python-packaging python3-packaging # Now that python-packaging is built, re-build pygments and setuptools to re-evaluate auto-generated provides build_rpm_in_chroot_no_install python-pygments