Merge for Mariner 2.0 Dec 2023 Monthly Update.#6878
Merged
jslobodzian merged 47 commits into2.0from Nov 30, 2023
Merged
Conversation
The KUBE_GIT_VERSION_FILE seems to be not present in the release. Use the alternative KUBE_GIT_VERSION instead. Fixes: #6719 Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
Co-authored-by: Henry Beberman <henry.beberman@microsoft.com> Fixes issue #6598 which is a crash on selection in tmux. The fix requires an update to ncurses and a patch to tmux. From the patch comments: ``` ncurses-6.4-20230408 change tparm to require cur_term, which broke tmux usage of it. ncurses-6.4-20230423 then added tiparm_s that allows usage without cur_term. tmux change tmux/tmux@39d41d0 uses tiparm_s if it exists, but cannot be cleanly applied to tmux tag 3.2a. That change uses a config setting to created #defines to determine which version of tparm it should use, and only conditionally uses tiparm_s, because it needs to be backwards compatible with previous versions of ncurses. But to use that, we would need to get the actual source as it appears in github, rather than the released version (they are different downloads: see https://github.com/tmux/tmux/releases). Fortunately, we have the luxery of forcing tmux to use a version of ncurses that has the function we want (see above). Given all this, this patch takes the change to use tiparm_s, removes the conditional compilation portion so it always uses tiparm_s and applies it to the code as it exists in 3.2a. It has both a build-time and run-time dependency on ncurses-6.4-20230423 or later. ```
Signed-off-by: Chris PeBenito <chpebeni@linux.microsoft.com>
…#6789) Co-authored-by: Daniel McIlvaney <damcilva@microsoft.com>
Currently, our build output only shows if test of SRPM(s) failed. It doesn't point to the logs which contain details on failure. This change prints the path to logs so we can debug the failure. Before the log message was: Test build for /path/to/srpm failed on a non-test build issue. Error: exit status 2 Tests failed for /path/to/srpm. Error: package test failed. Test status line ... EXIT STATUS 127 and now the log message will look like: Test build for /path/to/srpm failed on a non-test build issue. Error: exit status 2, for details see /path/to/logs Tests failed for /path/to/srpm. Error: package test failed. Test status line ... EXIT STATUS 127, for details see /path/to/logs Co-Authored by @AZaugg
…#6811) When testing kernel builds in the latest Mariner 2.0 container, it was noted that the list of kernel's BuildRequires is missing cpio. The container (unlike our core images used in VMs) does not include "cpio" by default as defined in core-package.spec. This led to kheaders errors. Therefore, add as a buildRequires.
#6816) Similar to 1f4f655 When testing kernel builds in the latest Mariner 2.0 container, it was noted that the list of kernel's BuildRequires is missing cpio. The container image (unlike our core images used in VMs) does not include "cpio" by default as defined in core-package.spec. This led to kheaders errors: make[1]: *** [kernel/Makefile:160: kernel/kheaders_data.tar.xz] Error 127 make: *** [Makefile:1907: kernel] Error 2 Therefore, add cpio as a buildRequires. Note that cpio is also listed as a minimal requirement for the kernel to build: https://www.kernel.org/doc/html/latest/process/changes.html?highlight=cpio
Co-authored-by: Pawel Winogrodzki <pawelwi@microsoft.com>
… branch main (#6802) Co-authored-by: Nick Samson <nick.samson@microsoft.com>
The new downloader tool was missing from the list of tools to build, leading to containerized-rpmbuild erroring out. This fix checks if downloader tool is built, or builds if missing.
Co-authored-by: Harshit Gupta <guptaharshit@microsoft.com>
…main (#6842) Co-authored-by: Mykhailo Bykhovtsev <108374904+mbykhovtsev-ms@users.noreply.github.com>
Co-authored-by: Jonathan Behrens <jbehrens@microsoft.com>
Upgraded vim to 9.0.2112 to resolve CVE-2023-48235, CVE-2023-48233, CVE-2023-48232, CVE-2023-48236, CVE-2023-48237, CVE-2023-48234, CVE-2023-48231
Resolved the following CVEs: CVE-2023-22078, CVE-2023-22068, CVE-2023-22084, CVE-2023-22070, CVE-2023-22092, CVE-2023-22079, CVE-2023-22032, CVE-2023-22103, CVE-2023-22112, CVE-2023-22059, CVE-2023-22114, CVE-2023-22097, CVE-2023-22064, CVE-2023-22066
Co-authored-by: Christopher Co <35273088+christopherco@users.noreply.github.com>
Co-authored-by: Olivia Al-Joundi <72226369+oaljoundi@users.noreply.github.com>
…VE-2023-22078, CVE-2023-22068, CVE-2023-22084, CVE-2023-22070, CVE-2023-22092, CVE-2023-22079, CVE-2023-22032, CVE-2023-22103, CVE-2023-22112, CVE-2023-22059, CVE-2023-22114, CVE-2023-22097, CVE-2023-22064, CVE-2023-22066, etc. - branch main (#6866) Co-authored-by: nadiia-dubchak <nd2631@columbia.edu>
Co-authored-by: Anubhuti Shruti <ashruti-msft>
Co-authored-by: Jon Slobodzian <joslobo@microsoft.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
20 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merge for Mariner 2.0 Dec 2023 Monthly Update.