Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

firewalld: upgrade 1.3.2 -> 2.2.1 #75

Conversation

rtollert
Copy link

@rtollert rtollert commented Nov 5, 2024

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.

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 <[email protected]>
Signed-off-by: Khem Raj <[email protected]>
Copy link

@amstewart amstewart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need to get cherry-picked into the scarthgap ref as well?

@amstewart amstewart requested a review from a team November 5, 2024 16:45
@rtollert
Copy link
Author

rtollert commented Nov 6, 2024

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.

@amstewart
Copy link

OK. Could you open a new PR with that cherry-pick then, and just note that it is a sibling of this PR.

@chaitu236 chaitu236 merged commit a86e749 into ni:nilrt/master/kirkstone Nov 7, 2024
@rtollert rtollert deleted the users/rtollert/kirkstone/firewalld-221 branch November 7, 2024 22:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants