Merge pull request #1729 from microsoft/joslobo/merge-for-nov-update

Merge 1.0-dev for November Update

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

@@ -10,7 +10,7 @@
 Summary:        Signed Linux Kernel for %{buildarch} systems
 Name:           kernel-signed-%{buildarch}
 Version:        5.10.78.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -147,6 +147,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %endif
 
 %changelog
+* Mon Nov 29 2021 Suresh Babu Chalamalasetty <[email protected]> - 5.10.78.1-2
+- Bump release number to match kernel release
+
 * Mon Nov 08 2021 Rachel Menge <[email protected]> - 5.10.78.1-1
 - Update source to 5.10.78.1
 

SPECS/bond/bond.spec

@@ -1,7 +1,7 @@
 Summary:        Microsoft Bond Library
 Name:           bond
 Version:        8.0.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -32,6 +32,7 @@ Development files for %{name}
 
 %prep
 %setup -q
+chmod u+x %{SOURCE1} %{SOURCE2}
 
 %build
 CMAKE_OPTS="\
@@ -50,11 +51,11 @@ CMAKE_OPTS="\
 mkdir -v build
 cd build
 cmake $CMAKE_OPTS ..
-make %{?_smp_mflags}
+%make_build
 
 %install
 cd build
-make DESTDIR=%{buildroot} install
+%make_install
 chmod 0755 %{buildroot}%{_bindir}/gbc
 
 %files
