microsoft · anphel31 · Nov 4, 2020 · Sep 8, 2020 · Sep 11, 2020 · Sep 15, 2020
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -11,6 +11,7 @@ Feel free to delete sections of the template which do not apply to your PR, or a
 - [ ] Any updated packages successfully build (or no packages were changed)
 - [ ] All package sources are available
 - [ ] cgmanifest files are up-to-date and sorted (`./cgmanifest.json`, `./toolkit/tools/cgmanifest.json`, `./toolkit/scripts/toolchain/cgmanifest.json`)
+- [ ] LICENSE-MAP files are up-to-date (`./SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md`, `./SPECS/LICENSES-AND-NOTICES/LICENSE-EXCEPTIONS.PHOTON`)
 - [ ] All source files have up-to-date hashes in the `*.signatures.json` files
 - [ ] `sudo make go-tidy-all` and `sudo make go-test-coverage` pass
 - [ ] Documentation has been updated to match any changes to the build system
@@ -45,4 +46,4 @@ NO
 
 ###### Test Methodology
 <!-- How as this test validated? i.e. local build, pipeline build etc. -->
-- Pipeline build id: xxxx
+- Pipeline build id: xxxx
diff --git a/.github/workflows/quickstart.yml b/.github/workflows/quickstart.yml
@@ -0,0 +1,80 @@
+# Copyright (c) Microsoft Corporation.
+# Licensed under the MIT License.
+#
+# Workflow to automatedly verify the quickstart instructions
+
+name: Verify Quickstart
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "0 15 * * *"
+
+jobs:
+  iso_quickstart:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.3.2
+      with:
+        ref: '1.0-stable'
+
+    - name: Set up Go 1.13
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.13
+      id: go
+
+    - name: Install Remaining Prerequisites
+      run: |
+        # Golang and docker are already installed on the agent
+        sudo apt-get update
+        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage pigz
+
+    - name: Configure the Environment
+      run: |
+        pushd toolkit
+        sudo make go-tools REBUILD_TOOLS=y
+        sudo make input-srpms DOWNLOAD_SRPMS=y
+        popd
+
+    - name: ISO Quick Start
+      run: |
+        pushd toolkit
+        sudo make iso REBUILD_TOOLS=y REBUILD_PACKAGES=n
+        popd
+
+  vhdx_quickstart:
+    runs-on: ubuntu-18.04
+
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2.3.2
+      with:
+        ref: '1.0-stable'
+
+    - name: Set up Go 1.13
+      uses: actions/setup-go@v2
+      with:
+        go-version: 1.13
+      id: go
+
+    - name: Install Remaining Prerequisites
+      run: |
+        # Golang and docker are already installed on the agent
+        sudo apt-get update
+        sudo apt -y install make tar wget curl rpm qemu-utils genisoimage pigz
+
+    - name: Configure Environment
+      run: |
+        pushd toolkit
+        sudo make go-tools REBUILD_TOOLS=y
+        sudo make input-srpms DOWNLOAD_SRPMS=y
+        popd
+
+    - name: VHDX Quick Start
+      run: |
+        pushd toolkit
+        sudo make image REBUILD_TOOLS=y REBUILD_PACKAGES=n
+        popd
diff --git a/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec b/SPECS-SIGNED/kernel-signed-aarch64/kernel-signed-aarch64.spec
@@ -2,7 +2,7 @@
 Summary:        Signed Linux Kernel for aarch64 systems
 Name:           kernel-signed-aarch64
 Version:        5.4.51
-Release:        5%{?dist}
+Release:        11%{?dist}
 License:        GPLv2
 URL:            https://github.com/microsoft/WSL2-Linux-Kernel
 Group:          System Environment/Kernel
@@ -67,7 +67,8 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %postun
 if [ ! -e /boot/mariner.cfg ]
 then
-     if [ `ls /boot/linux-*.cfg 1> /dev/null 2>&1` ]
+     ls /boot/linux-*.cfg 1> /dev/null 2>&1
+     if [ $? -eq 0 ]
      then
           list=`ls -tu /boot/linux-*.cfg | head -n1`
           test -n "$list" && ln -sf "$list" /boot/mariner.cfg
