Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package skelcd-control-MicroOS for
openSUSE:Factory checked in at 2021-12-29 21:10:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/skelcd-control-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.skelcd-control-MicroOS.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "skelcd-control-MicroOS"
Wed Dec 29 21:10:42 2021 rev:22 rq:943024 version:20211228
Changes:
--------
---
/work/SRC/openSUSE:Factory/skelcd-control-MicroOS/skelcd-control-MicroOS.changes
2021-09-11 22:24:30.775385569 +0200
+++
/work/SRC/openSUSE:Factory/.skelcd-control-MicroOS.new.2520/skelcd-control-MicroOS.changes
2021-12-29 21:10:46.838276842 +0100
@@ -1,0 +2,7 @@
+Tue Dec 28 09:49:16 UTC 2021 - Knut Anderssen <[email protected]>
+
+- Added 'lsm' section for selecting and configuring the desired
+ Linux Security Module (jsc#SLE-22069)
+- 20211228
+
+-------------------------------------------------------------------
Old:
----
skelcd-control-MicroOS-20210907.tar.bz2
New:
----
skelcd-control-MicroOS-20211228.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ skelcd-control-MicroOS.spec ++++++
--- /var/tmp/diff_new_pack.XD2pef/_old 2021-12-29 21:10:47.258277187 +0100
+++ /var/tmp/diff_new_pack.XD2pef/_new 2021-12-29 21:10:47.262277191 +0100
@@ -34,8 +34,8 @@
BuildRequires: yast2-installation-control >= 4.4.3
# xsltproc - for building control.TWMicroOS.xml from control.MicroOS.xml
-BuildRequires: diffutils
BuildRequires: libxslt-tools
+BuildRequires: diffutils
# we need to copy some parts from the openSUSE control.xml to MicroOS
BuildRequires: skelcd-control-openSUSE
@@ -46,8 +46,8 @@
#
# branding
-Requires: yast2-qt-branding-openSUSE
Requires: yast2-theme
+Requires: yast2-qt-branding-openSUSE
# Generic Yast packages needed for the installer
Requires: autoyast2
@@ -118,7 +118,7 @@
URL: https://github.com/yast/skelcd-control-MicroOS
AutoReqProv: off
-Version: 20210907
+Version: 20211228
Release: 0
Summary: The MicroOS control file needed for installation
License: MIT
++++++ skelcd-control-MicroOS-20210907.tar.bz2 ->
skelcd-control-MicroOS-20211228.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20210907/.github/workflows/ci.yml
new/skelcd-control-MicroOS-20211228/.github/workflows/ci.yml
--- old/skelcd-control-MicroOS-20210907/.github/workflows/ci.yml
2021-09-07 14:29:58.000000000 +0200
+++ new/skelcd-control-MicroOS-20211228/.github/workflows/ci.yml
2021-12-28 22:49:05.000000000 +0100
@@ -8,7 +8,8 @@
jobs:
Package:
runs-on: ubuntu-latest
- container: registry.opensuse.org/yast/head/containers/yast-ruby:latest
+ container:
+ image: registry.opensuse.org/yast/head/containers/yast-ruby:latest
steps:
@@ -16,11 +17,19 @@
uses: actions/checkout@v2
- name: Install Prerequisites
- run: rake build_dependencies:install
+ # use jing for validation instead of xmllint
+ run: |-
+ rake build_dependencies:install
+ zypper --non-interactive install --no-recommends jing
# just for easier debugging...
- name: Inspect Installed Packages
run: rpm -qa | sort
+ # must be before the package build as it installs the
/usr/lib/skelcd/CD1/control.xml
+ # which overwrites the original file from skelcd-control-openSUSE
+ - name: Validate XML
+ run: rake test:validate
+
- name: Package Build
run: yast-ci-ruby -o package
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-MicroOS-20210907/README.md
new/skelcd-control-MicroOS-20211228/README.md
--- old/skelcd-control-MicroOS-20210907/README.md 2021-09-07
14:29:58.000000000 +0200
+++ new/skelcd-control-MicroOS-20211228/README.md 2021-12-28
22:49:05.000000000 +0100
@@ -8,4 +8,29 @@
See also the [documentation for the `control.xml` file][1].
+
+## Building openSUSE Tumbleweed XML
+
+Run `rake build` to build the final `control/control.TWMicroOS.xml` file. By
+default it uses the base openSUSE Tumbleweed XML file from the
+`skelcd-control-openSUSE` package.
+
+That can be changed via the `OPENSUSE_CONTROL` environment variable to point
to a Git
+checkout directly:
+``` shell
+OPENSUSE_CONTROL=../../skelcd-control-openSUSE/control/control.openSUSE.xml
rake build
+```
+
+*Note: A relative path needs to be relative to the `control` subdirectory.*
+
+## Validation
+
+Run `rake test:validation` to validate the built XML file. It uses `jing` for
+XML validation, if that is not installed it fallbacks to `xmllint` (which
+unfortunately has a worse error reporting).
+
+You can use the `OPENSUSE_CONTROL` environment variable to set the base XML
path,
+see above.
+
+
[1]: https://github.com/yast/yast-installation/blob/master/doc/control-file.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/skelcd-control-MicroOS-20210907/Rakefile
new/skelcd-control-MicroOS-20211228/Rakefile
--- old/skelcd-control-MicroOS-20210907/Rakefile 2021-09-07
14:29:58.000000000 +0200
+++ new/skelcd-control-MicroOS-20211228/Rakefile 2021-12-28
22:49:05.000000000 +0100
@@ -32,3 +32,42 @@
File.write(spec_file, spec)
end
end
+
+CONTROL_SCHEMA = "/usr/share/YaST2/control/control.rng".freeze
+XSL_FILE = "control/control.MicroOS.xsl".freeze
+DEFAULT_OPENSUSE_CONTROL="/usr/lib/skelcd/CD1/control.xml"
+OPENSUSE_CONTROL = ENV["OPENSUSE_CONTROL"] || DEFAULT_OPENSUSE_CONTROL
+TARGET_XML = "control/control.TWMicroOS.xml".freeze
+BASE_XML = "control/control.MicroOS.xml"
+
+file TARGET_XML => [ XSL_FILE, BASE_XML ] do
+ # the location is relative to the input file, change the CWD so relative
+ # paths work correctly
+ Dir.chdir("control") do
+ abort "Missing file #{OPENSUSE_CONTROL}" unless
File.exist?(OPENSUSE_CONTROL)
+ end
+
+ sh "xsltproc", "--stringparam", "openSUSE_control_file", OPENSUSE_CONTROL,
+ "--output", TARGET_XML, XSL_FILE, BASE_XML
+end
+
+desc "Build the TWMicroOS XML (set the base XML file via $OPENSUSE_CONTROL,
default: #{DEFAULT_OPENSUSE_CONTROL})"
+task :build => TARGET_XML.to_sym
+
+desc "Validate the built XML"
+task :"test:validate" => TARGET_XML do
+ begin
+ # prefer using jing for validation
+ sh "jing", CONTROL_SCHEMA, TARGET_XML
+ puts "OK"
+ rescue Errno::ENOENT
+ # fallback to xmllint
+ sh "xmllint", "--noout", "--relaxng", CONTROL_SCHEMA, TARGET_XML
+ end
+end
+
+desc "Remove the generated XML file"
+task :clean do
+ rm TARGET_XML if File.exist?(TARGET_XML)
+end
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20210907/control/control.MicroOS.xml
new/skelcd-control-MicroOS-20211228/control/control.MicroOS.xml
--- old/skelcd-control-MicroOS-20210907/control/control.MicroOS.xml
2021-09-07 14:29:58.000000000 +0200
+++ new/skelcd-control-MicroOS-20211228/control/control.MicroOS.xml
2021-12-28 22:49:05.000000000 +0100
@@ -78,15 +78,21 @@
<!-- bnc #431158: Adjusts /etc/sysconfig/security/POLKIT_DEFAULT_PRIVS
if set -->
<polkit_default_privs>restrictive</polkit_default_privs>
- <!-- Set SELinux enforcing mode by default -->
- <selinux>
- <mode>enforcing</mode>
+ <!-- Use SELinux in enforcing mode by default -->
+ <lsm>
+ <select>selinux</select>
+ <apparmor>
+ <selectable config:type="boolean">false</selectable>
+ </apparmor>
+ <selinux>
+ <!-- Set SELinux enforcing mode by default -->
+ <mode>enforcing</mode>
+ <configurable config:type="boolean">true</configurable>
+ <selectable config:type="boolean">true</selectable>
+ <patterns>microos_selinux</patterns>
+ </selinux>
<configurable config:type="boolean">true</configurable>
- <!-- There are two SELinux patterns available, "selinux" and
"microos_selinux".
- The latest has been chosen because its similarity with the one
used on
- SLE Micro, "microos-selinux" -->
- <patterns>microos_selinux</patterns>
- </selinux>
+ </lsm>
</globals>
<software>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20210907/control/control.MicroOS.xsl
new/skelcd-control-MicroOS-20211228/control/control.MicroOS.xsl
--- old/skelcd-control-MicroOS-20210907/control/control.MicroOS.xsl
2021-09-07 14:29:58.000000000 +0200
+++ new/skelcd-control-MicroOS-20211228/control/control.MicroOS.xsl
2021-12-28 22:49:05.000000000 +0100
@@ -1,5 +1,5 @@
<!--
- Definition of the control.Kubic.xml -> control.TWKubic.xml transformation.
+ Definition of the control.MicroOS.xml -> control.TWMicroOS.xml
transformation.
-->
<xsl:stylesheet version="1.0"
@@ -10,6 +10,9 @@
exclude-result-prefixes="n"
>
+ <!-- allow changing the input file with a command line parameter -->
+ <xsl:param name="openSUSE_control_file"
select="'/usr/lib/skelcd/CD1/control.xml'"/>
+
<xsl:output method="xml" indent="yes"/>
<xsl:template match="node()|@*">
@@ -22,9 +25,7 @@
<xsl:template match="n:software">
<xsl:copy>
<xsl:apply-templates select="node()|@*"/>
- <!-- Make sure this is the openSUSE control file!, try both (old and the
new) locations -->
- <xsl:copy-of
select="document('/usr/lib/skelcd/CD1/control.xml')/*/n:software/n:extra_urls"/>
- <xsl:copy-of
select="document('/CD1/control.xml')/*/n:software/n:extra_urls"/>
+ <xsl:copy-of
select="document($openSUSE_control_file)/*/n:software/n:extra_urls"/>
</xsl:copy>
</xsl:template>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20210907/package/skelcd-control-MicroOS.changes
new/skelcd-control-MicroOS-20211228/package/skelcd-control-MicroOS.changes
--- old/skelcd-control-MicroOS-20210907/package/skelcd-control-MicroOS.changes
2021-09-07 14:29:58.000000000 +0200
+++ new/skelcd-control-MicroOS-20211228/package/skelcd-control-MicroOS.changes
2021-12-28 22:49:05.000000000 +0100
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Tue Dec 28 09:49:16 UTC 2021 - Knut Anderssen <[email protected]>
+
+- Added 'lsm' section for selecting and configuring the desired
+ Linux Security Module (jsc#SLE-22069)
+- 20211228
+
+-------------------------------------------------------------------
Tue Sep 7 12:00:30 UTC 2021 - Knut Anderssen <[email protected]>
- Define default NTP servers for MicroOS (bsc#1180699)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/skelcd-control-MicroOS-20210907/package/skelcd-control-MicroOS.spec
new/skelcd-control-MicroOS-20211228/package/skelcd-control-MicroOS.spec
--- old/skelcd-control-MicroOS-20210907/package/skelcd-control-MicroOS.spec
2021-09-07 14:29:58.000000000 +0200
+++ new/skelcd-control-MicroOS-20211228/package/skelcd-control-MicroOS.spec
2021-12-28 22:49:05.000000000 +0100
@@ -118,7 +118,7 @@
Url: https://github.com/yast/skelcd-control-MicroOS
AutoReqProv: off
-Version: 20210907
+Version: 20211228
Release: 0
Summary: The MicroOS control file needed for installation
License: MIT
