firewalld: upgrade 1.3.2 -> 2.2.1#75
Merged
chaitu236 merged 1 commit intoni:nilrt/master/kirkstonefrom Nov 7, 2024
Merged
Conversation
Major/minor release changelogs: - https://firewalld.org/2023/06/firewalld-2-0-0-release - https://firewalld.org/2024/01/firewalld-2-1-0-release - https://github.com/firewalld/firewalld/releases/tag/v2.2.0 (dunno why the website wasn't updated) Stop trying to rewrite /etc/firewalld/*.xml. It appears to be for the sake of /etc/firewalld/lockdown-whitelist.xml, which is not being installed anymore. Add RDEPENDS+=bash. Used by /usr/lib/firewalld/xmlschema/check.sh; adding to avoid a QA failure. (cherry-picked from 14c7d65) Signed-off-by: Rich Tollerton <rich.tollerton@ni.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
amstewart
approved these changes
Nov 5, 2024
amstewart
left a comment
There was a problem hiding this comment.
Does this need to get cherry-picked into the scarthgap ref as well?
Author
|
Yes, but we should use the commit from master that I cherry-picked here, 14c7d65, because there were some dynamic-layers bits I reverted as a part of this commit that IIRC are present in scarthgap. |
|
OK. Could you open a new PR with that cherry-pick then, and just note that it is a sibling of this PR. |
chaitu236
approved these changes
Nov 7, 2024
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
3 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.
Major/minor release changelogs:
Stop trying to rewrite /etc/firewalld/*.xml. It appears to be for the sake of /etc/firewalld/lockdown-whitelist.xml, which is not being installed anymore.
Add RDEPENDS+=bash. Used by /usr/lib/firewalld/xmlschema/check.sh; adding to avoid a QA failure.
(cherry-picked from 14c7d65)
===
Testing: firewalld tests in development work.