Detailed rebranding Part 2 (microsoft#8238)

archana25-ms · Mar 8, 2024 · 0d4f13f · 0d4f13f
1 parent c758c84
commit 0d4f13f
Show file tree

Hide file tree

Showing 103 changed files with 256 additions and 230 deletions.
diff --git a/.config/CredScanSuppressions.json b/.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."
         }
     ]
 }
diff --git a/.github/CODEOWNERS b/.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

diff --git a/.github/workflows/mariner-spec-cleaner.patch → ...b/workflows/azurelinux-spec-cleaner.patch b/.github/workflows/mariner-spec-cleaner.patch → ...b/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

diff --git a/.github/workflows/lint-specs.yml b/.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

diff --git a/.github/workflows/overwrite_shell_link.sh b/.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"

diff --git a/README.md b/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) 

diff --git a/SPECS-EXTENDED/cassandra/Readme b/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

diff --git a/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec b/SPECS-SIGNED/grub2-efi-binary-signed/grub2-efi-binary-signed.spec
@@ -12,7 +12,7 @@
 Summary:        Signed GRand Unified Bootloader for %{buildarch} systems
 Name:           grub2-efi-binary-signed-%{buildarch}
 Version:        2.06
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -77,6 +77,9 @@ cp %{SOURCE3} %{buildroot}/boot/efi/EFI/BOOT/%{grubpxeefiname}
 /boot/efi/EFI/BOOT/%{grubpxeefiname}
 
 %changelog
+* Wed Mar 07 2024 Mykhailo Bykhovtsev <[email protected]> - 2.06-16
+- Bumping release version to match with `grub2` release version
+
 * Tue Mar 05 2024 Cameron Baird <[email protected]> - 2.06-15
 - Bump release number to match grub release number
 

diff --git a/SPECS/ca-certificates/ca-certificates.signatures.json b/SPECS/ca-certificates/ca-certificates.signatures.json
@@ -10,7 +10,7 @@
     "README.src": "86184318d451bec55d70c84e618cbfe10c8adb7dc893964ce4aaecff99d83433",
     "README.usr": "0d2e90b6cf575678cd9d4f409d92258ef0d676995d4d733acdb2425309a38ff8",
     "bundle2pem.sh": "a61e0d9f34e21456cfe175e9a682f56959240e66dfeb75bd2457226226aa413a",
-    "certdata.base.txt": "5ce20c9e9542ebc1cc27a0a18de8bb37b91354d898462a18563aba372f646198",
+    "certdata.base.txt": "7622cbc7245e7a8a17c6b3dd448976748ea99d3c7d68f460ea835a59aab30e12",
     "certdata.microsoft.txt": "8eea04b31e73f9e64040a2d905b02f05dc4c6f2e9964919f5921a31c1ace0d02",
     "certdata2pem.py": "4f5848c14210758f19ab9fdc9ffd83733303a48642a3d47c4d682f904fdc0f33",
     "pem2bundle.sh": "f96a2f0071fb80e30332c0bd95853183f2f49a3c98d5e9fc4716aeeb001e3426",