@@ -84,6 +85,18 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
 
 %changelog
+*   Fri Oct 16 2020 Suresh Babu Chalamalasetty <schalam@microsoft.com> 5.4.51-11
+-   Update release number
+*   Fri Oct 02 2020 Chris Co <chrco@microsoft.com> 5.4.51-10
+-   Update release number to match kernel spec
+*   Fri Oct 02 2020 Chris Co <chrco@microsoft.com> 5.4.51-9
+-   Update release number
+*   Wed Sep 30 2020 Emre Girgin <mrgirgin@microsoft.com> 5.4.51-8
+-   Update postun script to deal with removal in case of another installed kernel.
+*   Fri Sep 25 2020 Suresh Babu Chalamalasetty <schalam@microsoft.com> 5.4.51-7
+-   Update release number
+*   Wed Sep 23 2020 Daniel McIlvaney <damcilva@microsoft.com> 5.4.51-6
+-   Update release number
 *   Thu Sep 03 2020 Daniel McIlvaney <damcilva@microsoft.com> 5.4.51-5
 -   Update release number
 *   Thu Sep 03 2020 Chris Co <chrco@microsoft.com> 5.4.51-4
@@ -97,4 +110,4 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 *   Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
 -   Update release number
 *   Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11
--   Original version for CBL-Mariner.
+-   Original version for CBL-Mariner.
diff --git a/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec b/SPECS-SIGNED/kernel-signed-x64/kernel-signed-x64.spec
@@ -2,7 +2,7 @@
 Summary:        Signed Linux Kernel for x86_64 systems
 Name:           kernel-signed-x64
 Version:        5.4.51
-Release:        5%{?dist}
+Release:        11%{?dist}
 License:        GPLv2
 URL:            https://github.com/microsoft/WSL2-Linux-Kernel
 Group:          System Environment/Kernel
@@ -67,7 +67,8 @@ echo "initrd of kernel %{uname_r} removed" >&2
 %postun
 if [ ! -e /boot/mariner.cfg ]
 then
-     if [ `ls /boot/linux-*.cfg 1> /dev/null 2>&1` ]
+     ls /boot/linux-*.cfg 1> /dev/null 2>&1
+     if [ $? -eq 0 ]
      then
           list=`ls -tu /boot/linux-*.cfg | head -n1`
           test -n "$list" && ln -sf "$list" /boot/mariner.cfg
@@ -84,6 +85,18 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %config %{_localstatedir}/lib/initramfs/kernel/%{uname_r}
 
 %changelog
+*   Fri Oct 16 2020 Suresh Babu Chalamalasetty <schalam@microsoft.com> 5.4.51-11
+-   Update release number
+*   Fri Oct 02 2020 Chris Co <chrco@microsoft.com> 5.4.51-10
+-   Update release number to match kernel spec
+*   Fri Oct 02 2020 Chris Co <chrco@microsoft.com> 5.4.51-9
+-   Update release number
+*   Wed Sep 30 2020 Emre Girgin <mrgirgin@microsoft.com> 5.4.51-8
+-   Update postun script to deal with removal in case of another installed kernel.
+*   Fri Sep 25 2020 Suresh Babu Chalamalasetty <schalam@microsoft.com> 5.4.51-7
+-   Update release number
+*   Wed Sep 23 2020 Daniel McIlvaney <damcilva@microsoft.com> 5.4.51-6
+-   Update release number
 *   Thu Sep 03 2020 Daniel McIlvaney <damcilva@microsoft.com> 5.4.51-5
 -   Update release number
 *   Thu Sep 03 2020 Chris Co <chrco@microsoft.com> 5.4.51-4
@@ -97,4 +110,4 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 *   Wed Aug 19 2020 Chris Co <chrco@microsoft.com> 5.4.42-12
 -   Update release number
 *   Tue Aug 18 2020 Chris Co <chrco@microsoft.com> 5.4.42-11
