Merge branch '3.0-dev' into 3.0

.config/CredScanSuppressions.json

@@ -19,11 +19,11 @@
         },
         {
             "file": "\\toolkit\\docs\\quick_start\\quickstart.md",
-            "_justification": "Secrets for sample, non-production Mariner images."
+            "_justification": "Secrets for sample, non-production Azure Linux images."
         },
         {
             "file": "\\toolkit\\imageconfigs\\read-only-root-efi.json",
-            "_justification": "Secret for a sample, non-production Mariner image."
+            "_justification": "Secret for a sample, non-production Azure Linux image."
         }
     ]
 }

.github/CODEOWNERS

@@ -1,4 +1,4 @@
-# By default, all files require a review by at least one member of the CBL-Mariner developers team.
+# By default, all files require a review by at least one member of the Azure Linux developers team.
 # See teams here: https://github.com/orgs/microsoft/teams?query=mariner
 * @microsoft/cbl-mariner-devs
 
@@ -70,10 +70,10 @@
 # Modifications to the toolkit requires reviews from the toolkit team
 /toolkit/ @microsoft/cbl-mariner-tooling
 
-# Docs to be reviewed by general CBL-Mariner devs
+# Docs to be reviewed by general Azure Linux devs
 /toolkit/docs/ @microsoft/cbl-mariner-devs
 
-# Default image configurations to be reviewed by general CBL-Mariner devs
+# Default image configurations to be reviewed by general Azure Linux devs
 /toolkit/imageconfigs/ @microsoft/cbl-mariner-devs
 
 # Package and toolchain manifests to be reviewed by toolchain team

.github/workflows/mariner-spec-cleaner.patch → .github/workflows/azurelinux-spec-cleaner.patch

@@ -98,7 +98,7 @@ index 0000000..9577d23
 +
 +steps:
 +- bash: |
-+    git diff --diff-algorithm=minimal $(git rev-parse refs/tags/$(upstreamTag))..HEAD > $(Build.ArtifactStagingDirectory)/mariner-spec-cleaner.patch
++    git diff --diff-algorithm=minimal $(git rev-parse refs/tags/$(upstreamTag))..HEAD > $(Build.ArtifactStagingDirectory)/azurelinux-spec-cleaner.patch
 +
 +- task: PublishBuildArtifacts@1
 +  inputs:
