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.

Sign up for GitHub

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

Merge SLE-15-SP5 into SLE-15-SP6 #116

Merged
merged 6 commits into from
Aug 9, 2024
Merged

Merge SLE-15-SP5 into SLE-15-SP6 #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c836a80
Fix security policy proposal order
teclator Oct 30, 2023
ee5aa15
Bump version & changelog
teclator Oct 30, 2023
c6e10a9
Update yast2-security dependency
teclator Oct 30, 2023
8370e90
Depend on yast2-firewall-4.5.1
teclator Nov 1, 2023
c4ffa82
Merge pull request #108 from yast/security_policy_order
teclator Jan 5, 2024
b8bc0de
Merge branch 'SLE-15-SP5' into merge-sle-15-sp5
imobachgs Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions control/control.leanos.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,6 +409,14 @@ Please visit us at http://www.suse.com/.
<name>timezone</name>
<presentation_order>45</presentation_order>
</proposal_module>
<proposal_module>
<name>security</name>
<presentation_order>50</presentation_order>
</proposal_module>
<proposal_module>
<name>security_policy</name>
<presentation_order>51</presentation_order>
</proposal_module>
<!-- software proposal should be computed almost at the end -->
<proposal_module>
<name>software</name>
Expand All @@ -424,10 +432,6 @@ Please visit us at http://www.suse.com/.
<name>ssh_import</name>
<presentation_order>80</presentation_order>
</proposal_module>
<proposal_module>
<name>security_policy</name>
<presentation_order>51</presentation_order>
</proposal_module>
</proposal_modules>

<proposal_tabs config:type="list">
Expand All @@ -453,6 +457,8 @@ Please visit us at http://www.suse.com/.
<proposal_module>software</proposal_module>
<proposal_module>timezone</proposal_module>
<proposal_module>language</proposal_module>
<proposal_module>security</proposal_module>
<proposal_module>security_policy</proposal_module>
<proposal_module>default_target</proposal_module>
<proposal_module>kdump</proposal_module>
<proposal_module>ssh_import</proposal_module>
Expand Down
8 changes: 8 additions & 0 deletions package/skelcd-control-leanos.changes
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
-------------------------------------------------------------------
Mon Oct 30 09:14:16 UTC 2023 - Knut Anderssen <[email protected]>

- Add the security proposal to the autoyast overview and change the
security policy proposal order in order to be run before the
software proposal (bsc#1216615)
- 15.6.5

-------------------------------------------------------------------
Wed Mar 13 13:39:00 UTC 2024 - Ladislav Slezák <[email protected]>

Expand Down
10 changes: 5 additions & 5 deletions package/skelcd-control-leanos.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ Requires: yast2-add-on
Requires: yast2-buildtools
Requires: yast2-devtools
Requires: yast2-fcoe-client
# For creating the AutoYast profile at the end of installation (bnc#887406)
Requires: yast2-firewall
# Do not conflict autoinstallation and proposal firewall settings (bsc#1216615)
Requires: yast2-firewall >= 4.6.1
# $os_release_version expansion in the <self_update_url> tag
Requires: yast2-installation >= 4.2.28
Requires: yast2-iscsi-client
Expand All @@ -77,8 +77,8 @@ Requires: yast2-x11
Requires: rubygem(%{rb_default_ruby_abi}:byebug)
# Install and enable xrdp by default (FATE#320363)
Requires: yast2-rdp
# Support for security policies (jsc#SLE-24764)
Requires: yast2-security >= 4.5.5
# Do a lazy initialization of security settings (bsc#1216615)
Requires: yast2-security >= 4.6.1

# Architecture specific packages
#
Expand All @@ -100,7 +100,7 @@ Requires: sap-installation-wizard

URL: https://github.com/yast/skelcd-control-leanos
AutoReqProv: off
Version: 15.6.4
Version: 15.6.5
Release: 0
Summary: Leanos control file needed for installation
License: MIT
Expand Down
Loading