Merge pull request #116 from yast/merge-sle-15-sp5

Merge SLE-15-SP5 into SLE-15-SP6
yast · Aug 9, 2024 · 8446730 · 8446730
2 parents 7fd2c45 + b8bc0de
commit 8446730
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 9 deletions.
diff --git a/control/control.leanos.xml b/control/control.leanos.xml
@@ -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>
@@ -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">
@@ -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>

diff --git a/package/skelcd-control-leanos.changes b/package/skelcd-control-leanos.changes
@@ -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]>
 

diff --git a/package/skelcd-control-leanos.spec b/package/skelcd-control-leanos.spec
@@ -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
@@ -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
 #
@@ -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