diff --git a/SPECS/ca-certificates/ca-certificates.spec b/SPECS/ca-certificates/ca-certificates.spec
@@ -45,7 +45,7 @@ Name:           ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "prebuilt-ca-certificates*" packages as well.
 Epoch:          1
 Version:        3.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        MPLv2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -324,6 +324,9 @@ rm -f %{pkidir}/tls/certs/*.{0,pem}
 %{_bindir}/bundle2pem.sh
 
 %changelog
+* Wed Feb 28 2024 Mykhailo Bykhovtsev <[email protected]> - 3.0.0-3
+- Updated certdata.base.txt to replace CBL-Mariner with Azure Linux
+
 * Sat Jan 27 2024 CBL-Mariner Servicing Account <[email protected]> - 3.0.0-3
 - Updating Microsoft trusted root CAs.
 

diff --git a/SPECS/ca-certificates/certdata.base.txt b/SPECS/ca-certificates/certdata.base.txt
@@ -64,7 +64,7 @@ CKA_CLASS CK_OBJECT_CLASS CKO_NSS_BUILTIN_ROOT_LIST
 CKA_TOKEN CK_BBOOL CK_TRUE
 CKA_PRIVATE CK_BBOOL CK_FALSE
 CKA_MODIFIABLE CK_BBOOL CK_FALSE
-CKA_LABEL UTF8 "CBL-Mariner Builtin Roots"
+CKA_LABEL UTF8 "Azure Linux Builtin Roots"
 
 #
 # Certificate "Microsoft Azure TLS Issuing CA 01"

diff --git a/SPECS/calamares/calamares.spec b/SPECS/calamares/calamares.spec
@@ -7,7 +7,7 @@ Summary:        Installer from a live CD/DVD/USB to disk
 # https://github.com/calamares/calamares/issues/1051
 Name:           calamares
 Version:        3.3.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -221,6 +221,9 @@ install -p -m 644 %{SOURCE53} %{buildroot}%{_sysconfdir}/calamares/azl-eula
 %{_libdir}/libcalamaresui.so
 
 %changelog
+* Thu Mar 07 2024 Mykhailo Bykhovtsev <[email protected]> - 3.3.1-2
+- Updated reference to distro in patch file from "Mariner" to "Azure Linux"
+
 * Tue Jan 16 2024 Sam Meluch <[email protected]> - 3.3.1-1
 - Upgrade to version 3.3.1 for Azure Linux 3.0
 - Update patches to accomodate version 3.3.1

diff --git a/SPECS/calamares/round-to-full-disk-size.patch b/SPECS/calamares/round-to-full-disk-size.patch
@@ -5,7 +5,7 @@ diff -ru calamares-3.2.11-orig/src/modules/partition/jobs/CreatePartitionTableJo
          currentPartition[KeyFlags] = QJsonArray::fromStringList(PartitionTable::flagNames(PartitionInfo::flags(x)));
          currentPartition[KeyStart] = (x->firstByte() / MiBSize);
 
--        // Since Mariner installer does not use the last MiB,
+-        // Since Azure Linux installer does not use the last MiB,
 -        // we have to report additional 1MiB per partition end
 -        currentPartition[KeyEnd] = x->lastByte() / MiBSize + 1;
 +        // check if we're almost at capacity and set end to 0 in json (full size)
@@ -16,7 +16,7 @@ diff -ru calamares-3.2.11-orig/src/modules/partition/jobs/CreatePartitionTableJo
 +        }
 +        else
 +        {
-+            // Since Mariner installer does not use the last MiB,
++            // Since Azure Linux installer does not use the last MiB,
 +            // we have to report additional 1MiB per partition end
 +            currentPartition[KeyEnd] = x->lastByte() / MiBSize + 1;
 +        }

diff --git a/SPECS/emacs/CVE-2007-6109.nopatch b/SPECS/emacs/CVE-2007-6109.nopatch
@@ -4,7 +4,7 @@ The CVE is from 2007, the affected versions for it are below 22.1-r3as:
 - Vulnerable versions: <22.1-r3
 - Unaffected versions: >=22.1-r3, revision >=21.4-r14, <19
 
-Mariner’s main branch uses version 28.1
+Azure Linux's main branch uses version 28.1
 
 
 Reference: https://nvd.nist.gov/vuln/detail/CVE-2007-6109
diff --git a/SPECS/grub2/grub2.signatures.json b/SPECS/grub2/grub2.signatures.json
@@ -3,6 +3,6 @@
   "gnulib-d271f868a8df9bbec29049d01e056481b7a1a263.tar.gz": "4e23415ae2977ffca15e07419ceff3e9334d0369eafc9e7ae2578f8dd9a4839c",
   "grub-2.06.tar.gz": "660eaa2355a4045d8d0cdb5765169d1cad9912ec07873b86c9c6d55dbaa9dfca",
   "macros.grub2": "b03f6f713601214406971de53538dfc25136bf836f09a663eaffc4332a72c38b",
-  "sbat.csv.in": "11106562bccc09244f573be85ba2fe07cd1c830ef5bf3cc5e83a194c717880a5"
+  "sbat.csv.in": "0d06d0ae6064e0e01410281aa88050bf671dc23f7c490fbf1b56619c4d122e87"
  }
 }
diff --git a/SPECS/grub2/grub2.spec b/SPECS/grub2/grub2.spec
@@ -6,7 +6,7 @@
 Summary:        GRand Unified Bootloader
 Name:           grub2
 Version:        2.06
-Release:        15%{?dist}
+Release:        16%{?dist}
 License:        GPLv3+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -388,6 +388,9 @@ cp $GRUB_PXE_MODULE_SOURCE $EFI_BOOT_DIR/$GRUB_PXE_MODULE_NAME
 %config(noreplace) %{_sysconfdir}/grub.d/41_custom
 
 %changelog
+* Wed Mar 07 2024 Mykhailo Bykhovtsev <[email protected]> - 2.06-16
+- Updated sbat.csv.in to reflect new distro name.
+
 * Tue Mar 05 2024 Cameron Baird <[email protected]> - 2.06-15
 - Explicitly depend on systemd-udev for image install
 

diff --git a/SPECS/grub2/sbat.csv.in b/SPECS/grub2/sbat.csv.in
@@ -1,3 +1,3 @@
 sbat,1,SBAT Version,sbat,1,https://github.com/rhboot/shim/blob/main/SBAT.md
 grub,2,Free Software Foundation,grub,@@VERSION@@,https://www.gnu.org/software/grub/
-grub.mariner,2,Microsoft,grub2,@@VERSION_RELEASE@@,https://github.com/microsoft/CBL-Mariner
+grub.azurelinux,2,Microsoft,grub2,@@VERSION_RELEASE@@,https://github.com/microsoft/azurelinux
diff --git a/SPECS/iputils/ping_test_ipv6_localhost.patch b/SPECS/iputils/ping_test_ipv6_localhost.patch
@@ -3,7 +3,7 @@ From: Rachel Menge <[email protected]>
 Date: Fri, 18 Feb 2022 12:13:21 -0800
 Subject: [PATCH] Mark ping6 for localhost as expected failure
 
-Mariner does not map 'localhost' for ipv6 addresses
+Azure Linux does not map 'localhost' for ipv6 addresses
 ---
  test/ping/meson.build | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SPECS/librsync/librsync.spec b/SPECS/librsync/librsync.spec
@@ -63,7 +63,7 @@ make DESTDIR=%{buildroot} install
 
 %if 0%{?with_check}
 # install outside of DESTDIR to resolve test error:
-# /usr/src/mariner/BUILD/librsync-2.0.2/build/rdiff: error while loading shared libraries: librsync.so.2: cannot open shared object file: No such file or directory
+# /usr/src/azl/BUILD/librsync-2.0.2/build/rdiff: error while loading shared libraries: librsync.so.2: cannot open shared object file: No such file or directory
 make install
 %endif
 

diff --git a/SPECS/maven/maven_build_caches.sh b/SPECS/maven/maven_build_caches.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ## Helper script to generate maven build caches.
-## CBL-MARINER builds do not have access to internet when building rpms.
+## Azure Linux builds do not have access to internet when building rpms.
 ## Generating build cache as tarballs to be used when buidling offline.
 set -e
 

diff --git a/...ostree-converting-osname-to-mariner.patch → ...ree-converting-osname-to-azurelinux.patch b/...ostree-converting-osname-to-mariner.patch → ...ree-converting-osname-to-azurelinux.patch
@@ -26,7 +26,7 @@ index 976c4b5..263e2f5 100644
      }
 
 -  /* Copying Photon Specific config files to sutiable location */