@@ -67,16 +68,19 @@ chmod 0755 %{buildroot}%{_bindir}/gbc
 %{_libdir}/%{name}/*
 
 %changelog
+* Tue Nov 30 2021 Pawel Winogrodzki <[email protected]> - 8.0.1-5
+- Updating package build steps.
+
 * Tue Oct 27 2020 Joe Schmitt <[email protected]> - 8.0.1-4
 - Include all sources regardless of architecture.
 
-*   Mon Oct 19 2020 Pawel Winogrodzki <[email protected]> 8.0.1-3
--   License verified.
--   Added source URL.
--   Added 'Vendor' and 'Distribution' tags.
+* Mon Oct 19 2020 Pawel Winogrodzki <[email protected]> - 8.0.1-3
+- License verified.
+- Added source URL.
+- Added 'Vendor' and 'Distribution' tags.
 
-*   Tue May 19 2020 Jonathan Chiu <[email protected]> 8.0.1-2
--   Add aarch64 support
+* Tue May 19 2020 Jonathan Chiu <[email protected]> - 8.0.1-2
+- Add aarch64 support
 
-*   Mon Apr 06 2020 Jonathan Chiu <[email protected]> 8.0.1-1
--   Original version for CBL-Mariner.
+* Mon Apr 06 2020 Jonathan Chiu <[email protected]> - 8.0.1-1
+- Original version for CBL-Mariner.

SPECS/c-ares/c-ares.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "c-ares-1.17.1.tar.gz": "d73dd0f6de824afd407ce10750ea081af47eba52b8a6cb307d220131ad93fc40"
+  "c-ares-1.18.1.tar.gz": "1a7d52a8a84a9fbffb1be9133c0f6e17217d91ea5a6fa61f6b4729cda78ebbcf"
  }
-}
+}

SPECS/c-ares/c-ares.spec

@@ -1,6 +1,6 @@
 Summary:        A library that performs asynchronous DNS operations
 Name:           c-ares
-Version:        1.17.1
+Version:        1.18.1
 Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
@@ -62,34 +62,38 @@ rm -rf %{buildroot}
 %{_includedir}/ares.h
 %{_includedir}/ares_build.h
 %{_includedir}/ares_dns.h
+%{_includedir}/ares_nameser.h
 %{_includedir}/ares_rules.h
 %{_includedir}/ares_version.h
 %{_libdir}/*.so
 %{_libdir}/pkgconfig/libcares.pc
 %{_mandir}/man3/ares_*
 
 %changelog
+* Sun Nov 28 2021 Muhammad Falak <[email protected]> - 1.18.1-1
+- Bump version to fix CVE-2021-3672
+
 * Mon Mar 15 2021 Nick Samson <[email protected]> - 1.17.1-1
 - Removed %%sha line. Upgraded to 1.17.1 to address CVE-2020-8277.
 - License confirmed as MIT. Changed URLs to use HTTPS.
 
-*   Sat May 09 2020 Nick Samson <[email protected]> - 1.14.0-3
--   Added %%license line automatically
+* Sat May 09 2020 Nick Samson <[email protected]> - 1.14.0-3
+- Added %%license line automatically
 
-*   Tue Sep 03 2019 Mateusz Malisz <[email protected]> 1.14.0-2
--   Initial CBL-Mariner import from Photon (license: Apache2).
+* Tue Sep 03 2019 Mateusz Malisz <[email protected]> 1.14.0-2
+- Initial CBL-Mariner import from Photon (license: Apache2).
 
-*   Fri Sep 21 2018 Sujay G <[email protected]> 1.14.0-1
--   Bump c-ares version to 1.14.0
+* Fri Sep 21 2018 Sujay G <[email protected]> 1.14.0-1
+- Bump c-ares version to 1.14.0
 
-*   Fri Sep 29 2017 Dheeraj Shetty <[email protected]>  1.12.0-2
--   Fix for CVE-2017-1000381
+* Fri Sep 29 2017 Dheeraj Shetty <[email protected]>  1.12.0-2
+- Fix for CVE-2017-1000381
 
-*   Fri Apr 07 2017 Anish Swaminathan <[email protected]>  1.12.0-1
--   Upgrade to 1.12.0
+* Fri Apr 07 2017 Anish Swaminathan <[email protected]>  1.12.0-1
+- Upgrade to 1.12.0
 
-*   Wed Oct 05 2016 Xiaolin Li <[email protected]> 1.10.0-3
--   Apply patch for CVE-2016-5180.
+* Wed Oct 05 2016 Xiaolin Li <[email protected]> 1.10.0-3
+- Apply patch for CVE-2016-5180.
 
 *   Tue May 24 2016 Priyesh Padmavilasom <[email protected]> 1.10.0-2
 -   GA - Bump release of all rpms

SPECS/dnf/dnf.signatures.json

@@ -1,5 +1,5 @@
 {
  "Signatures": {
-  "dnf-4.2.18.tar.gz": "6325be45c097b9305b9b00c776e9901354e130ac15f9d3c7918159b582ef6693"
+  "dnf-4.10.0.tar.gz": "7c8d18b61cfe18104d066abbdd5a420067313ba93734120666f89695a113eba8"
  }
 }

SPECS/dnf/dnf.spec

@@ -3,8 +3,8 @@
 %global py3pluginpath %{python3_sitelib}/%{name}-plugins
 
 Name:           dnf
-Version:        4.2.18
-Release:        3%{?dist}
+Version:        4.10.0
+Release:        1%{?dist}
 Summary:        Python 3 version of the DNF package manager.
 License:        GPLv2+ or GPL
 URL:            https://github.com/rpm-software-management/dnf
@@ -149,6 +149,9 @@ ctest -VV
 %{python3_sitelib}/%{name}/automatic
 
 %changelog
+* Mon Dec 06 2021 Suresh Babu Chalamalasetty <[email protected]> - 4.10.0-1
+- Update version to 4.10.0.
+
 * Fri Jul 30 2021 Neha Agarwal <[email protected]> 4.2.18-3
 - Edit dnf-automatic.conf and start dnf-automatic-notifyonly timer.
 

SPECS/gd/gd.signatures.json

@@ -1,6 +1,6 @@
 {
  "Signatures": {
   "baselibs.conf": "51b92d2adf44c9aaee5c22084a0b0c36a809c61e5e618927eef00265476360ef",
-  "libgd-2.3.0.tar.xz": "ecd9155b9a417fb3f837f29e5966323796de247789163761dd72dbf83bfcac58"
+  "libgd-2.3.3.tar.xz": "3fe822ece20796060af63b7c60acb151e5844204d289da0ce08f8fdf131e5a61"
  }
-}
+}

SPECS/gd/gd.spec

@@ -19,8 +19,8 @@
 %define lname libgd3
 Summary:        A Drawing Library for Programs That Use PNG and JPEG Output
 Name:           gd
-Version:        2.3.0
-Release:        2.4%{?dist}
+Version:        2.3.3
+Release:        1%{?dist}
 License:        MIT
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -145,6 +145,9 @@ find %{buildroot} -type f -name "*.la" -delete -print
 %{_libdir}/pkgconfig/gdlib.pc
 
 %changelog
+* Thu Dec 02 2021 Nick Samson <[email protected]> - 2.3.3-1
+- Upgrade to 2.3.3 to fix CVEs CVE-2021-38115, CVE-2021-40145, CVE-2021-40812
+
 * Thu Oct 21 2021 Bala <[email protected]> - 2.3.0-2.4
 - Build without fontconfig and freetype as fontconfig support is failing
 - Remove `annotate` binary

SPECS/grpc/grpc.spec

@@ -1,21 +1,14 @@
 Summary:        Open source remote procedure call (RPC) framework
 Name:           grpc
 Version:        1.35.0
-Release:        7%{?dist}
+Release:        8%{?dist}
 License:        ASL 2.0
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Applications/System
 URL:            https://www.grpc.io
 Source0:        https://github.com/grpc/grpc/archive/v%{version}/%{name}-%{version}.tar.gz
-# A buildable grpc environment needs functioning submodules that do not work from the archive download
-# To recreate the tar.gz run the following
-#  git clone -b RELEASE_TAG_HERE --depth 1 https://github.com/grpc/grpc
-#  pushd grpc
-#  git submodule update --depth 1 --init
-#  popd
-#  sudo mv grpc grpc-%{version}
-#  sudo tar -cvf grpc-%{version}.tar.gz grpc-%{version}/
+
 BuildRequires:  abseil-cpp-devel
 BuildRequires:  c-ares-devel
 BuildRequires:  cmake
@@ -56,13 +49,19 @@ The grpc-plugins package contains the grpc plugins.
 %autosetup
 
 %build
+# Updating used C++ version to be compatible with the build dependencies.
+# Without this fix 'grpc' compiles with C++11 against 'abseil-cpp' headers,
+# which generate a different set of APIs than the ones provided by the BR 'abseil-cpp'.
+CXX_VERSION=$(c++ -dM -E -x c++ /dev/null | grep -oP "(?<=__cplusplus \d{2})\d{2}")
+
 mkdir -p cmake/build
 cd cmake/build
 cmake ../.. -DgRPC_INSTALL=ON                \
    -DBUILD_SHARED_LIBS=ON                    \
    -DCMAKE_BUILD_TYPE=Release                \
+   -DCMAKE_CXX_STANDARD=$CXX_VERSION         \
    -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix}    \
-   -DgRPC_ABSL_PROVIDER:STRING='package'    \
+   -DgRPC_ABSL_PROVIDER:STRING='package'     \
    -DgRPC_CARES_PROVIDER:STRING='package'    \
    -DgRPC_PROTOBUF_PROVIDER:STRING='package' \
    -DgRPC_RE2_PROVIDER:STRING='package'      \
@@ -103,6 +102,9 @@ find %{buildroot} -name '*.cmake' -delete
 %{_bindir}/grpc_*_plugin
 
 %changelog
+* Mon Nov 29 2021 Pawel Winogrodzki <[email protected]> - 1.35.0-8
+- Building with CBL-Mariner's default C++ version.
+
 * Mon Nov 15 2021 Pawel Winogrodzki <[email protected]> - 1.35.0-7
 - Use pre-installed "re2" and "abseil-cpp" instead of building them.
 

SPECS/kernel-headers/kernel-headers.spec

@@ -1,7 +1,7 @@
 Summary:        Linux API header files
 Name:           kernel-headers
 Version:        5.10.78.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -39,6 +39,9 @@ cp -rv usr/include/* /%{buildroot}%{_includedir}
 %{_includedir}/*
 
 %changelog
+* Mon Nov 29 2021 Suresh Babu Chalamalasetty <[email protected]> - 5.10.78.1-2
+- Update to kernel release 5.10.78.1-2
+
 * Mon Nov 08 2021 Rachel Menge <[email protected]> - 5.10.78.1-1
 - Update source to 5.10.78.1
 - Add patch to fix SPDX-License-Identifier in headers

SPECS/kernel-hyperv/kernel-hyperv.spec

@@ -4,7 +4,7 @@
 Summary:        Linux Kernel optimized for Hyper-V
 Name:           kernel-hyperv
 Version:        5.10.78.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPLv2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -271,6 +271,9 @@ ln -sf linux-%{uname_r}.cfg /boot/mariner.cfg
 %{_libdir}/perf/include/bpf/*
 
 %changelog
+* Mon Nov 29 2021 Suresh Babu Chalamalasetty <[email protected]> - 5.10.78.1-2
+- Bump release number to match kernel release
+
 * Mon Nov 08 2021 Rachel Menge <[email protected]> - 5.10.78.1-1
 - Update source to 5.10.78.1
 - Add patch to fix SPDX-License-Identifier in headers

SPECS/kernel/config

@@ -198,10 +198,12 @@ CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y
 # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
 CONFIG_LD_ORPHAN_WARN=y
 CONFIG_SYSCTL=y
+CONFIG_HAVE_UID16=y
 CONFIG_SYSCTL_EXCEPTION_TRACE=y
 CONFIG_HAVE_PCSPKR_PLATFORM=y
 CONFIG_BPF=y
 CONFIG_EXPERT=y
+CONFIG_UID16=y
 CONFIG_MULTIUSER=y
 CONFIG_SGETMASK_SYSCALL=y
 CONFIG_SYSFS_SYSCALL=y
@@ -470,6 +472,7 @@ CONFIG_RANDOMIZE_MEMORY_PHYSICAL_PADDING=0xa
 CONFIG_HOTPLUG_CPU=y
 # CONFIG_BOOTPARAM_HOTPLUG_CPU0 is not set
 # CONFIG_DEBUG_HOTPLUG_CPU0 is not set
+# CONFIG_COMPAT_VDSO is not set
 # CONFIG_LEGACY_VSYSCALL_EMULATE is not set
 # CONFIG_LEGACY_VSYSCALL_XONLY is not set
 CONFIG_LEGACY_VSYSCALL_NONE=y
@@ -629,8 +632,12 @@ CONFIG_AMD_NB=y
 #
 # Binary Emulations
 #
-# CONFIG_IA32_EMULATION is not set
+CONFIG_IA32_EMULATION=y
 # CONFIG_X86_X32 is not set
+CONFIG_COMPAT_32=y
+CONFIG_COMPAT=y
+CONFIG_COMPAT_FOR_U64_ALIGNMENT=y
+CONFIG_SYSVIPC_COMPAT=y
 # end of Binary Emulations
 
 #
@@ -687,6 +694,7 @@ CONFIG_HAVE_KVM_MSI=y
 CONFIG_HAVE_KVM_CPU_RELAX_INTERCEPT=y
 CONFIG_KVM_VFIO=y
 CONFIG_KVM_GENERIC_DIRTYLOG_READ_PROTECT=y
+CONFIG_KVM_COMPAT=y
 CONFIG_HAVE_KVM_IRQ_BYPASS=y
 CONFIG_HAVE_KVM_NO_POLL=y
 CONFIG_KVM_XFER_TO_GUEST_WORK=y
@@ -756,6 +764,8 @@ CONFIG_ARCH_HAVE_NMI_SAFE_CMPXCHG=y
 CONFIG_HAVE_ALIGNED_STRUCT_PAGE=y
 CONFIG_HAVE_CMPXCHG_LOCAL=y
 CONFIG_HAVE_CMPXCHG_DOUBLE=y
+CONFIG_ARCH_WANT_COMPAT_IPC_PARSE_VERSION=y
+CONFIG_ARCH_WANT_OLD_COMPAT_IPC=y
 CONFIG_HAVE_ARCH_SECCOMP=y
 CONFIG_HAVE_ARCH_SECCOMP_FILTER=y
 CONFIG_SECCOMP=y
@@ -780,8 +790,13 @@ CONFIG_ARCH_HAS_ELF_RANDOMIZE=y
 CONFIG_HAVE_ARCH_MMAP_RND_BITS=y
 CONFIG_HAVE_EXIT_THREAD=y
 CONFIG_ARCH_MMAP_RND_BITS=32
+CONFIG_HAVE_ARCH_MMAP_RND_COMPAT_BITS=y
+CONFIG_ARCH_MMAP_RND_COMPAT_BITS=8
+CONFIG_HAVE_ARCH_COMPAT_MMAP_BASES=y
 CONFIG_HAVE_STACK_VALIDATION=y
 CONFIG_HAVE_RELIABLE_STACKTRACE=y
+CONFIG_OLD_SIGSUSPEND3=y
+CONFIG_COMPAT_OLD_SIGACTION=y
 # CONFIG_COMPAT_32BIT_TIME is not set
 CONFIG_HAVE_ARCH_VMAP_STACK=y
 CONFIG_VMAP_STACK=y
@@ -877,6 +892,7 @@ CONFIG_EFI_PARTITION=y
 # CONFIG_CMDLINE_PARTITION is not set
 # end of Partition Types
 
+CONFIG_BLOCK_COMPAT=y
 CONFIG_BLK_MQ_PCI=y
 CONFIG_BLK_MQ_VIRTIO=y
 CONFIG_BLK_MQ_RDMA=y
@@ -916,6 +932,7 @@ CONFIG_FREEZER=y
 # Executable file formats
 #
 CONFIG_BINFMT_ELF=y
+CONFIG_COMPAT_BINFMT_ELF=y
 CONFIG_ELFCORE=y
 CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y
 CONFIG_BINFMT_SCRIPT=y
@@ -987,6 +1004,7 @@ CONFIG_MAPPING_DIRTY_HELPERS=y
 # end of Memory Management options
 
 CONFIG_NET=y
+CONFIG_COMPAT_NETLINK_MESSAGES=y
 CONFIG_NET_INGRESS=y
 CONFIG_NET_EGRESS=y
 CONFIG_SKB_EXTENSIONS=y
@@ -1004,6 +1022,7 @@ CONFIG_XFRM=y
 CONFIG_XFRM_OFFLOAD=y
 CONFIG_XFRM_ALGO=m
 CONFIG_XFRM_USER=m
+# CONFIG_XFRM_USER_COMPAT is not set
 # CONFIG_XFRM_INTERFACE is not set
 CONFIG_XFRM_SUB_POLICY=y
 CONFIG_XFRM_MIGRATE=y