@@ -212,7 +212,7 @@ index e89d188..b4e231d 100644
 -[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/rpm-software-management/spec-cleaner.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/rpm-software-management/spec-cleaner/context:python)
 -[![pre-commit](https://img.shields.io/badge/pre--commit-enabled-brightgreen?logo=pre-commit&logoColor=white)](https://github.com/pre-commit/pre-commit)
 -[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
-+spec-cleaner is a tool that cleans the given RPM spec file according to the Mariner style and returns the result.
++spec-cleaner is a tool that cleans the given RPM spec file according to the Azure Linux style and returns the result.
 
 -
 -spec-cleaner is a tool that cleans the given RPM spec file according to the style guide and returns the result.
@@ -10682,11 +10682,11 @@ index c701543..326c724 100644
 -    """
      parser = argparse.ArgumentParser(
 -        prog='spec-cleaner',
-+        prog='mariner-spec-cleaner',
++        prog='azurelinux-spec-cleaner',
          formatter_class=argparse.ArgumentDefaultsHelpFormatter,
 -        description='Cleans the given spec file according to style guide and returns the result. If "#nospeccleaner"'
 -        'tag is used in the spec file than the spec file will not be cleaned.',
-+        description='Cleans the given spec file according to the Mariner style guide and returns the result.'
++        description='Cleans the given spec file according to the Azure Linux style guide and returns the result.'
 +        'If "#nospeccleaner" tag is used in the spec file, then the spec file will not be cleaned.',
      )
 
@@ -11579,7 +11579,7 @@ index 9e2490c..64bfd8d 100644
              'summary': self.reg.re_summary,
              # for url we have a special match - http -> https replacement
 +            # for vendor, we force it to match "Microsoft"
-+            # for distribution, we force it to match "Mariner"
++            # for distribution, we force it to match "Azure Linux"
              'group': self.reg.re_group,
              'nosource': self.reg.re_nosource,
              # for source, we have a special match to keep the source number
@@ -11794,7 +11794,7 @@ index 9e2490c..64bfd8d 100644
 +            self._add_line_value_to('vendor', 'Microsoft Corporation', key='Vendor')
 +
 +        elif self.reg.re_distribution.match(line):
-+            self._add_line_value_to('distribution', 'Mariner', key='Distribution')
++            self._add_line_value_to('distribution', 'Azure Linux', key='Distribution')
 +
          elif self.reg.re_source.match(line):
              match = self.reg.re_source.match(line)
@@ -21672,7 +21672,7 @@ index 54715dc..0000000
 -NOTE:
 -
 -To make sure your perldoc/Pod viewing setup for viewing this page is
--working: The six-letter word "r�sum�" should look like "resume" with an "/"
+-working: The six-letter word "résumé" should look like "resume" with an "/"
 -accent on each "e".
 -
 -For further tests, and help if that doesn't work, see below, A POD ENCODING

.github/workflows/check-signatures.yml

@@ -0,0 +1,51 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+
+name: Signature files check
+
+on:
+  push:
+    branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*]
+  pull_request:
+    branches: [main, dev, 1.0*, 2.0*, 3.0*, fasttrack/*]
+
+jobs:
+  spec-check:
+    name: Signature files check
+    runs-on: ubuntu-latest
+
+    steps:
+      # Checkout the branch of our repo that triggered this action
+      - name: Workflow trigger checkout
+        uses: actions/checkout@v4
+
+      # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
+      - name: Setup Python 3.9
+        uses: actions/setup-python@v4
+        with:
+          python-version: 3.9
+
+      - name: Get Python dependencies
+        run: python3 -m pip install -r toolkit/scripts/requirements.txt
+
+      - name: Get base commit for PRs
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          git fetch origin ${{ github.base_ref }}
+          echo "base_sha=$(git rev-parse origin/${{ github.base_ref }})" >> $GITHUB_ENV
+          echo "Merging ${{ github.sha }} into ${{ github.base_ref }}"
+
+      - name: Get base commit for Pushes
+        if: ${{ github.event_name == 'push' }}
+        run: |
+          git fetch origin ${{ github.event.before }}
+          echo "base_sha=${{ github.event.before }}" >> $GITHUB_ENV
+          echo "Merging ${{ github.sha }} into ${{ github.event.before }}"
+
+      - name: Check the signatures
+        run: |
+          echo "Files changed: '$(git diff-tree --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }})'"
+          changed_folders=$(dirname $(git diff-tree --diff-filter=d --no-commit-id --name-only -r ${{ env.base_sha }} ${{ github.sha }}) | sort --unique)
+          echo "Folders to validate: '${changed_folders}'"
+          
+          python3 toolkit/scripts/check_signatures.py ${changed_folders}

.github/workflows/lint-specs.yml

@@ -51,26 +51,26 @@ jobs:
           path: 'main-checkout'
 
       # Our linter is based on the spec-cleaner tool from the folks at openSUSE
-      # We apply a patch to modify it for CBL-Mariner's needs
+      # We apply a patch to modify it for Azure Linux's needs
       - name: spec-cleaner checkout
         uses: actions/checkout@v4
         with:
           repository: 'rpm-software-management/spec-cleaner'
           ref: 'spec-cleaner-1.2.0'
           path: 'spec-cleaner'
 
-      # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
+      # For consistency, we use the same major/minor version of Python that Azure Linux ships
       - name: Setup Python 3.7
         uses: actions/setup-python@v4
         with:
           python-version: 3.7
 
       # We take our version of the linting tool from the master branch to ensure rules
       # are consistent across all branches
-      - name: Patch spec-cleaner with Mariner-specific lints
+      - name: Patch spec-cleaner with Azure Linux-specific lints
         run: |
           pushd spec-cleaner
-          git apply ../main-checkout/.github/workflows/mariner-spec-cleaner.patch
+          git apply ../main-checkout/.github/workflows/azurelinux-spec-cleaner.patch
           popd
 
       - name: Install patched spec-cleaner

.github/workflows/overwrite_shell_link.sh

@@ -13,7 +13,7 @@ fi
 
 if [[ "$original_rpm_shell" != "bash" ]]
 then
-  echo "Host system's '$shell_link_path' links to '$original_rpm_shell'. Mariner specs require 'bash' - updating."
+  echo "Host system's '$shell_link_path' links to '$original_rpm_shell'. Azure Linux specs require 'bash' - updating."
 
   sudo rm -f $shell_link_path
   sudo ln -s bash "$shell_link_path"

.github/workflows/validate-cg-manifest.sh

@@ -39,7 +39,7 @@ ignore_no_source_tarball=" \
   initramfs \
   javapackages-tools-meta \
   kde-filesystem \
-  kf5 \
+  kf \
   livepatching \
   lua-rpm-macros \
   azurelinux-repos \
@@ -48,7 +48,8 @@ ignore_no_source_tarball=" \
   opencl-filesystem \
   patterns-ceph-containers \
   pyproject-rpm-macros \
-  qt5-rpm-macros \
+  python-rpm-generators \
+  qt-rpm-macros \
   sgx-backwards-compatability \
   verity-read-only-root \
   web-assets \
@@ -62,18 +63,19 @@ ignore_known_issues=" \
 alt_source_tag="Source9999"
 
 function prepare_lua {
-  local -a dirs_to_check
   local azl_lua_dir
   local azl_srpm_lua_dir
-  local lua_common_file_name
-  local lua_forge_file_name
+  local lua_common_path
+  local lua_forge_path
+  local lua_python_path
   local rpm_lua_dir
   local rpm_macros_dir
 
   rpm_macros_dir="$1"
 
-  lua_common_file_name="common.lua"
-  lua_forge_file_name="forge.lua"
+  lua_common_path="common.lua"
+  lua_forge_path="srpm/forge.lua"
+  lua_python_path="srpm/python.lua"
   rpm_lua_dir="$(rpm --eval "%_rpmluadir")"
   azl_lua_dir="$rpm_lua_dir/azl"
   azl_srpm_lua_dir="$azl_lua_dir/srpm"
@@ -85,8 +87,7 @@ function prepare_lua {
   fi
 
   # We only want to clean-up directories, which were absent from the system.
-  dirs_to_check=("$rpm_lua_dir" "$azl_lua_dir" "$azl_srpm_lua_dir")
-  for dir_path in "${dirs_to_check[@]}"
+  for dir_path in "$rpm_lua_dir" "$azl_lua_dir" "$azl_srpm_lua_dir"
   do
     if [[ ! -d "$dir_path" ]]
     then
@@ -96,17 +97,15 @@ function prepare_lua {
   done
   sudo mkdir -p "$azl_srpm_lua_dir"
 
-  if [[ ! -f "$azl_lua_dir/$lua_common_file_name" ]]
-  then
-    sudo cp "$rpm_macros_dir/$lua_common_file_name" "$azl_lua_dir/$lua_common_file_name"
-    FILES_TO_CLEAN_UP+=("$azl_lua_dir/$lua_common_file_name")
-  fi
-
-  if [[ ! -f "$azl_srpm_lua_dir/$lua_forge_file_name" ]]
-  then
-    sudo cp "$rpm_macros_dir/$lua_forge_file_name" "$azl_srpm_lua_dir/$lua_forge_file_name"
-    FILES_TO_CLEAN_UP+=("$azl_srpm_lua_dir/$lua_forge_file_name")
-  fi
+  for file_path in "$lua_common_path" "$lua_forge_path" "$lua_python_path"
+  do
+    system_lua_path="$azl_lua_dir/$file_path"
+    if [[ ! -f "$system_lua_path" ]]
+    then
+      sudo cp "$rpm_macros_dir/$(basename "$file_path")" "$system_lua_path"
+      FILES_TO_CLEAN_UP+=("$system_lua_path")
+    fi
+  done
 }
 
 function specs_dir_from_spec_path {

README.md

@@ -22,7 +22,6 @@ Instructions for building Azure Linux may be found here: [Toolkit Documentation]
 You can try Azure Linux with the following ISO images:
 
 - [Mariner 2.0 x86_64 ISO](https://aka.ms/mariner-2.0-x86_64-iso).
-- [Mariner 1.0 x86_64 ISO](https://aka.ms/mariner-1.0-x86_64-iso).
 
 Before using a downloaded ISO, [verify the checksum and signature of the image](toolkit/docs/security/iso-image-verification.md).
 
@@ -33,7 +32,7 @@ Note: Support for the ISO is community based. Before filing a new bug or feature
 
 ## Getting Help
 - Bugs, feature requests and questions can be filed as GitHub issues.
-- We are starting a public community call for Mariner users to get together and discuss new features, provide feedback, and learn more about how others are using Mariner. In each session, we will feature a new demo. The schedule for the upcoming community calls are:
+- We are starting a public community call for Azure Linux users to get together and discuss new features, provide feedback, and learn more about how others are using Azure Linux. In each session, we will feature a new demo. The schedule for the upcoming community calls are:
 - 1/25/24 from 8-9am (PST) [Click to join](https://teams.microsoft.com/l/meetup-join/19%3ameeting_NGM1YWZiMDMtYWZkZi00NzBmLWExNjgtM2RkMjFmYTNiYmU2%40thread.v2/0?context=%7b%22Tid%22%3a%2272f988bf-86f1-41af-91ab-2d7cd011db47%22%2c%22Oid%22%3a%2230697089-15b8-4c68-b67e-7db9cd4f02ea%22%7d) 
 - 3/28/24 from 8-9am (PST) [Click to join](https://teams.microsoft.com/l/meetup-join/19%3ameeting_NGM1YWZiMDMtYWZkZi00NzBmLWExNjgtM2RkMjFmYTNiYmU2%40thread.v2/0?context=%7b%22Tid%22%3a%2272f988bf-86f1-41af-91ab-2d7cd011db47%22%2c%22Oid%22%3a%2230697089-15b8-4c68-b67e-7db9cd4f02ea%22%7d) 
 - 5/23/24 from 8-9am (PST) [Click to join](https://teams.microsoft.com/l/meetup-join/19%3ameeting_NGM1YWZiMDMtYWZkZi00NzBmLWExNjgtM2RkMjFmYTNiYmU2%40thread.v2/0?context=%7b%22Tid%22%3a%2272f988bf-86f1-41af-91ab-2d7cd011db47%22%2c%22Oid%22%3a%2230697089-15b8-4c68-b67e-7db9cd4f02ea%22%7d) 

SPECS-EXTENDED/buildah/buildah.spec

@@ -21,7 +21,7 @@
 Summary:        A command line tool used for creating OCI Images
 Name:           buildah
 Version:        1.18.0
-Release:        23%{?dist}
+Release:        24%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -32,7 +32,7 @@ BuildRequires:  btrfs-progs-devel
 BuildRequires:  device-mapper-devel
 BuildRequires:  git
 BuildRequires:  glib2-devel
-BuildRequires:  glibc-static >= 2.38-2%{?dist}
+BuildRequires:  glibc-static >= 2.38-3%{?dist}
 BuildRequires:  go-md2man
 BuildRequires:  go-rpm-macros
 BuildRequires:  golang
@@ -123,6 +123,9 @@ cp imgtype %{buildroot}/%{_bindir}/%{name}-imgtype
 %{_datadir}/%{name}/test
 
 %changelog
+* Mon Mar 11 2024 Dan Streetman <[email protected]> - 1.18.0-24
+- update to build dep latest glibc-static version
+
 * Tue Feb 27 2024 Dan Streetman <[email protected]> - 1.18.0-23
 - updated glibc-static buildrequires release
 

SPECS-EXTENDED/cassandra/Readme

@@ -2,7 +2,7 @@
 # apply pre-downloaded cassandra-build-cache which is
 # required for cassandra to build based on ant build.xml
 # Generate cassandra-build-cache when ever update to latest version.
-1. Boot up Mariner Core 2.0
+1. Boot up Azure Linux Core
 2. Refer to cassandra spec and install all build required dependenices.
 3. Download cassandra sources and extract under /usr/src
 4. cd /usr/src/apache-cassandra-<version>-src

SPECS-EXTENDED/catatonit/catatonit.spec

@@ -3,7 +3,7 @@ Distribution:   Azure Linux
 
 Name: catatonit
 Version: 0.1.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 Summary: A signal-forwarding process manager for containers
 License: GPLv3+
 URL: https://github.com/openSUSE/catatonit
@@ -13,7 +13,7 @@ BuildRequires: automake
 BuildRequires: file
 BuildRequires: gcc
 BuildRequires: git
-BuildRequires: glibc-static >= 2.38-2%{?dist}
+BuildRequires: glibc-static >= 2.38-3%{?dist}
 BuildRequires: libtool
 BuildRequires: make
 
@@ -61,6 +61,9 @@ ln -s %{_libexecdir}/%{name}/%{name} %{buildroot}%{_libexecdir}/podman/%{name}
 %{_libexecdir}/podman/%{name}
 
 %changelog
+* Mon Mar 11 2024 Dan Streetman <[email protected]> - 0.1.7-12
+- update to build dep latest glibc-static version
+
 * Tue Feb 27 2024 Dan Streetman <[email protected]> - 0.1.7-11
 - updated glibc-static buildrequires release
 

SPECS-EXTENDED/dyninst/dyninst.spec

@@ -1,7 +1,7 @@
 Summary: An API for Run-time Code Generation
 License: LGPLv2+
 Name: dyninst
-Release: 13%{?dist}
+Release: 14%{?dist}
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL: http://www.dyninst.org
@@ -31,7 +31,7 @@ BuildRequires: tbb tbb-devel
 
 # Extra requires just for the testsuite
 BuildRequires: gcc-gfortran libstdc++-static libxml2-devel
-BuildRequires: glibc-static >= 2.38-2%{?dist}
+BuildRequires: glibc-static >= 2.38-3%{?dist}
 
 # Testsuite files should not provide/require anything
 %{?filter_setup:
@@ -194,6 +194,9 @@ echo "%{_libdir}/dyninst" > %{buildroot}/etc/ld.so.conf.d/%{name}-%{_arch}.conf
 %attr(644,root,root) %{_libdir}/dyninst/testsuite/*.a
 
 %changelog
+* Mon Mar 11 2024 Dan Streetman <[email protected]> - 10.1.0-14
+- update to build dep latest glibc-static version
+
 * Tue Feb 27 2024 Dan Streetman <[email protected]> - 10.1.0-13
 - updated glibc-static buildrequires release