--   Original version for CBL-Mariner.
+-   Original version for CBL-Mariner.
diff --git a/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md b/SPECS/LICENSES-AND-NOTICES/LICENSES-MAP.md
diff --git a/SPECS/ant/ant.signatures.json b/SPECS/ant/ant.signatures.json
@@ -1,6 +1,6 @@
 {
  "Signatures": {
-  "apache-ant-1.10.8-src.tar.gz": "53d06ed062297366569fe563b77e8187973be1383749181938b597177514d318",
+  "apache-ant-1.10.9-src.tar.gz": "3f00fe29988ff1af83cb100089bfcbaf5d3e533d42fba3ea4861a982c920e874",
   "hamcrest-1.3.tgz": "c6428e40d069fff3f99780efaae96c35ebdbf7cbfd475504254ebffcc19620c2",
   "maven-ant-tasks-2.1.3.tar.gz": "ae5b6548dbb3f0d71865e1be9bffd13ca7bb65a3cb5d89eaee97ea7e70e1f0ba"
  }

diff --git a/SPECS/ant/ant.spec b/SPECS/ant/ant.spec
@@ -1,6 +1,6 @@
 Summary:        Apache Ant
 Name:           ant
-Version:        1.10.8
+Version:        1.10.9
 Release:        1%{?dist}
 License:        ASL 2.0 and BSD and W3C
 URL:            https://ant.apache.org
@@ -118,6 +118,8 @@ bootstrap/bin/ant -v run-tests
 %{_bindir}/runant.pl
 
 %changelog
+*   Wed Oct 21 2020 Henry Li <lihl@microsoft.com> - 1.10.9-1
+-   Updated to version 1.10.9 to resolve CVE-2020-11979
 *   Thu May 21 2020 Ruying Chen <v-ruyche@microsoft.com> - 1.10.8-1
 -   Updated to version 1.10.8 to resolve CVE-2020-1945
 *   Sat May 09 00:21:39 PST 2020 Nick Samson <nisamson@microsoft.com> - 1.10.5-8

diff --git a/SPECS/apparmor/CVE-2016-1585.nopatch b/SPECS/apparmor/CVE-2016-1585.nopatch
@@ -0,0 +1 @@
+# CVE-2016-1585 has no upstream fix.
diff --git a/SPECS/apparmor/apparmor.spec b/SPECS/apparmor/apparmor.spec
@@ -1,15 +1,16 @@
 %{!?python3_sitelib: %global python3_sitelib %(python3 -c "from distutils.sysconfig import get_python_lib;print(get_python_lib())")}
 Name:           apparmor
 Version:        2.13
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        AppArmor is an effective and easy-to-use Linux application security system.
 License:        GNU LGPL v2.1
 URL:            https://launchpad.net/apparmor
 Source0:        https://launchpad.net/apparmor/2.13/2.13.0/+download/%{name}-%{version}.tar.gz
-%define sha1    apparmor=54202cafce24911c45141d66e2d1e037e8aa5746
 Patch0:         apparmor-set-profiles-complain-mode.patch
 Patch1:         apparmor-service-start-fix.patch
 Patch2:         apparmor-fix-make-check.patch
+# CVE-2016-1585 has no upstream fix as of 2020/09/28
+Patch100:       CVE-2016-1585.nopatch
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Productivity/Security
@@ -354,9 +355,10 @@ make DESTDIR=%{buildroot} install
 %exclude %{perl_archlib}/perllocal.pod
 
 %changelog
-* Sat May 09 00:20:37 PST 2020 Nick Samson <nisamson@microsoft.com> - 2.13-10
-- Added %%license line automatically
-
+*   Mon Sep 28 2020 Daniel McIlvaney <damcilva@microsoft.com> 2.13-11
+-   Nopatch CVE-2016-1585
+*   Sat May 09 2020 Nick Samson <nisamson@microsoft.com> 2.13-10
+-   Added %%license line automatically
 *   Tue Apr 28 2020 Emre Girgin <mrgirgin@microsoft.com> 2.13-9
 -   Renaming Linux-PAM to pam
 *   Tue Sep 03 2019 Mateusz Malisz <mamalisz@microsoft.com> 2.13-8