From c836a80c80556c562f2493ec115fb420a6164915 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 30 Oct 2023 09:13:42 +0000
Subject: [PATCH 1/4] Fix security policy proposal order

---
 control/control.leanos.xml | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/control/control.leanos.xml b/control/control.leanos.xml
index bf672f0..e7b8c8f 100644
--- a/control/control.leanos.xml
+++ b/control/control.leanos.xml
@@ -428,6 +428,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>
@@ -443,10 +451,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">
@@ -472,6 +476,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>

From ee5aa15fca15ca07eaa7138e350836142f10e9e3 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 30 Oct 2023 09:16:09 +0000
Subject: [PATCH 2/4] Bump version & changelog

---
 package/skelcd-control-leanos.changes | 8 ++++++++
 package/skelcd-control-leanos.spec    | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/package/skelcd-control-leanos.changes b/package/skelcd-control-leanos.changes
index 2ac5c15..73f254d 100644
--- 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 <kanderssen@suse.com>
+
+- 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.5.7
+
 -------------------------------------------------------------------
 Tue Feb 28 10:36:43 UTC 2023 - Imobach Gonzalez Sosa <igonzalezsosa@suse.com>
 
diff --git a/package/skelcd-control-leanos.spec b/package/skelcd-control-leanos.spec
index 24d4027..7b90829 100644
--- a/package/skelcd-control-leanos.spec
+++ b/package/skelcd-control-leanos.spec
@@ -100,7 +100,7 @@ Requires:       sap-installation-wizard
 
 URL:            https://github.com/yast/skelcd-control-leanos
 AutoReqProv:    off
-Version:        15.5.6
+Version:        15.5.7
 Release:        0
 Summary:        Leanos control file needed for installation
 License:        MIT

From c6e10a978eb50068665c5d8499ae5b3a12107f91 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Mon, 30 Oct 2023 09:18:09 +0000
Subject: [PATCH 3/4] Update yast2-security dependency

---
 package/skelcd-control-leanos.spec | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/skelcd-control-leanos.spec b/package/skelcd-control-leanos.spec
index 7b90829..6da4d5d 100644
--- a/package/skelcd-control-leanos.spec
+++ b/package/skelcd-control-leanos.spec
@@ -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.5.7
 
 # Architecture specific packages
 #

From 8370e900eb237e3ec0985f3ae225c5792b2eeb7d Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Wed, 1 Nov 2023 13:22:15 +0000
Subject: [PATCH 4/4] Depend on yast2-firewall-4.5.1

---
 package/skelcd-control-leanos.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package/skelcd-control-leanos.spec b/package/skelcd-control-leanos.spec
index 6da4d5d..1949e06 100644
--- a/package/skelcd-control-leanos.spec
+++ b/package/skelcd-control-leanos.spec
@@ -51,7 +51,7 @@ 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
+Requires:       yast2-firewall >= 4.5.1
 # $os_release_version expansion in the <self_update_url> tag
 Requires:       yast2-installation >= 4.2.28
 Requires:       yast2-iscsi-client