-+  /* Copying Mariner Specific config files to sutiable location */
++  /* Copying distribution Specific config files to sutiable location */
    if (kernel_layout->kernelcfg_srcpath)
      {
        if (!glnx_fstatat_allow_noent (bootcsum_dfd, kernel_layout->kernelcfg_namever, &stbuf, 0, error))
diff --git a/SPECS/ostree/ostree.spec b/SPECS/ostree/ostree.spec
@@ -1,7 +1,7 @@
 Summary:        Git for operating system binaries
 Name:           ostree
 Version:        2022.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        LGPLv2+
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -12,7 +12,7 @@ Source1:        91-ostree.preset
 Patch0:         dualboot-support.patch
 Patch1:         0001-ostree-Copying-photon-config-to-boot-directory.patch
 Patch2:         0002-ostree-Adding-load-env-to-menuentry.patch
-Patch3:         0003-ostree-converting-osname-to-mariner.patch
+Patch3:         0003-ostree-converting-osname-to-azurelinux.patch
 BuildRequires:  attr-devel
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -155,6 +155,9 @@ install -vdm 755 %{buildroot}%{_sysconfdir}/ostree/remotes.d
 %{_libexecdir}/libostree/grub2*
 
 %changelog
+* Thu Mar 07 2024 Mykhailo Bykhovtsev <[email protected]> - 2022.1-4
+- Renamed "0003-ostree-converting-osname-to-mariner.patch" to "0003-ostree-converting-osname-to-azurelinux.patch"
+
 * Wed Sep 20 2023 Jon Slobodzian <[email protected]> - 2022.1-3
 - Recompile with stack-protection fixed gcc version (CVE-2023-4039)
 

diff --git a/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec b/SPECS/prebuilt-ca-certificates-base/prebuilt-ca-certificates-base.spec
@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates-base
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        3.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -46,6 +46,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Wed Feb 28 2024 Mykhailo Bykhovtsev <[email protected]> - 3.0.0-4
+- Bumping release version to match with 'ca-certificates'
+
 * Sat Jan 27 2024 CBL-Mariner Servicing Account <[email protected]> - 3.0.0-3
 - Making 'Release' match with 'ca-certificates'
 

diff --git a/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec b/SPECS/prebuilt-ca-certificates/prebuilt-ca-certificates.spec
@@ -3,7 +3,7 @@ Name:           prebuilt-ca-certificates
 # When updating, "Epoch, "Version", AND "Release" tags must be updated in the "ca-certificates" package as well.
 Epoch:          1
 Version:        3.0.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -49,6 +49,9 @@ find %{buildroot} -name README -delete
 %{_sysconfdir}/pki/java/cacerts
 
 %changelog
+* Wed Feb 28 2024 Mykhailo Bykhovtsev <[email protected]> - 3.0.0-4
+- Bumping release version to match with 'ca-certificates'
+
 * Sat Jan 27 2024 CBL-Mariner Servicing Account <[email protected]> - 3.0.0-3
 - Making 'Release' match with 'ca-certificates'