Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-installation-control for 
openSUSE:Factory checked in at 2021-12-29 21:10:40
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation-control (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-installation-control.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation-control"

Wed Dec 29 21:10:40 2021 rev:44 rq:942892 version:4.4.7

Changes:
--------
--- 
/work/SRC/openSUSE:Factory/yast2-installation-control/yast2-installation-control.changes
    2021-12-13 20:46:56.896503835 +0100
+++ 
/work/SRC/openSUSE:Factory/.yast2-installation-control.new.2520/yast2-installation-control.changes
  2021-12-29 21:10:43.562274148 +0100
@@ -1,0 +2,13 @@
+Mon Dec 27 17:51:45 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Added "lsm" section for selecting and configuring the desired
+  Linux Security Module (jsc#SLE-22069)
+- 4.4.7
+
+-------------------------------------------------------------------
+Fri Dec 10 15:54:43 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Added "self_update_version" definition (bsc#1193536)
+- 4.4.6
+
+-------------------------------------------------------------------

Old:
----
  yast2-installation-control-4.4.5.tar.bz2

New:
----
  yast2-installation-control-4.4.7.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation-control.spec ++++++
--- /var/tmp/diff_new_pack.ErwOPP/_old  2021-12-29 21:10:43.946274464 +0100
+++ /var/tmp/diff_new_pack.ErwOPP/_new  2021-12-29 21:10:43.950274467 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation-control
-Version:        4.4.5
+Version:        4.4.7
 Release:        0
 Summary:        YaST2 - RNG schema for installation control files
 License:        GPL-2.0-only

++++++ yast2-installation-control-4.4.5.tar.bz2 -> 
yast2-installation-control-4.4.7.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-control-4.4.5/Rakefile 
new/yast2-installation-control-4.4.7/Rakefile
--- old/yast2-installation-control-4.4.5/Rakefile       2021-12-10 
13:14:55.000000000 +0100
+++ new/yast2-installation-control-4.4.7/Rakefile       2021-12-28 
10:14:02.000000000 +0100
@@ -17,6 +17,7 @@
   end
 end
 
+desc "Generate the RNG file from the RNC schema"
 task :generate_rng do
   unless system("which trang >/dev/null 2>&1")
     raise "Error: trang package is missing, please install it for proceeding 
with the conversion."
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-control-4.4.5/control/control.rnc 
new/yast2-installation-control-4.4.7/control/control.rnc
--- old/yast2-installation-control-4.4.5/control/control.rnc    2021-12-10 
13:14:55.000000000 +0100
+++ new/yast2-installation-control-4.4.7/control/control.rnc    2021-12-28 
10:14:02.000000000 +0100
@@ -156,6 +156,7 @@
     | show_drivers_info
     | self_update_url
     | self_update_id
+    | self_update_version
     | installation_ui
     | installation_layout
     | cpu_mitigations
@@ -164,7 +165,7 @@
     | precise_time
     | propose_hibernation
     | default_ntp_servers
-    | selinux
+    | lsm
 
 ## Default kernel parameters proposed by bootloader
 additional_kernel_parameters =         element additional_kernel_parameters { 
STRING }
@@ -267,6 +268,8 @@
 # Self-update id (bsc#1055556).
 ## It is an ID used to query SCC for the self update repo.
 self_update_id =                       element self_update_id { STRING }
+## Optional version for the product ID
+self_update_version =          element self_update_version { STRING }
 # Installation UI (boo#1088785)
 ## Enables alternative look of installation with sidebar.
 ## This options is deprecated if favor of installation_layout.
@@ -302,17 +305,46 @@
   LIST,
   element ntp_server { STRING }*
 }
+
+## Linux Security Module configuration ## 
+## Whether the module can be proposed/configured during installation
+lsm_configurable = element configurable  { BOOLEAN }
+## Whether the module can be selected during installation
+lsm_selectable = element selectable  { BOOLEAN }
+## Space-separated list of required/suggested patterns when using SELinux
+lsm_patterns =  element patterns { text }
+
+lsm = element lsm { MAP,
+  (
+    lsm_select? &
+    lsm_configurable? &
+    selinux? &
+    apparmor?
+  )
+}
+
+# Linux Security Major Module to be activted after installation
+lsm_select = element select { "apparmor" | "selinux" | "none" }
+lsm_module =
+  lsm_configurable
+  | lsm_selectable
+  | lsm_patterns
+
+## AppArmor options
+apparmor = element apparmor { MAP,
+  lsm_module*
+}
+
+## SELinux mode
+selinux_mode = element mode { "disabled" | "permissive" | "enforcing" }
+
 ## SELinux options
 selinux = element selinux {
   MAP,
     (
-      ## SELinux mode
-      element mode { "disabled" | "permissive" | "enforcing" }? &
-      ## Whether SELinux can be proposed/configured during installation
-      element configurable { BOOLEAN }? &
-      ## Space-separated list of required/suggested patterns when using SELinux
-      element patterns { text }?
-    )
+      lsm_module*
+      | selinux_mode?
+    )*
 }
 
 ## Defines which pieces of installation system should be copied to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-installation-control-4.4.5/control/control.rng 
new/yast2-installation-control-4.4.7/control/control.rng
--- old/yast2-installation-control-4.4.5/control/control.rng    2021-12-10 
13:14:55.000000000 +0100
+++ new/yast2-installation-control-4.4.7/control/control.rng    2021-12-28 
10:14:02.000000000 +0100
@@ -235,6 +235,7 @@
       <ref name="show_drivers_info"/>
       <ref name="self_update_url"/>
       <ref name="self_update_id"/>
+      <ref name="self_update_version"/>
       <ref name="installation_ui"/>
       <ref name="installation_layout"/>
       <ref name="cpu_mitigations"/>
@@ -243,7 +244,7 @@
       <ref name="precise_time"/>
       <ref name="propose_hibernation"/>
       <ref name="default_ntp_servers"/>
-      <ref name="selinux"/>
+      <ref name="lsm"/>
     </choice>
   </define>
   <define name="additional_kernel_parameters">
@@ -533,6 +534,12 @@
       <ref name="STRING"/>
     </element>
   </define>
+  <define name="self_update_version">
+    <a:documentation>Optional version for the product ID</a:documentation>
+    <element name="self_update_version">
+      <ref name="STRING"/>
+    </element>
+  </define>
   <!-- Installation UI (boo#1088785) -->
   <define name="installation_ui">
     <a:documentation>Enables alternative look of installation with sidebar.
@@ -621,36 +628,96 @@
       </zeroOrMore>
     </element>
   </define>
-  <define name="selinux">
-    <a:documentation>SELinux options</a:documentation>
-    <element name="selinux">
+  <define name="lsm_configurable">
+    <a:documentation>Linux Security Module configuration ## 
+Whether the module can be proposed/configured during 
installation</a:documentation>
+    <element name="configurable">
+      <ref name="BOOLEAN"/>
+    </element>
+  </define>
+  <define name="lsm_selectable">
+    <a:documentation>Whether the module can be selected during 
installation</a:documentation>
+    <element name="selectable">
+      <ref name="BOOLEAN"/>
+    </element>
+  </define>
+  <define name="lsm_patterns">
+    <a:documentation>Space-separated list of required/suggested patterns when 
using SELinux</a:documentation>
+    <element name="patterns">
+      <text/>
+    </element>
+  </define>
+  <define name="lsm">
+    <element name="lsm">
       <ref name="MAP"/>
       <interleave>
         <optional>
-          <element name="mode">
-            <a:documentation>SELinux mode</a:documentation>
-            <choice>
-              <value>disabled</value>
-              <value>permissive</value>
-              <value>enforcing</value>
-            </choice>
-          </element>
+          <ref name="lsm_select"/>
         </optional>
         <optional>
-          <element name="configurable">
-            <a:documentation>Whether SELinux can be proposed/configured during 
installation</a:documentation>
-            <ref name="BOOLEAN"/>
-          </element>
+          <ref name="lsm_configurable"/>
         </optional>
         <optional>
-          <element name="patterns">
-            <a:documentation>Space-separated list of required/suggested 
patterns when using SELinux</a:documentation>
-            <text/>
-          </element>
+          <ref name="selinux"/>
+        </optional>
+        <optional>
+          <ref name="apparmor"/>
         </optional>
       </interleave>
     </element>
   </define>
+  <!-- Linux Security Major Module to be activted after installation -->
+  <define name="lsm_select">
+    <element name="select">
+      <choice>
+        <value>apparmor</value>
+        <value>selinux</value>
+        <value>none</value>
+      </choice>
+    </element>
+  </define>
+  <define name="lsm_module">
+    <choice>
+      <ref name="lsm_configurable"/>
+      <ref name="lsm_selectable"/>
+      <ref name="lsm_patterns"/>
+    </choice>
+  </define>
+  <define name="apparmor">
+    <a:documentation>AppArmor options</a:documentation>
+    <element name="apparmor">
+      <ref name="MAP"/>
+      <zeroOrMore>
+        <ref name="lsm_module"/>
+      </zeroOrMore>
+    </element>
+  </define>
+  <define name="selinux_mode">
+    <a:documentation>SELinux mode</a:documentation>
+    <element name="mode">
+      <choice>
+        <value>disabled</value>
+        <value>permissive</value>
+        <value>enforcing</value>
+      </choice>
+    </element>
+  </define>
+  <define name="selinux">
+    <a:documentation>SELinux options</a:documentation>
+    <element name="selinux">
+      <ref name="MAP"/>
+      <zeroOrMore>
+        <choice>
+          <zeroOrMore>
+            <ref name="lsm_module"/>
+          </zeroOrMore>
+          <optional>
+            <ref name="selinux_mode"/>
+          </optional>
+        </choice>
+      </zeroOrMore>
+    </element>
+  </define>
   <define name="save_instsys_content">
     <a:documentation>Defines which pieces of installation system should be 
copied to
 the installed system before rebooting to second stage.</a:documentation>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-control-4.4.5/package/yast2-installation-control.changes 
new/yast2-installation-control-4.4.7/package/yast2-installation-control.changes
--- 
old/yast2-installation-control-4.4.5/package/yast2-installation-control.changes 
    2021-12-10 13:14:55.000000000 +0100
+++ 
new/yast2-installation-control-4.4.7/package/yast2-installation-control.changes 
    2021-12-28 10:14:02.000000000 +0100
@@ -1,4 +1,17 @@
 -------------------------------------------------------------------
+Mon Dec 27 17:51:45 UTC 2021 - Knut Anderssen <kanders...@suse.com>
+
+- Added "lsm" section for selecting and configuring the desired
+  Linux Security Module (jsc#SLE-22069)
+- 4.4.7
+
+-------------------------------------------------------------------
+Fri Dec 10 15:54:43 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Added "self_update_version" definition (bsc#1193536)
+- 4.4.6
+
+-------------------------------------------------------------------
 Thu Dec  9 13:00:27 UTC 2021 - Jos?? Iv??n L??pez Gonz??lez <jlo...@suse.com>
 
 - Partitioning section: add mount_options for volumes (related to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-control-4.4.5/package/yast2-installation-control.spec 
new/yast2-installation-control-4.4.7/package/yast2-installation-control.spec
--- 
old/yast2-installation-control-4.4.5/package/yast2-installation-control.spec    
    2021-12-10 13:14:55.000000000 +0100
+++ 
new/yast2-installation-control-4.4.7/package/yast2-installation-control.spec    
    2021-12-28 10:14:02.000000000 +0100
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation-control
-Version:        4.4.5
+Version:        4.4.7
 Release:        0
 Summary:        YaST2 - RNG schema for installation control files
 License:        GPL-2.0-only

Reply via email to