Merge pull request #5596 from microsoft/joslobo/merge-for-may-update-2

Joslobo/merge for may update 2

.github/CODEOWNERS

@@ -47,6 +47,9 @@
 /SPECS/kexec-tools/* @microsoft/cbl-mariner-debug-tools
 
 /SPECS/openssl/* @microsoft/cbl-mariner-openssl
+/SPECS/SymCrypt-OpenSSL/* @microsoft/cbl-mariner-openssl
+/SPECS/SymCrypt/* @microsoft/cbl-mariner-openssl
+/SPECS/KeysInUse-OpenSSL/* @microsoft/cbl-mariner-openssl
 
 /SPECS/dnf/* @microsoft/cbl-mariner-package-managers
 /SPECS/dnf-plugins-core/* @microsoft/cbl-mariner-package-managers

.github/workflows/check-clean-stage.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
       # Checkout the branch of our repo that triggered this action
       - name: Workflow trigger checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get base commit for PRs
         if: ${{ github.event_name == 'pull_request' }}

.github/workflows/check-entangled-specs.yml

@@ -20,11 +20,11 @@ jobs:
     steps:
       # Checkout the branch of our repo that triggered this action
       - name: Workflow trigger checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
       - name: Setup Python 3.7
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
 

.github/workflows/check-license-map.yml

@@ -19,10 +19,10 @@ jobs:
     steps:
       # Checkout the branch of our repo that triggered this action
       - name: Workflow trigger checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

.github/workflows/check-livepatches.yml

@@ -17,10 +17,10 @@ jobs:
     steps:
       # Checkout the branch of our repo that triggered this action
       - name: Workflow trigger checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Setup Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

.github/workflows/check-manifests.yml

@@ -16,7 +16,7 @@ jobs:
     steps:
 
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Check x86_64 manifests
       run: |

.github/workflows/check-package-cgmanifest.yml

@@ -17,7 +17,7 @@ jobs:
     steps:
 
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Get base commit for PRs
       if: ${{ github.event_name == 'pull_request' }}

.github/workflows/check-spec.yml

@@ -17,11 +17,11 @@ jobs:
     steps:
       # Checkout the branch of our repo that triggered this action
       - name: Workflow trigger checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
       - name: Setup Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 
@@ -50,7 +50,7 @@ jobs:
           echo "updated-specs=$(echo ${changed_specs})" >> $GITHUB_ENV
 
       - name: Main branch checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 'main'
           path: 'main-checkout'

.github/workflows/check-static-glibc.yml

@@ -18,11 +18,11 @@ jobs:
     steps:
       # Checkout the branch of our repo that triggered this action
       - name: Workflow trigger checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       # For consistency, we use the same major/minor version of Python that CBL-Mariner ships
       - name: Setup Python 3.9
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.9
 

.github/workflows/go-test-coverage.yml

@@ -23,7 +23,7 @@ jobs:
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Check for bad go formatting
       run: |

.github/workflows/lint-specs.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       # Checkout the branch of our repo that triggered this action
       - name: Workflow trigger checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Get base commit for PRs
         if: ${{ github.event_name == 'pull_request' }}
@@ -45,23 +45,23 @@ jobs:
           echo "updated-specs=$(echo ${changed_specs})" >> $GITHUB_ENV
 
       - name: Main branch checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           ref: 'main'
           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
       - name: spec-cleaner checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         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
       - name: Setup Python 3.7
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.7
 

.github/workflows/quickstart_1.0.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.2
+      uses: actions/checkout@v3
       with:
         ref: '1.0-stable'
 
@@ -44,7 +44,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.2
+      uses: actions/checkout@v3
       with:
         ref: '1.0-stable'
 
@@ -71,7 +71,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.2
+      uses: actions/checkout@v3
       with:
         ref: '1.0-stable'
 

.github/workflows/quickstart_2.0.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.2
+      uses: actions/checkout@v3
       with:
         ref: '2.0-stable'
 
@@ -45,7 +45,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.2
+      uses: actions/checkout@v3
       with:
         ref: '2.0-stable'
 
@@ -73,7 +73,7 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v2.3.2
+      uses: actions/checkout@v3
       with:
         ref: '2.0-stable'
 

SPECS-SIGNED/kernel-azure-signed/kernel-azure-signed.spec

@@ -9,7 +9,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for Azure
 Name:           kernel-azure-signed-%{buildarch}
-Version:        5.15.111.1
+Version:        5.15.112.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Tue May 23 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.112.1-1
+- Auto-upgrade to 5.15.112.1
+
 * Mon May 15 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.111.1-1
 - Auto-upgrade to 5.15.111.1
 

SPECS-SIGNED/kernel-hci-signed/kernel-hci-signed.spec

@@ -4,7 +4,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for HCI
 Name:           kernel-hci-signed-%{buildarch}
-Version:        5.15.111.1
+Version:        5.15.112.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@@ -149,6 +149,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Tue May 23 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.112.1-1
+- Auto-upgrade to 5.15.112.1
+
 * Mon May 15 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.111.1-1
 - Auto-upgrade to 5.15.111.1
 

SPECS-SIGNED/kernel-signed/kernel-signed.spec

@@ -9,7 +9,7 @@
 %define uname_r %{version}-%{release}
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
-Version:        5.15.111.1
+Version:        5.15.112.1
 Release:        1%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
@@ -153,6 +153,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %exclude /module_info.ld
 
 %changelog
+* Tue May 23 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.112.1-1
+- Auto-upgrade to 5.15.112.1
+
 * Mon May 15 2023 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 5.15.111.1-1
 - Auto-upgrade to 5.15.111.1
 

SPECS/LICENSES-AND-NOTICES/data/licenses.json

@@ -2182,6 +2182,7 @@
                 "livepatch-5.15.107.1-1.cm2",
                 "livepatch-5.15.110.1-1.cm2",
                 "livepatch-5.15.111.1-1.cm2",
+                "livepatch-5.15.112.1-1.cm2",
                 "livepatch-5.15.94.1-1.cm2",
                 "livepatch-5.15.94.1-1.cm2-signed",
                 "livepatch-5.15.95.1-1.cm2",

SPECS/bash/bash.spec

@@ -1,7 +1,7 @@
 Summary:        Bourne-Again SHell
 Name:           bash
 Version:        5.1.8
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv3
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -16,6 +16,7 @@ Requires(post): /bin/cp
 Requires(post): /bin/grep
 Requires(postun): /bin/grep
 Requires(postun): /bin/mv
+Requires:       filesystem
 Provides:       /bin/sh
 Provides:       /bin/bash
 Provides:       %{_bindir}/sh
@@ -98,15 +99,6 @@ fi
 export INPUTRC
 EOF
 
-cat > %{buildroot}%{_sysconfdir}/profile.d/umask.sh << "EOF"
-# By default, the umask should be set.
-if [ "$(id -gn)" = "$(id -un)" -a $EUID -gt 99 ] ; then
-  umask 002
-else
-  umask 022
-fi
-EOF
-
 cat > %{buildroot}%{_sysconfdir}/profile.d/i18n.sh << "EOF"
 # Begin /etc/profile.d/i18n.sh
 
@@ -328,6 +320,10 @@ fi
 %defattr(-,root,root)
 
 %changelog
+* Thu May 18 2023 Tobias Brick <tobiasb@microsoft.com> - 5.1.8-2
+- Add dependency on filesystem
+- Remove umask.sh, which will be provided by filesystem
+
 * Mon Nov 22 2021 Andrew Phelps <anphel@microsoft.com> - 5.1.8-1
 - Update to version 5.1.8
 - License verified