diff --git a/.github/workflows/go-test-coverage.yml b/.github/workflows/go-test-coverage.yml index d27690013ba..3914ac243e9 100644 --- a/.github/workflows/go-test-coverage.yml +++ b/.github/workflows/go-test-coverage.yml @@ -86,7 +86,7 @@ jobs: sudo env "PATH=$PATH" make go-test-coverage - name: Upload test coverage - uses: actions/upload-artifact@v2.1.4 + uses: actions/upload-artifact@v4 with: name: TestCoverage path: toolkit/out/tools/test_coverage_report.html diff --git a/.github/workflows/lint-specs.yml b/.github/workflows/lint-specs.yml index 1138c423065..c20f17d49af 100644 --- a/.github/workflows/lint-specs.yml +++ b/.github/workflows/lint-specs.yml @@ -95,7 +95,7 @@ jobs: fi exit 0 - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v4 if: ${{ always() }} with: name: linted_specs diff --git a/SPECS/nbdkit/nbdkit.spec b/SPECS/nbdkit/nbdkit.spec index 4ed1738f277..e2029d37d2f 100644 --- a/SPECS/nbdkit/nbdkit.spec +++ b/SPECS/nbdkit/nbdkit.spec @@ -51,7 +51,7 @@ Distribution: Azure Linux Name: nbdkit Version: 1.35.3 -Release: 5%{?dist} +Release: 6%{?dist} Summary: NBD server License: BSD @@ -110,7 +110,7 @@ BuildRequires: %{_bindir}/certtool BuildRequires: %{_bindir}/cut BuildRequires: expect BuildRequires: %{_bindir}/hexdump -BuildRequires: /sbin/ip +BuildRequires: %{_sbindir}/ip BuildRequires: jq BuildRequires: %{_bindir}/nbdcopy BuildRequires: %{_bindir}/nbdinfo @@ -120,7 +120,7 @@ BuildRequires: %{_bindir}/qemu-io BuildRequires: %{_bindir}/qemu-nbd BuildRequires: /sbin/sfdisk BuildRequires: %{_bindir}/socat -BuildRequires: /sbin/ss +BuildRequires: %{_sbindir}/ss BuildRequires: %{_bindir}/stat %endif @@ -1195,6 +1195,9 @@ export LIBGUESTFS_TRACE=1 %changelog +* Thu Aug 29 2024 Pawel Winogrodzki - 1.35.3-6 +- Fixed test-time dependencies to match correct AZL paths. + * Thu May 02 2024 Mykhailo Bykhovtsev - 1.35.3-5 - Upgraded ocaml dependency to 5.1.1 diff --git a/SPECS/nghttp2/nghttp2.spec b/SPECS/nghttp2/nghttp2.spec index 5dfe0407ee7..f9c40beeddb 100644 --- a/SPECS/nghttp2/nghttp2.spec +++ b/SPECS/nghttp2/nghttp2.spec @@ -1,7 +1,7 @@ Summary: nghttp2 is an implementation of HTTP/2 and its header compression algorithm, HPACK. Name: nghttp2 Version: 1.61.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -11,7 +11,7 @@ Source0: https://github.com/nghttp2/nghttp2/releases/download/v%{version} BuildRequires: gcc BuildRequires: make %if 0%{?with_check} -BuildRequires: cunit +BuildRequires: CUnit %endif Provides: libnghttp2 = %{version}-%{release} @@ -59,6 +59,9 @@ find %{buildroot} -type f -name "*.la" -delete -print %{_libdir}/pkgconfig/*.pc %changelog +* Thu Aug 29 2024 Pawel Winogrodzki - 1.61.0-2 +- Fix test-time dependency on CUnit. + * Thu Aug 08 2024 Muhammad Falak - 1.61.0-1 - Upgrade version to 1.61.0 to address CVE-2024-28182 diff --git a/SPECS/ocaml-base/ocaml-base.spec b/SPECS/ocaml-base/ocaml-base.spec index 4dfe483329b..5f9089cfe51 100644 --- a/SPECS/ocaml-base/ocaml-base.spec +++ b/SPECS/ocaml-base/ocaml-base.spec @@ -6,7 +6,7 @@ Summary: Jane Street standard library for OCaml Name: ocaml-%{srcname} Version: 0.16.3 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -22,9 +22,7 @@ BuildRequires: ocaml-sexplib0-devel >= 0.16 %if %{with_check} BuildRequires: ocaml-num-devel -BuildRequires: ocaml-ppx-jane-devel BuildRequires: ocaml-sexplib-devel -BuildRequires: ocaml-stdio-devel BuildRequires: ocaml-uutf-devel %endif @@ -66,6 +64,9 @@ developing applications that use %{name}. %files devel -f .ofiles-devel %changelog +* Thu Aug 29 2024 Andrew Phelps - 0.16.3-2 +- Remove unneeded test dependencies + * Wed May 01 2024 Mykhailo Bykhovtsev - 0.16.3-1 - Converted spec file to match with Fedora 41. - Upgrade to 0.16.3 diff --git a/SPECS/ocaml-cinaps/ocaml-cinaps.spec b/SPECS/ocaml-cinaps/ocaml-cinaps.spec index ab233621ac8..ba47f945152 100644 --- a/SPECS/ocaml-cinaps/ocaml-cinaps.spec +++ b/SPECS/ocaml-cinaps/ocaml-cinaps.spec @@ -3,7 +3,7 @@ Summary: Trivial Metaprogramming tool using the OCaml toplevel Name: ocaml-%{srcname} Version: 0.15.1 -Release: 4%{?dist} +Release: 5%{?dist} License: MIT Vendor: Microsoft Corporation Distribution: Azure Linux @@ -15,10 +15,6 @@ BuildRequires: ocaml >= 5.1.1 BuildRequires: ocaml-dune >= 2.0.0 BuildRequires: ocaml-re-devel >= 1.8.0 -%if %{with_check} -BuildRequires: ocaml-ppx-jane-devel -%endif - %description Cinaps is a trivial Metaprogramming tool for OCaml using the OCaml toplevel. @@ -54,9 +50,6 @@ mkdir -p %{buildroot}%{_mandir}/man1 help2man -N --version-string=%{version} %{buildroot}%{_bindir}/cinaps > \ %{buildroot}%{_mandir}/man1/cinaps.1 -%check -%dune_check - %files -f .ofiles %doc README.org %license LICENSE.md @@ -65,6 +58,9 @@ help2man -N --version-string=%{version} %{buildroot}%{_bindir}/cinaps > \ %files devel -f .ofiles-devel %changelog +* Thu Aug 29 2024 Andrew Phelps - 0.15.1-5 +- Disable check section until missing dependency is available (ocaml-ppx-jane-devel) + * Fri May 03 2024 Mykhailo Bykhovtsev - 0.15.1-4 - Converted spec file to match with Fedora 41. - Rebuild with ocaml >= 5.1.1 diff --git a/SPECS/ocaml-sexplib/ocaml-sexplib.spec b/SPECS/ocaml-sexplib/ocaml-sexplib.spec index 8cb3b33910a..5f7e16aa1cb 100644 --- a/SPECS/ocaml-sexplib/ocaml-sexplib.spec +++ b/SPECS/ocaml-sexplib/ocaml-sexplib.spec @@ -6,7 +6,7 @@ Name: ocaml-%{srcname} Version: 0.16.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Automated S-expression conversion # The project as a whole is MIT, but code in the src subdirectory is BSD. License: MIT and BSD @@ -24,11 +24,6 @@ BuildRequires: vim-rpm-macros %if %{with_check} BuildRequires: ocaml-base-devel -BuildRequires: ocaml-base-quickcheck-devel -BuildRequires: ocaml-core-kernel-devel -BuildRequires: ocaml-expect-test-helpers-core-devel -BuildRequires: ocaml-ppx-jane-devel -BuildRequires: ocaml-sexp-grammar-validation-devel %endif %description @@ -80,6 +75,9 @@ cp -p vim/syntax/sexplib.vim %{buildroot}%{vimfiles_root}/syntax %{vimfiles_root}/syntax/sexplib.vim %changelog +* Thu Aug 29 2024 Andrew Phelps - 0.16.0-2 +- Remove unneeded test dependencies + * Wed May 01 2024 Mykhailo Bykhovtsev - 0.16.0-1 - Converted spec file to match with Fedora 41. - Upgrade to 0.16.0 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/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 12e3e8c53b1..754b2681ebe 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -194,7 +194,7 @@ libsolv-devel-0.7.28-1.azl3.aarch64.rpm libssh2-1.11.0-1.azl3.aarch64.rpm libssh2-devel-1.11.0-1.azl3.aarch64.rpm krb5-1.21.3-1.azl3.aarch64.rpm -nghttp2-1.61.0-1.azl3.aarch64.rpm +nghttp2-1.61.0-2.azl3.aarch64.rpm curl-8.8.0-1.azl3.aarch64.rpm curl-devel-8.8.0-1.azl3.aarch64.rpm curl-libs-8.8.0-1.azl3.aarch64.rpm @@ -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 @@ -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 26fc63bbaab..eb8a7ff5159 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -194,7 +194,7 @@ libsolv-devel-0.7.28-1.azl3.x86_64.rpm libssh2-1.11.0-1.azl3.x86_64.rpm libssh2-devel-1.11.0-1.azl3.x86_64.rpm krb5-1.21.3-1.azl3.x86_64.rpm -nghttp2-1.61.0-1.azl3.x86_64.rpm +nghttp2-1.61.0-2.azl3.x86_64.rpm curl-8.8.0-1.azl3.x86_64.rpm curl-devel-8.8.0-1.azl3.x86_64.rpm curl-libs-8.8.0-1.azl3.x86_64.rpm @@ -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 @@ -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 3c2d270fdd0..f1fff2471d4 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -275,9 +275,9 @@ newt-0.52.23-1.azl3.aarch64.rpm newt-debuginfo-0.52.23-1.azl3.aarch64.rpm newt-devel-0.52.23-1.azl3.aarch64.rpm newt-lang-0.52.23-1.azl3.aarch64.rpm -nghttp2-1.61.0-1.azl3.aarch64.rpm -nghttp2-debuginfo-1.61.0-1.azl3.aarch64.rpm -nghttp2-devel-1.61.0-1.azl3.aarch64.rpm +nghttp2-1.61.0-2.azl3.aarch64.rpm +nghttp2-debuginfo-1.61.0-2.azl3.aarch64.rpm +nghttp2-devel-1.61.0-2.azl3.aarch64.rpm ninja-build-1.11.1-1.azl3.aarch64.rpm ninja-build-debuginfo-1.11.1-1.azl3.aarch64.rpm npth-1.6-4.azl3.aarch64.rpm @@ -546,12 +546,12 @@ 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-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 66c2e792582..08416451348 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -281,9 +281,9 @@ newt-0.52.23-1.azl3.x86_64.rpm newt-debuginfo-0.52.23-1.azl3.x86_64.rpm newt-devel-0.52.23-1.azl3.x86_64.rpm newt-lang-0.52.23-1.azl3.x86_64.rpm -nghttp2-1.61.0-1.azl3.x86_64.rpm -nghttp2-debuginfo-1.61.0-1.azl3.x86_64.rpm -nghttp2-devel-1.61.0-1.azl3.x86_64.rpm +nghttp2-1.61.0-2.azl3.x86_64.rpm +nghttp2-debuginfo-1.61.0-2.azl3.x86_64.rpm +nghttp2-devel-1.61.0-2.azl3.x86_64.rpm ninja-build-1.11.1-1.azl3.x86_64.rpm ninja-build-debuginfo-1.11.1-1.azl3.x86_64.rpm npth-1.6-4.azl3.x86_64.rpm @@ -552,12 +552,12 @@ 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-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 bedd4d8cd21..35eb91499f4 100755 --- a/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh +++ b/toolkit/scripts/toolchain/build_official_toolchain_rpms.sh @@ -587,6 +587,12 @@ 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 + +# 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