December 2021 - openSUSE Commits - openSUSE Mailing Lists

commit wine for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at 2021-12-29 21:10:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/wine (Old) and /work/SRC/openSUSE:Factory/.wine.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "wine" Wed Dec 29 21:10:43 2021 rev:361 rq:942897 version:7.0~rc3 Changes: -------- --- /work/SRC/openSUSE:Factory/wine/wine.changes 2021-12-19 17:23:21.611781247 +0100 +++ /work/SRC/openSUSE:Factory/.wine.new.2520/wine.changes 2021-12-29 21:10:52.742281696 +0100 @@ -1,0 +2,7 @@ +Mon Dec 27 08:14:52 UTC 2021 - Marcus Meissner <meissner(a)suse.com> + +- updated to 7.0-rc3 release candidate + - Bug fixes only, we are in code freeze. +- update staging to 7.0-rc3 release + +------------------------------------------------------------------- @@ -4 +11 @@ -- updated to 7.0-rc2 release canddat only, we are in code freeze. +- updated to 7.0-rc2 release candidate Old: ---- wine-7.0-rc2.tar.xz wine-7.0-rc2.tar.xz.sign wine-staging-7.0-rc2.tar.xz New: ---- wine-7.0-rc3.tar.xz wine-7.0-rc3.tar.xz.sign wine-staging-7.0-rc3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.mp6b1t/_old 2021-12-29 21:10:55.030283577 +0100 +++ /var/tmp/diff_new_pack.mp6b1t/_new 2021-12-29 21:10:55.034283581 +0100 @@ -29,8 +29,8 @@ %endif # needs to be on top due to usage of %version macro below -%define realver 7.0-rc2 -Version: 7.0~rc2 +%define realver 7.0-rc3 +Version: 7.0~rc3 Release: 0 %if "%{flavor}" != "" @@ -161,7 +161,7 @@ ExclusiveArch: %{ix86} x86_64 ppc armv7l armv7hl aarch64 %if %{staging} # upstream patch target version -%define staging_version 7.0-rc2 +%define staging_version 7.0-rc3 Source100: wine-staging-%{staging_version}.tar.xz BuildRequires: gtk3-devel BuildRequires: libOSMesa-devel ++++++ _service ++++++ --- /var/tmp/diff_new_pack.mp6b1t/_old 2021-12-29 21:10:55.094283630 +0100 +++ /var/tmp/diff_new_pack.mp6b1t/_new 2021-12-29 21:10:55.098283633 +0100 @@ -3,7 +3,7 @@ <param name="versionformat">@PARENT_TAG@</param> <param name="versionrewrite-pattern">v(.*)</param> <param name="url">https://github.com/wine-staging/wine-staging.git</param> - <param name="revision">refs/tags/v7.0-rc2</param> + <param name="revision">refs/tags/v7.0-rc3</param> <param name="match-tag">v*.*</param> <param name="scm">git</param> </service> ++++++ wine-7.0-rc2.tar.xz -> wine-7.0-rc3.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-7.0-rc2.tar.xz /work/SRC/openSUSE:Factory/.wine.new.2520/wine-7.0-rc3.tar.xz differ: char 26, line 1 ++++++ wine-staging-7.0-rc2.tar.xz -> wine-staging-7.0-rc3.tar.xz ++++++ /work/SRC/openSUSE:Factory/wine/wine-staging-7.0-rc2.tar.xz /work/SRC/openSUSE:Factory/.wine.new.2520/wine-staging-7.0-rc3.tar.xz differ: char 15, line 1

1 0

commit python-HyperKitty for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-HyperKitty for openSUSE:Factory checked in at 2021-12-29 21:10:43 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-HyperKitty (Old) and /work/SRC/openSUSE:Factory/.python-HyperKitty.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-HyperKitty" Wed Dec 29 21:10:43 2021 rev:13 rq:941157 version:1.3.5 Changes: -------- --- /work/SRC/openSUSE:Factory/python-HyperKitty/python-HyperKitty.changes 2021-06-04 00:33:32.280889885 +0200 +++ /work/SRC/openSUSE:Factory/.python-HyperKitty.new.2520/python-HyperKitty.changes 2021-12-29 21:10:50.322279706 +0100 @@ -1,0 +2,19 @@ +Fri Dec 17 10:25:31 UTC 2021 - Matej Cepl <mcepl(a)suse.com> + +- Add hyperkitty-fix-mistune-2.0-imports.patch ... two function + moved in mistune 2.0 (gl#mailman/hyperkitty#379). + +------------------------------------------------------------------- +Thu Dec 16 15:11:02 UTC 2021 - Sasi Olin <hel(a)lcp.world> + +- Add a patch that fixes compatibility with the full release of mistune 2.0 + +------------------------------------------------------------------- +Wed Nov 17 08:30:52 UTC 2021 - Andreas Schneider <asn(a)cryptomilk.org> + +- Update to version 1.3.5 + * https://gitlab.com/mailman/hyperkitty/-/blob/1.3.5/doc/news.rst +- Fixes CVE-2021-35057 +- Removed obsolete python-HyperKitty-CVE-2021-33038.patch + +------------------------------------------------------------------- Old: ---- HyperKitty-1.3.4.tar.gz python-HyperKitty-CVE-2021-33038.patch New: ---- HyperKitty-1.3.5.tar.gz hyperkitty-fix-mistune-2.0-imports.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-HyperKitty.spec ++++++ --- /var/tmp/diff_new_pack.Nhq8zt/_old 2021-12-29 21:10:50.870280157 +0100 +++ /var/tmp/diff_new_pack.Nhq8zt/_new 2021-12-29 21:10:50.874280160 +0100 @@ -35,7 +35,7 @@ # mailman is built only for primary python3 flavor %define pythons python3 Name: python-HyperKitty -Version: 1.3.4 +Version: 1.3.5 Release: 0 Summary: A web interface to access GNU Mailman v3 archives License: GPL-3.0-only @@ -53,13 +53,17 @@ # Source30: README.SUSE.md # +# PATCH-FIX-OPENSUSE hyperkitty-settings.patch mcepl(a)suse.com +# hard-code locations of configuration files Patch0: hyperkitty-settings.patch -# CVE-2021-33038 [bsc#1186575], information disclosure when importing a private mailing list -Patch1: python-HyperKitty-CVE-2021-33038.patch +# PATCH-FIX-UPSTREAM hyperkitty-fix-mistune-2.0-imports.patch gl#mailman/hyperkitty#379 mcepl(a)suse.com +# Two elements moved in mistune 2.0 +Patch1: hyperkitty-fix-mistune-2.0-imports.patch # BuildRequires: %{python_module django-debug-toolbar >= 2.2} BuildRequires: %{python_module isort} BuildRequires: %{python_module libsass} +BuildRequires: %{python_module mistune >= 2.0} BuildRequires: %{python_module setuptools} BuildRequires: acl BuildRequires: fdupes @@ -73,12 +77,13 @@ Requires: python-django-extensions >= 1.3.7 Requires: python-django-gravatar2 >= 1.0.6 Requires: python-django-haystack >= 2.8.0 -Requires: python-django-mailman3 >= 1.2.0 -Requires: python-django-q >= 1.0.0 +Requires: python-django-mailman3 >= 1.3.7 +Requires: python-django-q >= 1.3.9 Requires: python-djangorestframework >= 3.0.0 Requires: python-flufl.lock Requires: python-libsass -Requires: python-mailmanclient >= 3.1.1 +Requires: python-mailmanclient >= 3.3.2 +Requires: python-mistune Requires: python-networkx >= 1.9.1 Requires: python-python-dateutil >= 2.0 Requires: python-pytz >= 2012 @@ -93,12 +98,14 @@ BuildRequires: %{python_module django-extensions >= 1.3.7} BuildRequires: %{python_module django-gravatar2 >= 1.0.6} BuildRequires: %{python_module django-haystack >= 2.8.0} -BuildRequires: %{python_module django-mailman3 >= 1.2.0} -BuildRequires: %{python_module django-q >= 1.0.0} +BuildRequires: %{python_module django-mailman3 >= 1.3.7} +BuildRequires: %{python_module django-q >= 1.3.9} BuildRequires: %{python_module djangorestframework >= 3.0.0} BuildRequires: %{python_module elasticsearch} BuildRequires: %{python_module flufl.lock} -BuildRequires: %{python_module mailmanclient >= 3.1.1} +BuildRequires: %{python_module lxml} +BuildRequires: %{python_module mailmanclient >= 3.3.2} +BuildRequires: %{python_module mistune} BuildRequires: %{python_module mock} BuildRequires: %{python_module networkx >= 1.9.1} BuildRequires: %{python_module pytest-django} ++++++ HyperKitty-1.3.4.tar.gz -> HyperKitty-1.3.5.tar.gz ++++++ ++++ 79534 lines of diff (skipped) ++++++ hyperkitty-fix-mistune-2.0-imports.patch ++++++ From 2c3c189c9aacef3f54de2ae0f653aa13c6167093 Mon Sep 17 00:00:00 2001 From: David Runge <dave(a)sleepmap.de> Date: Sun, 5 Dec 2021 12:39:01 +0100 Subject: [PATCH 1/3] Fix mistune imports for mistune >= 2.0.0 hyperkitty/lib/renderer.py: With mistune 2.0.0 the `escape_url()` and `escape_html()` are moved to mistune.util. --- hyperkitty/lib/renderer.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyperkitty/lib/renderer.py b/hyperkitty/lib/renderer.py index cf54e7c0..96f026db 100644 --- a/hyperkitty/lib/renderer.py +++ b/hyperkitty/lib/renderer.py @@ -4,7 +4,7 @@ from django.conf import settings import mistune from mistune.plugins.extra import plugin_url -from mistune.scanner import escape_html, escape_url +from mistune.util import escape_html, escape_url class MyRenderer(mistune.HTMLRenderer): -- GitLab From 0807a57860c57ebfe0542cc9d58fedf1ed5582d5 Mon Sep 17 00:00:00 2001 From: David Runge <dave(a)sleepmap.de> Date: Sun, 5 Dec 2021 12:40:10 +0100 Subject: [PATCH 2/3] Require mistune >= 2.0.0 setup.py: Require mistune >= 2.0.0 to rely on a stable mistune release. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 6cc7636e..c16294b0 100755 --- a/setup.py +++ b/setup.py @@ -45,7 +45,7 @@ REQUIRES = [ "pytz>=2012", "django-compressor>=1.3", "mailmanclient>=3.3.3", - "mistune>=2.0.0rc1", + "mistune>=2.0.0", "python-dateutil >= 2.0", "networkx>=2.0", "django-haystack>=2.8.0", -- GitLab ++++++ hyperkitty-settings.patch ++++++ --- /var/tmp/diff_new_pack.Nhq8zt/_old 2021-12-29 21:10:51.294280506 +0100 +++ /var/tmp/diff_new_pack.Nhq8zt/_new 2021-12-29 21:10:51.298280509 +0100 @@ -1,8 +1,8 @@ -Index: HyperKitty-1.3.3/example_project/settings.py +Index: HyperKitty-1.3.5/example_project/settings.py =================================================================== ---- HyperKitty-1.3.3.orig/example_project/settings.py -+++ HyperKitty-1.3.3/example_project/settings.py -@@ -134,7 +134,7 @@ DATABASES = { +--- HyperKitty-1.3.5.orig/example_project/settings.py 2021-10-12 23:40:25.000000000 +0200 ++++ HyperKitty-1.3.5/example_project/settings.py 2021-11-17 09:36:12.809720361 +0100 +@@ -135,7 +135,7 @@ DATABASES = { # Use 'sqlite3', 'postgresql_psycopg2', 'mysql', 'sqlite3' or 'oracle'. 'ENGINE': 'django.db.backends.sqlite3', # DB name or path to database file if using sqlite3. @@ -11,7 +11,7 @@ # The following settings are not used with sqlite3: 'USER': 'hyperkitty', 'PASSWORD': 'hkpass', -@@ -202,7 +202,7 @@ USE_TZ = True +@@ -203,7 +203,7 @@ USE_TZ = True # Don't put anything in this directory yourself; store your static files # in apps' "static/" subdirectories and in STATICFILES_DIRS. # Example: "/var/www/example.com/static/" @@ -20,7 +20,7 @@ # URL prefix for static files. # Example: "http://example.com/static/", "http://static.example.com/" -@@ -395,7 +395,7 @@ LOGGING = { +@@ -396,7 +396,7 @@ LOGGING = { 'level': 'INFO', #'class': 'logging.handlers.RotatingFileHandler', 'class': 'logging.handlers.WatchedFileHandler', @@ -28,5 +28,5 @@ + 'filename': '/var/log/hyperkitty/hyperkitty.log', 'formatter': 'verbose', }, - }, + 'console': {

1 0

commit yast2-security for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-security for openSUSE:Factory checked in at 2021-12-29 21:10:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-security (Old) and /work/SRC/openSUSE:Factory/.yast2-security.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-security" Wed Dec 29 21:10:42 2021 rev:107 rq:943067 version:4.4.3 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-security/yast2-security.changes 2021-07-17 23:36:51.153870820 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-security.new.2520/yast2-security.changes 2021-12-29 21:10:48.006277802 +0100 @@ -1,0 +2,14 @@ +Wed Dec 29 11:47:15 UTC 2021 - Knut Anderssen <kanderssen(a)suse.com> + +- Added back the selinux boot parameter when selinux is selected + and not disabled in order to switch on SELinux (jsc#SLE-22069) +- 4.4.3 + +------------------------------------------------------------------- +Wed Dec 22 23:06:57 UTC 2021 - Knut Anderssen <kanderssen(a)suse.com> + +- Add support for selecting and configuring the desired Linux + Security Module (jsc#SLE-22069) +- 4.4.2 + +------------------------------------------------------------------- Old: ---- yast2-security-4.4.1.tar.bz2 New: ---- yast2-security-4.4.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-security.spec ++++++ --- /var/tmp/diff_new_pack.y4ketS/_old 2021-12-29 21:10:49.458278996 +0100 +++ /var/tmp/diff_new_pack.y4ketS/_new 2021-12-29 21:10:49.462278999 +0100 @@ -17,7 +17,7 @@ Name: yast2-security -Version: 4.4.1 +Version: 4.4.3 Release: 0 Summary: YaST2 - Security Configuration License: GPL-2.0-only ++++++ yast2-security-4.4.1.tar.bz2 -> yast2-security-4.4.3.tar.bz2 ++++++ ++++ 4167 lines of diff (skipped)

1 0

commit skelcd-control-MicroOS for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

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 <kanderssen(a)suse.com> + +- 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 @@  <polkit_default_privs>restrictive</polkit_default_privs> -  - <selinux> - <mode>enforcing</mode> +  + <lsm> + <select>selinux</select> + <apparmor> + <selectable config:type="boolean">false</selectable> + </apparmor> + <selinux> +  + <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> -  - <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 @@  <xsl:stylesheet version="1.0" @@ -10,6 +10,9 @@ exclude-result-prefixes="n" > +  + <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()|@*"/> -  - <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 <kanderssen(a)suse.com> + +- 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 <kanderssen(a)suse.com> - 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

1 0

commit skelcd-control-openSUSE for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package skelcd-control-openSUSE for openSUSE:Factory checked in at 2021-12-29 21:10:41 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/skelcd-control-openSUSE (Old) and /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "skelcd-control-openSUSE" Wed Dec 29 21:10:41 2021 rev:227 rq:942903 version:20211227 Changes: -------- --- /work/SRC/openSUSE:Factory/skelcd-control-openSUSE/skelcd-control-openSUSE-promo.changes 2021-09-11 22:24:27.863382698 +0200 +++ /work/SRC/openSUSE:Factory/.skelcd-control-openSUSE.new.2520/skelcd-control-openSUSE-promo.changes 2021-12-29 21:10:44.538274951 +0100 @@ -1,0 +2,7 @@ +Mon Dec 27 17:29:08 UTC 2021 - Knut Anderssen <kanderssen(a)suse.com> + +- Added 'lsm' section for selecting and configuring the desired + Linux Security Module (jsc#SLE-22069) +- 20211227 + +------------------------------------------------------------------- skelcd-control-openSUSE.changes: same change Old: ---- skelcd-control-openSUSE-20210906.tar.bz2 New: ---- skelcd-control-openSUSE-20211227.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ skelcd-control-openSUSE-promo.spec ++++++ --- /var/tmp/diff_new_pack.PxYhou/_old 2021-12-29 21:10:46.630276671 +0100 +++ /var/tmp/diff_new_pack.PxYhou/_new 2021-12-29 21:10:46.634276674 +0100 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE-promo -Version: 20210906 +Version: 20211227 Release: 0 Summary: The openSUSE Installation Control file License: MIT @@ -40,8 +40,8 @@ BuildRequires: libxml2-tools # xsltproc BuildRequires: libxslt-tools -# RNG schema -BuildRequires: yast2-installation-control >= 4.4.3 +# Added 'lsm' section (jsc#SLE-22069) +BuildRequires: yast2-installation-control >= 4.4.7 ###################################################################### # # Here is the list of Yast packages which are needed in the skelcd-control-openSUSE.spec: same change ++++++ skelcd-control-openSUSE-20210906.tar.bz2 -> skelcd-control-openSUSE-20211227.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20210906/.github/workflows/ci.yml new/skelcd-control-openSUSE-20211227/.github/workflows/ci.yml --- old/skelcd-control-openSUSE-20210906/.github/workflows/ci.yml 2021-09-07 10:58:06.000000000 +0200 +++ new/skelcd-control-openSUSE-20211227/.github/workflows/ci.yml 2021-12-28 11:12:20.000000000 +0100 @@ -10,7 +10,8 @@ # checks into one job avoids that overhead Checks: 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: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20210906/control/control.openSUSE.xml new/skelcd-control-openSUSE-20211227/control/control.openSUSE.xml --- old/skelcd-control-openSUSE-20210906/control/control.openSUSE.xml 2021-09-07 10:58:06.000000000 +0200 +++ new/skelcd-control-openSUSE-20211227/control/control.openSUSE.xml 2021-12-28 11:12:20.000000000 +0100 @@ -78,12 +78,22 @@  <enable_kdump config:type="boolean">true</enable_kdump> -  - <selinux> - <mode>disabled</mode> + <lsm> + <select>apparmor</select> + <apparmor> + <patterns>apparmor</patterns> + <selectable config:type="boolean">true</selectable> + </apparmor> +  + <selinux> + <mode>permissive</mode> + <configurable config:type="boolean">true</configurable> + <selectable config:type="boolean">true</selectable> + <patterns>selinux</patterns> + </selinux> <configurable config:type="boolean">true</configurable> - <patterns>selinux</patterns> - </selinux> + </lsm> +  <debug_deploying config:type="boolean">false</debug_deploying> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20210906/package/skelcd-control-openSUSE.changes new/skelcd-control-openSUSE-20211227/package/skelcd-control-openSUSE.changes --- old/skelcd-control-openSUSE-20210906/package/skelcd-control-openSUSE.changes 2021-09-07 10:58:06.000000000 +0200 +++ new/skelcd-control-openSUSE-20211227/package/skelcd-control-openSUSE.changes 2021-12-28 11:12:20.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 27 17:29:08 UTC 2021 - Knut Anderssen <kanderssen(a)suse.com> + +- Added 'lsm' section for selecting and configuring the desired + Linux Security Module (jsc#SLE-22069) +- 20211227 + +------------------------------------------------------------------- Mon Sep 6 09:44:46 UTC 2021 - Josef Reidinger <jreidinger(a)suse.com> - Define default ntp servers (bsc#1180699) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/skelcd-control-openSUSE-20210906/package/skelcd-control-openSUSE.spec new/skelcd-control-openSUSE-20211227/package/skelcd-control-openSUSE.spec --- old/skelcd-control-openSUSE-20210906/package/skelcd-control-openSUSE.spec 2021-09-07 10:58:06.000000000 +0200 +++ new/skelcd-control-openSUSE-20211227/package/skelcd-control-openSUSE.spec 2021-12-28 11:12:20.000000000 +0100 @@ -27,7 +27,7 @@ # ###################################################################### Name: skelcd-control-openSUSE -Version: 20210906 +Version: 20211227 Release: 0 Summary: The openSUSE Installation Control file License: MIT @@ -40,8 +40,8 @@ BuildRequires: libxml2-tools # xsltproc BuildRequires: libxslt-tools -# RNG schema -BuildRequires: yast2-installation-control >= 4.4.3 +# Added 'lsm' section (jsc#SLE-22069) +BuildRequires: yast2-installation-control >= 4.4.7 ###################################################################### # # Here is the list of Yast packages which are needed in the

1 0

commit yast2-installation-control for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

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 <kanderssen(a)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 <lslezak(a)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>  <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> +  + <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 <kanderssen(a)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 <lslezak(a)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 <jlopez(a)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

1 0

commit yast2-schema for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-schema for openSUSE:Factory checked in at 2021-12-29 21:10:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-schema (Old) and /work/SRC/openSUSE:Factory/.yast2-schema.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-schema" Wed Dec 29 21:10:40 2021 rev:76 rq:942826 version:4.4.7 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-schema/yast2-schema.changes 2021-11-23 22:11:59.650595400 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-schema.new.2520/yast2-schema.changes 2021-12-29 21:10:42.830273547 +0100 @@ -1,0 +2,6 @@ +Fri Dec 24 08:50:55 UTC 2021 - Knut Anderssen <kanderssen(a)suse.com> + +- Added 'lsm' section to the security schema (jsc#SLE-22069) +- 4.4.7 + +------------------------------------------------------------------- Old: ---- yast2-schema-4.4.6.tar.bz2 New: ---- yast2-schema-4.4.7.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-schema.spec ++++++ --- /var/tmp/diff_new_pack.EH37W9/_old 2021-12-29 21:10:43.322273951 +0100 +++ /var/tmp/diff_new_pack.EH37W9/_new 2021-12-29 21:10:43.326273954 +0100 @@ -17,7 +17,7 @@ Name: yast2-schema -Version: 4.4.6 +Version: 4.4.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -81,8 +81,8 @@ %endif BuildRequires: yast2-samba-client BuildRequires: yast2-samba-server -# sys_gid_max, sys_gid_min, sys_uid_max,... in security.rnc -BuildRequires: yast2-security >= 4.2.8 +# Added lsm section to security.rnc +BuildRequires: yast2-security >= 4.4.2 BuildRequires: yast2-services-manager BuildRequires: yast2-sound BuildRequires: yast2-squid ++++++ yast2-schema-4.4.6.tar.bz2 -> yast2-schema-4.4.7.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.4.6/package/yast2-schema.changes new/yast2-schema-4.4.7/package/yast2-schema.changes --- old/yast2-schema-4.4.6/package/yast2-schema.changes 2021-11-19 13:31:13.000000000 +0100 +++ new/yast2-schema-4.4.7/package/yast2-schema.changes 2021-12-27 18:21:25.000000000 +0100 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Dec 24 08:50:55 UTC 2021 - Knut Anderssen <kanderssen(a)suse.com> + +- Added 'lsm' section to the security schema (jsc#SLE-22069) +- 4.4.7 + +------------------------------------------------------------------- Fri Nov 19 12:20:02 UTC 2021 - Knut Anderssen <kanderssen(a)suse.com> - Add 'efi' element to the rules schema (jsc#SLE-18819) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-schema-4.4.6/package/yast2-schema.spec new/yast2-schema-4.4.7/package/yast2-schema.spec --- old/yast2-schema-4.4.6/package/yast2-schema.spec 2021-11-19 13:31:13.000000000 +0100 +++ new/yast2-schema-4.4.7/package/yast2-schema.spec 2021-12-27 18:21:25.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-schema -Version: 4.4.6 +Version: 4.4.7 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -83,8 +83,8 @@ %endif BuildRequires: yast2-samba-client BuildRequires: yast2-samba-server -# sys_gid_max, sys_gid_min, sys_uid_max,... in security.rnc -BuildRequires: yast2-security >= 4.2.8 +# Added lsm section to security.rnc +BuildRequires: yast2-security >= 4.4.2 BuildRequires: yast2-services-manager BuildRequires: yast2-sound BuildRequires: yast2-squid

1 0

commit yast2-installation for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at 2021-12-29 21:10:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old) and /work/SRC/openSUSE:Factory/.yast2-installation.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "yast2-installation" Wed Dec 29 21:10:39 2021 rev:487 rq:942823 version:4.4.31 Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes 2021-12-18 20:30:08.442239034 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-installation.new.2520/yast2-installation.changes 2021-12-29 21:10:41.706272623 +0100 @@ -1,0 +2,7 @@ +Mon Dec 27 07:22:50 UTC 2021 - Knut Alejandro Anderssen Gonz��lez <kanderssen(a)suse.com> + +- Add support for selecting and configuring the desired Linux + Security Module during installation (jsc#SLE-22069) +- 4.4.31 + +------------------------------------------------------------------- Old: ---- yast2-installation-4.4.30.tar.bz2 New: ---- yast2-installation-4.4.31.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.7K0rgF/_old 2021-12-29 21:10:42.182273014 +0100 +++ /var/tmp/diff_new_pack.7K0rgF/_new 2021-12-29 21:10:42.186273017 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.4.30 +Version: 4.4.31 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only @@ -43,7 +43,7 @@ BuildRequires: yast2-packager >= 4.4.13 # for AbortException and handle direct abort BuildRequires: yast2-ruby-bindings >= 4.0.6 -# For selinux classes +# For LSM classes BuildRequires: yast2-security # using /usr/bin/udevadm BuildRequires: yast2-storage-ng >= 4.2.71 @@ -117,8 +117,8 @@ Conflicts: yast2-pkg-bindings < 2.17.25 # Registration#get_updates_list does not handle exceptions Conflicts: yast2-registration < 3.2.3 -# moved security_finish client -Conflicts: yast2-security < 4.3.11 +# Added support for selecting the desired LSM during installation +Conflicts: yast2-security < 4.4.2 # Top bar with logo Conflicts: yast2-ycp-ui-bindings < 3.1.7 Obsoletes: yast2-installation-devel-doc ++++++ yast2-installation-4.4.30.tar.bz2 -> yast2-installation-4.4.31.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/.rubocop.yml new/yast2-installation-4.4.31/.rubocop.yml --- old/yast2-installation-4.4.30/.rubocop.yml 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/.rubocop.yml 2021-12-27 18:18:06.000000000 +0100 @@ -2,6 +2,10 @@ inherit_from: /usr/share/YaST2/data/devtools/data/rubocop_yast_style.yml + +AllCops: + TargetRubyVersion: 2.3 + # Offense count: 153 Metrics/AbcSize: Max: 304 @@ -69,3 +73,6 @@ Exclude: # mocked Registration.is_registered? - test/lib/upgrade_repo_manager_test.rb + +Style/FrozenStringLiteralComment: + Enabled: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/package/yast2-installation.changes new/yast2-installation-4.4.31/package/yast2-installation.changes --- old/yast2-installation-4.4.30/package/yast2-installation.changes 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/package/yast2-installation.changes 2021-12-27 18:18:06.000000000 +0100 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Mon Dec 27 07:22:50 UTC 2021 - Knut Alejandro Anderssen Gonz��lez <kanderssen(a)suse.com> + +- Add support for selecting and configuring the desired Linux + Security Module during installation (jsc#SLE-22069) +- 4.4.31 + +------------------------------------------------------------------- Thu Dec 16 13:43:05 UTC 2021 - Ladislav Slez��k <lslezak(a)suse.cz> - Self-update now supports relative URLs (relurl://), it defines diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/package/yast2-installation.spec new/yast2-installation-4.4.31/package/yast2-installation.spec --- old/yast2-installation-4.4.30/package/yast2-installation.spec 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/package/yast2-installation.spec 2021-12-27 18:18:06.000000000 +0100 @@ -17,7 +17,7 @@ Name: yast2-installation -Version: 4.4.30 +Version: 4.4.31 Release: 0 Summary: YaST2 - Installation Parts License: GPL-2.0-only @@ -43,7 +43,7 @@ BuildRequires: yast2-packager >= 4.4.13 # for AbortException and handle direct abort BuildRequires: yast2-ruby-bindings >= 4.0.6 -# For selinux classes +# For LSM classes BuildRequires: yast2-security # using /usr/bin/udevadm BuildRequires: yast2-storage-ng >= 4.2.71 @@ -117,8 +117,8 @@ Conflicts: yast2-pkg-bindings < 2.17.25 # Registration#get_updates_list does not handle exceptions Conflicts: yast2-registration < 3.2.3 -# moved security_finish client -Conflicts: yast2-security < 4.3.11 +# Added support for selecting the desired LSM during installation +Conflicts: yast2-security < 4.4.2 # Top bar with logo Conflicts: yast2-ycp-ui-bindings < 3.1.7 Obsoletes: yast2-installation-devel-doc diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/src/lib/installation/clients/security_finish.rb new/yast2-installation-4.4.31/src/lib/installation/clients/security_finish.rb --- old/yast2-installation-4.4.30/src/lib/installation/clients/security_finish.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/src/lib/installation/clients/security_finish.rb 2021-12-27 18:18:06.000000000 +0100 @@ -84,8 +84,8 @@ "/usr/bin/chkstat --system --set") log.info("updating capabilities: #{res}") - # Write down selinux configuration - settings.selinux_config.save + # Write down the Linux Security Module configuration + settings.lsm_config.save true end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/src/lib/installation/clients/security_proposal.rb new/yast2-installation-4.4.31/src/lib/installation/clients/security_proposal.rb --- old/yast2-installation-4.4.30/src/lib/installation/clients/security_proposal.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/src/lib/installation/clients/security_proposal.rb 2021-12-27 18:18:06.000000000 +0100 @@ -133,7 +133,7 @@ def proposals # Filter proposals with content [cpu_mitigations_proposal, firewall_proposal, sshd_proposal, - ssh_port_proposal, vnc_fw_proposal, selinux_proposal, + ssh_port_proposal, vnc_fw_proposal, lsm_proposal, polkit_default_priv_proposal].compact end @@ -238,16 +238,35 @@ format(_("PolicyKit Default Privileges: %s"), human_value) end - def selinux_proposal - return nil unless @settings.selinux_config.configurable? + # Returns the text describing the Linux Security Module proposal or nil in case that there is + # no module selected explicitly. + # + # @return [String, nil] returns the description of the selected LSM or nil in case no module + # is selected explicitly + def lsm_proposal + return nil unless @settings.lsm_config.configurable? # add required patterns - Yast::PackagesProposal.SetResolvables("SELinux", :pattern, - @settings.selinux_config.needed_patterns) - - _( - "SELinux Default Mode is %s" - ) % @settings.selinux_config.mode.to_human_string + log.info("Setting LSM resolvables to : #{(a)settings.lsm_config.needed_patterns}") + Yast::PackagesProposal.SetResolvables("LSM", :pattern, @settings.lsm_config.needed_patterns) + selected = @settings.lsm_config.selected + case selected&.id + when :selinux + # TRANSLATORS: Proposal's text describing that the active Linux Security Major Module + # after the installation will be SELinux running in the selected mode which could be + # 'enforcing', 'permissive' or 'disabled' + format(_( + "Linux Security Module: Activate %{module} in '%{mode}' mode" + ), module: selected.label, mode: selected.mode.to_human_string) + when :apparmor + # TRANSLATORS: Proposal's text describing that the active Linux Security Major Module + # after the installation will be AppArmor + format(_("Linux Security Module: Activate %{module}"), module: selected.label) + when :none + # TRANSLATORS: Proposal's text describing that no Linux Security Major Module will be + # activated after the installation + _("Linux Security Module: No major module will be activated") + end end end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/src/lib/installation/dialogs/security.rb new/yast2-installation-4.4.31/src/lib/installation/dialogs/security.rb --- old/yast2-installation-4.4.30/src/lib/installation/dialogs/security.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/src/lib/installation/dialogs/security.rb 2021-12-27 18:18:06.000000000 +0100 @@ -19,7 +19,7 @@ require "yast" require "cwm/dialog" -require "installation/widgets/selinux_mode" +require "installation/widgets/lsm" require "installation/widgets/polkit_default_priv" Yast.import "Hostname" @@ -47,7 +47,7 @@ left_col = [firewall_frame, polkit_frame] right_col = [cpu_frame] - right_col << selinux_frame if selinux_configurable? + right_col << lsm_frame if lsm_configurable? HBox( HStretch(), @@ -99,8 +99,8 @@ true end - def selinux_configurable? - @settings.selinux_config.configurable? + def lsm_configurable? + @settings.lsm_config.configurable? end def firewall_frame @@ -124,10 +124,10 @@ ) end - def selinux_frame + def lsm_frame frame( - _("SELinux"), - Widgets::SelinuxMode.new(@settings) + _("Linux Security Module"), + Widgets::LSM.new(@settings) ) end @@ -135,11 +135,12 @@ Left( Frame( label, - HSquash( - MarginBox( - 0.5, - 0.5, - widget + MarginBox( + 0.5, + 0.5, + HBox( + widget, + HStretch() ) ) ) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/src/lib/installation/security_settings.rb new/yast2-installation-4.4.31/src/lib/installation/security_settings.rb --- old/yast2-installation-4.4.30/src/lib/installation/security_settings.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/src/lib/installation/security_settings.rb 2021-12-27 18:18:06.000000000 +0100 @@ -18,8 +18,8 @@ # find current contact information at www.suse.com. require "yast" -require "y2security/selinux" require "y2users" +require "y2security/lsm" module Installation # Class that stores the security proposal settings during installation. @@ -40,8 +40,6 @@ # [String, nil] Setting for policy kit default privileges # For more info see /etc/sysconfig/security#POLKIT_DEFAULT_PRIVS attr_accessor :polkit_default_privileges - # [Y2Security::Selinux] selinux configuration - attr_accessor :selinux_config # Constructor def initialize @@ -55,6 +53,7 @@ enable_sshd! if wanted_enable_sshd? open_ssh! if wanted_open_ssh? open_vnc! if wanted_open_vnc? + lsm_config.propose_default unless lsm_config.selected # FIXME: obtain from Y2Firewall::Firewalld, control file or allow to # chose a different one in the proposal @default_zone = "public" @@ -154,11 +153,9 @@ } end - # Returns a SELinux configuration handler - # - # @return [Y2Security::Selinux] the SELinux config handler - def selinux_config - @selinux_config ||= Y2Security::Selinux.new + # @return [Y2Security::LSM::Config] the LSM config handler + def lsm_config + Y2Security::LSM::Config.instance end private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/src/lib/installation/widgets/lsm.rb new/yast2-installation-4.4.31/src/lib/installation/widgets/lsm.rb --- old/yast2-installation-4.4.30/src/lib/installation/widgets/lsm.rb 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-installation-4.4.31/src/lib/installation/widgets/lsm.rb 2021-12-27 18:18:06.000000000 +0100 @@ -0,0 +1,144 @@ +# ------------------------------------------------------------------------------ +# Copyright (c) 2021 SUSE LLC, All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it under +# the terms of version 2 of the GNU General Public License as published by the +# Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, but WITHOUT +# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. +# +# ------------------------------------------------------------------------------ + +require "yast" +require "cwm/custom_widget" +require "cwm/replace_point" +require "cwm/common_widgets" +require "installation/widgets/selinux_mode" +require "installation/security_settings" +require "y2security/lsm/config" + +Yast.import "HTML" + +module Installation + module Widgets + # This widget contents a selector for choosing between the supported Linux Security Major + # Modules during installation. + # + # @note the selinux module will show also a selector for choosing the SELinux mode to be used + # after the system is booted + class LSM < CWM::CustomWidget + attr_accessor :settings + + # Constructor + # + # @param settings [Installation::SecuritySettings] + def initialize(settings) + @settings = settings + self.handle_all_events = true + end + + # @see CWM::CustomWidget#init + def init + lsm_selector_widget.init + refresh + end + + # @see CWM::CustomWidget#contents + def contents + VBox( + lsm_selector_widget, + Left(replace_widget) + ) + end + + # It refresh the widget content dinamically when the selection of the LSM is modified + # + # @param event [Hash] a UI event + def handle(event) + return if event["ID"] != lsm_selector_widget.widget_id + + refresh + nil + end + + private + + def replace_widget + @replace_widget ||= CWM::ReplacePoint.new(id: "lsm_widget", widget: empty_lsm_widget) + end + + def empty_lsm_widget + @empty_lsm_widget ||= CWM::Empty.new("lsm_empty") + end + + def lsm_selector_widget + @lsm_selector_widget ||= LSMSelector.new(settings.lsm_config) + end + + def selinux_widget + @selinux_widget ||= SelinuxMode.new(settings.lsm_config.selinux) + end + + # When the selected LSM is SELinux it shows the widget for selecting the SELinux mode + def refresh + case lsm_selector_widget.value + when "selinux" then replace_widget.replace(selinux_widget) + else + replace_widget.replace(empty_lsm_widget) + end + end + end + + # This class is a ComboBox for selecting the desired Linux Security Module to be used after the + # instalaltion + class LSMSelector < CWM::ComboBox + attr_reader :settings + + # Constructor + # + # @param settings [Y2Security::LSM::Config] + def initialize(settings) + textdomain "installation" + + @settings = settings + end + + def init + self.value = settings.selected&.id.to_s + end + + def opt + [:notify, :hstretch] + end + + def label + # TRANSLATORS: Linux Security Module Selector label. + _("Selected Module") + end + + def items + available_modules.map { |m| [m.id.to_s, m.label] } + end + + def store + settings.select(value) + end + + def help + Yast::HTML.Para( + # TRANSLATORS: Linux Security Module Selector help. + _("Allows to choose between available Linux Security major modules like:") + + Yast::HTML.List(available_modules.map(&:label)) + ) + end + + private + + def available_modules + settings.selectable + end + end + end +end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/src/lib/installation/widgets/polkit_default_priv.rb new/yast2-installation-4.4.31/src/lib/installation/widgets/polkit_default_priv.rb --- old/yast2-installation-4.4.30/src/lib/installation/widgets/polkit_default_priv.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/src/lib/installation/widgets/polkit_default_priv.rb 2021-12-27 18:18:06.000000000 +0100 @@ -38,25 +38,26 @@ end def help - _( - "<p>SUSE ships with three sets of default privilege " \ - "settings. These are as follows:<br><ul>" \ - "<li>\"restrictive\": conservative settings that " \ - "require the root user password for a lot of actions" \ - " and disable certain actions completely for remote " \ - "users.</li>" \ - "<li>\"standard\": balanced settings that restrict " \ - "sensitive actions to require root authentication " \ - "but allow less dangerous operations for regular " \ - "logged in users.</li>" \ - "<li>\"easy\": settings that are focused on ease " \ - "of use. This sacrifices security to some degree " \ - "to allow a more seamless user experience without" \ - " interruptions in the workflow due to password " \ - "prompts.</li></ul><br>" \ - "The \"default\" is to keep value empty and it will be " \ - "assigned automatically.</p>" - ) + "<b>#{label}</b>\n" + + _( + "<p>SUSE ships with three sets of default privilege " \ + "settings. These are as follows:<br><ul>" \ + "<li>\"restrictive\": conservative settings that " \ + "require the root user password for a lot of actions" \ + " and disable certain actions completely for remote " \ + "users.</li>" \ + "<li>\"standard\": balanced settings that restrict " \ + "sensitive actions to require root authentication " \ + "but allow less dangerous operations for regular " \ + "logged in users.</li>" \ + "<li>\"easy\": settings that are focused on ease " \ + "of use. This sacrifices security to some degree " \ + "to allow a more seamless user experience without" \ + " interruptions in the workflow due to password " \ + "prompts.</li></ul><br>" \ + "The \"default\" is to keep value empty and it will be " \ + "assigned automatically.</p>" + ) end def init diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/src/lib/installation/widgets/selinux_mode.rb new/yast2-installation-4.4.31/src/lib/installation/widgets/selinux_mode.rb --- old/yast2-installation-4.4.30/src/lib/installation/widgets/selinux_mode.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/src/lib/installation/widgets/selinux_mode.rb 2021-12-27 18:18:06.000000000 +0100 @@ -36,15 +36,16 @@ end def items - @settings.selinux_config.modes.map { |m| [m.id.to_s, m.to_human_string] } + @settings.modes.map { |m| [m.id.to_s, m.to_human_string] } end def init - self.value = @settings.selinux_config.mode.id.to_s + self.value = @settings.mode.id.to_s + disable unless @settings.configurable? end def store - @settings.selinux_config.mode = value.to_sym + @settings.mode = value.to_sym end def help diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/test/lib/clients/security_finish_test.rb new/yast2-installation-4.4.31/test/lib/clients/security_finish_test.rb --- old/yast2-installation-4.4.30/test/lib/clients/security_finish_test.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/test/lib/clients/security_finish_test.rb 2021-12-27 18:18:06.000000000 +0100 @@ -112,8 +112,8 @@ expect(Yast::SCR).to_not receive(:Write).with(path(".sysconfig.security.POLKIT_DEFAULT_PRIVS"), anything) end - it "skips writting selinux" do - expect(proposal_settings.selinux_config).to_not receive(:save) + it "skips writting LSM config" do + expect(proposal_settings.lsm_config).to_not receive(:save) subject.write end @@ -139,8 +139,8 @@ end end - it "saves selinux configuration" do - expect(proposal_settings.selinux_config).to receive(:save) + it "saves LSM configuration" do + expect(proposal_settings.lsm_config).to receive(:save) subject.write end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/test/lib/clients/security_proposal_test.rb new/yast2-installation-4.4.31/test/lib/clients/security_proposal_test.rb --- old/yast2-installation-4.4.30/test/lib/clients/security_proposal_test.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/test/lib/clients/security_proposal_test.rb 2021-12-27 18:18:06.000000000 +0100 @@ -106,7 +106,7 @@ before do allow(proposal_settings).to receive("enable_firewall").and_return(firewall_enabled) - allow(proposal_settings.selinux_config).to receive(:configurable?) + allow(proposal_settings.lsm_config).to receive(:configurable?) .and_return(false) end @@ -136,15 +136,15 @@ end end - context "when selinux is configurable" do - it "contains in proposal selinux configuration" do - allow(proposal_settings.selinux_config).to receive(:configurable?) + context "when LSM is configurable" do + it "contains the LSM configuration" do + allow(proposal_settings.lsm_config).to receive(:configurable?) .and_return(true) allow(Yast::Bootloader).to receive(:kernel_param).and_return(:missing) proposal = client.make_proposal({}) - expect(proposal["preformatted_proposal"]).to include("SELinux Default Mode") + expect(proposal["preformatted_proposal"]).to include("Linux Security Module:") end end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-installation-4.4.30/test/lib/widgets/selinux_mode_test.rb new/yast2-installation-4.4.31/test/lib/widgets/selinux_mode_test.rb --- old/yast2-installation-4.4.30/test/lib/widgets/selinux_mode_test.rb 2021-12-16 15:39:35.000000000 +0100 +++ new/yast2-installation-4.4.31/test/lib/widgets/selinux_mode_test.rb 2021-12-27 18:18:06.000000000 +0100 @@ -2,10 +2,12 @@ require_relative "../../test_helper" require "installation/widgets/selinux_mode" +require "y2security/lsm/selinux" require "cwm/rspec" describe Installation::Widgets::SelinuxMode do - subject { described_class.new(Installation::SecuritySettings.create_instance) } + subject { described_class.new(selinux_config) } + let(:selinux_config) { Y2Security::LSM::Selinux.new } include_examples "CWM::ComboBox" end

1 0

commit python-testfixtures for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-testfixtures for openSUSE:Factory checked in at 2021-12-29 21:10:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-testfixtures (Old) and /work/SRC/openSUSE:Factory/.python-testfixtures.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-testfixtures" Wed Dec 29 21:10:39 2021 rev:21 rq:942857 version:6.18.3 Changes: -------- --- /work/SRC/openSUSE:Factory/python-testfixtures/python-testfixtures.changes 2021-12-23 17:53:29.199709343 +0100 +++ /work/SRC/openSUSE:Factory/.python-testfixtures.new.2520/python-testfixtures.changes 2021-12-29 21:10:40.974272020 +0100 @@ -1,0 +2,8 @@ +Sun Dec 26 09:32:40 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Replace testfixtures-pr167-sybil3.patch by + testfixtures-sybil3-py310.patch -- gh#simplistix/testfixtures#167 +- Don't test Django on python36: Django 4 dropped support for + Python < 3.8 + +------------------------------------------------------------------- Old: ---- testfixtures-pr167-sybil3.patch New: ---- testfixtures-sybil3-py310.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-testfixtures.spec ++++++ --- /var/tmp/diff_new_pack.cxzgUU/_old 2021-12-29 21:10:41.426272392 +0100 +++ /var/tmp/diff_new_pack.cxzgUU/_new 2021-12-29 21:10:41.430272396 +0100 @@ -25,20 +25,20 @@ License: MIT URL: https://github.com/Simplistix/testfixtures Source: https://files.pythonhosted.org/packages/source/t/testfixtures/testfixtures-… -# PATCH-FIX-UPSTREAM testfixtures-pr167-sybil3.patch -- gh#simplistix/testfixtures#167 -Patch0: testfixtures-pr167-sybil3.patch -BuildRequires: %{python_module Django} +# PATCH-FIX-UPSTREAM testfixtures-sybil3-py310.patch -- gh#simplistix/testfixtures#167 +Patch0: testfixtures-sybil3-py310.patch BuildRequires: %{python_module Twisted} BuildRequires: %{python_module pytest >= 3.6} -BuildRequires: %{python_module pytest-django} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module sybil} +BuildRequires: %{python_module sybil >= 3} BuildRequires: %{python_module zope.component} BuildRequires: fdupes BuildRequires: python-rpm-macros +BuildRequires: %{python_module Django if (%python-base without python36-base)} +BuildRequires: %{python_module pytest-django if (%python-base without python36-base)} Suggests: python-Django Suggests: python-Twisted -Suggests: python-sybil +Suggests: python-sybil >= 3 Suggests: python-zope.component BuildArch: noarch %python_subpackages @@ -70,7 +70,8 @@ %check export DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings export PYTHONPATH=$(pwd) -%pytest testfixtures/tests +python36_flags="--ignore testfixtures/tests/test_django" +%pytest testfixtures/tests ${$python_flags} %files %{python_files} %license LICENSE.txt ++++++ testfixtures-sybil3-py310.patch ++++++ From c89af9e0dc372180728389e5459847511abbd60a Mon Sep 17 00:00:00 2001 From: Chris Withers <chris(a)withers.org> Date: Sat, 21 Aug 2021 08:41:03 +0100 Subject: [PATCH] Merge pull request #158 from sbraz/py310 tests: fix with Python 3.10 (changed exception messages) --- testfixtures/compat.py | 1 + testfixtures/tests/test_popen.py | 41 ++++++++++++++++++------------ testfixtures/tests/test_replace.py | 24 ++++++++++------- 3 files changed, 41 insertions(+), 25 deletions(-) Index: testfixtures-6.18.3/testfixtures/compat.py =================================================================== --- testfixtures-6.18.3.orig/testfixtures/compat.py +++ testfixtures-6.18.3/testfixtures/compat.py @@ -5,6 +5,7 @@ PY_VERSION = sys.version_info[:2] PY_36_PLUS = PY_VERSION >= (3, 6) PY_37_PLUS = PY_VERSION >= (3, 7) +PY_310_PLUS = PY_VERSION >= (3, 10) if PY_VERSION > (3, 0): Index: testfixtures-6.18.3/testfixtures/tests/test_popen.py =================================================================== --- testfixtures-6.18.3.orig/testfixtures/tests/test_popen.py +++ testfixtures-6.18.3/testfixtures/tests/test_popen.py @@ -6,7 +6,7 @@ from testfixtures.mock import call from testfixtures import ShouldRaise, compare, Replacer from testfixtures.popen import MockPopen, PopenBehaviour -from testfixtures.compat import BytesLiteral, PY2 +from testfixtures.compat import BytesLiteral, PY2, PY_310_PLUS import signal @@ -471,10 +471,11 @@ class Tests(TestCase): ], Popen.mock.method_calls) def test_invalid_parameters(self): + message = "__init__() got an unexpected keyword argument 'foo'" + if PY_310_PLUS: + message = "MockPopenInstance." + message Popen = MockPopen() - with ShouldRaise(TypeError( - "__init__() got an unexpected keyword argument 'foo'" - )): + with ShouldRaise(TypeError(message)): Popen(foo='bar') def test_invalid_method_or_attr(self): @@ -492,39 +493,43 @@ class Tests(TestCase): process.foo def test_invalid_communicate_call(self): + message = "communicate() got an unexpected keyword argument 'foo'" + if PY_310_PLUS: + message = "MockPopenInstance." + message Popen = MockPopen() Popen.set_command('bar') process = Popen('bar') - with ShouldRaise(TypeError( - "communicate() got an unexpected keyword argument 'foo'" - )): + with ShouldRaise(TypeError(message)): process.communicate(foo='bar') def test_invalid_wait_call(self): + message = "wait() got an unexpected keyword argument 'foo'" + if PY_310_PLUS: + message = "MockPopenInstance." + message Popen = MockPopen() Popen.set_command('bar') process = Popen('bar') - with ShouldRaise(TypeError( - "wait() got an unexpected keyword argument 'foo'" - )): + with ShouldRaise(TypeError(message)): process.wait(foo='bar') def test_invalid_send_signal(self): + message = "send_signal() got an unexpected keyword argument 'foo'" + if PY_310_PLUS: + message = "MockPopenInstance." + message Popen = MockPopen() Popen.set_command('bar') process = Popen('bar') - with ShouldRaise(TypeError( - "send_signal() got an unexpected keyword argument 'foo'" - )): + with ShouldRaise(TypeError(message)): process.send_signal(foo='bar') def test_invalid_terminate(self): + message = "terminate() got an unexpected keyword argument 'foo'" + if PY_310_PLUS: + message = "MockPopenInstance." + message Popen = MockPopen() Popen.set_command('bar') process = Popen('bar') - with ShouldRaise(TypeError( - "terminate() got an unexpected keyword argument 'foo'" - )): + with ShouldRaise(TypeError(message)): process.terminate(foo='bar') def test_invalid_kill(self): @@ -535,6 +540,8 @@ class Tests(TestCase): text = 'kill() takes exactly 1 argument (2 given)' else: text = 'kill() takes 1 positional argument but 2 were given' + if PY_310_PLUS: + text = "MockPopenInstance." + text with ShouldRaise(TypeError(text)): process.kill('moo') @@ -546,6 +553,8 @@ class Tests(TestCase): text = 'poll() takes exactly 1 argument (2 given)' else: text = 'poll() takes 1 positional argument but 2 were given' + if PY_310_PLUS: + text = "MockPopenInstance." + text with ShouldRaise(TypeError(text)): process.poll('moo') Index: testfixtures-6.18.3/testfixtures/tests/test_replace.py =================================================================== --- testfixtures-6.18.3.orig/testfixtures/tests/test_replace.py +++ testfixtures-6.18.3/testfixtures/tests/test_replace.py @@ -13,7 +13,7 @@ import os from testfixtures.tests import sample1 from testfixtures.tests import sample2 -from ..compat import PY3 +from ..compat import PY3, PY_310_PLUS from warnings import catch_warnings @@ -259,19 +259,25 @@ class TestReplace(TestCase): self.failIf(hasattr(sample1, 'foo')) def test_replace_delattr_cant_remove(self): + if PY_310_PLUS: + message = "cannot set 'today' attribute of " \ + "immutable type 'datetime.datetime'" + else: + message = "can't set attributes of " \ + "built-in/extension type 'datetime.datetime'" with Replacer() as r: - with ShouldRaise(TypeError( - "can't set attributes of " - "built-in/extension type 'datetime.datetime'" - )): + with ShouldRaise(TypeError(message)): r.replace('datetime.datetime.today', not_there) def test_replace_delattr_cant_remove_not_strict(self): + if PY_310_PLUS: + message = "cannot set 'today' attribute of " \ + "immutable type 'datetime.datetime'" + else: + message = "can't set attributes of " \ + "built-in/extension type 'datetime.datetime'" with Replacer() as r: - with ShouldRaise(TypeError( - "can't set attributes of " - "built-in/extension type 'datetime.datetime'" - )): + with ShouldRaise(TypeError(message)): r.replace('datetime.datetime.today', not_there, strict=False) def test_replace_dict_remove_key(self): Index: testfixtures-6.18.3/conftest.py =================================================================== --- /dev/null +++ testfixtures-6.18.3/conftest.py @@ -0,0 +1,32 @@ +from doctest import REPORT_NDIFF, ELLIPSIS + +from sybil import Sybil +from sybil.parsers.doctest import DocTestParser +from sybil.parsers.codeblock import PythonCodeBlockParser +from sybil.parsers.capture import parse_captures +from sybil.parsers.skip import skip + +from testfixtures import TempDirectory +from testfixtures.sybil import FileParser + + +def sybil_setup(namespace): + # _tempdir is in case it's overwritten by a test. + namespace['tempdir'] = namespace['_tempdir'] = TempDirectory() + + +def sybil_teardown(namespace): + namespace['_tempdir'].cleanup() + + +pytest_collect_file = Sybil( + parsers=[ + DocTestParser(optionflags=REPORT_NDIFF|ELLIPSIS), + PythonCodeBlockParser(), + parse_captures, + FileParser('tempdir'), + skip, + ], + patterns=['*.txt', '*.py'], + setup=sybil_setup, teardown=sybil_teardown, +).pytest() Index: testfixtures-6.18.3/docs/conftest.py =================================================================== --- testfixtures-6.18.3.orig/docs/conftest.py +++ /dev/null @@ -1,21 +0,0 @@ -from doctest import REPORT_NDIFF, ELLIPSIS - -from sybil import Sybil -from sybil.parsers.doctest import DocTestParser, FIX_BYTE_UNICODE_REPR -from sybil.parsers.codeblock import CodeBlockParser -from sybil.parsers.capture import parse_captures - -from testfixtures.compat import PY3 -from testfixtures.sybil import FileParser - - -if PY3: - pytest_collect_file = Sybil( - parsers=[ - DocTestParser(optionflags=REPORT_NDIFF|ELLIPSIS|FIX_BYTE_UNICODE_REPR), - CodeBlockParser(['print_function']), - parse_captures, - FileParser('tempdir'), - ], - pattern='*.txt', - ).pytest() Index: testfixtures-6.18.3/docs/files.txt =================================================================== --- testfixtures-6.18.3.orig/docs/files.txt +++ testfixtures-6.18.3/docs/files.txt @@ -612,7 +612,7 @@ from the documentation to use for use in __ https://docs.pytest.org/en/latest/ -.. literalinclude:: ../testfixtures/tests/conftest.py +.. literalinclude:: ../../testfixtures/conftest.py Writing files ~~~~~~~~~~~~~ Index: testfixtures-6.18.3/testfixtures/tests/conftest.py =================================================================== --- testfixtures-6.18.3.orig/testfixtures/tests/conftest.py +++ /dev/null @@ -1,27 +0,0 @@ -from sybil import Sybil -from sybil.parsers.doctest import DocTestParser -from sybil.parsers.codeblock import CodeBlockParser -from sybil.parsers.capture import parse_captures - -from testfixtures import TempDirectory -from testfixtures.sybil import FileParser - - -def sybil_setup(namespace): - namespace['tempdir'] = TempDirectory() - - -def sybil_teardown(namespace): - namespace['tempdir'].cleanup() - - -pytest_collect_file = Sybil( - parsers=[ - DocTestParser(), - CodeBlockParser(), - parse_captures, - FileParser('tempdir'), - ], - pattern='*.txt', - setup=sybil_setup, teardown=sybil_teardown, -).pytest() Index: testfixtures-6.18.3/testfixtures/tests/test_sybil.py =================================================================== --- testfixtures-6.18.3.orig/testfixtures/tests/test_sybil.py +++ testfixtures-6.18.3/testfixtures/tests/test_sybil.py @@ -77,9 +77,7 @@ class TestFileParser(TestCase): .. topic:: file.txt :class: write-file - .. code-block:: python - - print "hello" + print("hello") out = 'there' foo = 'bar' @@ -89,7 +87,7 @@ class TestFileParser(TestCase): expected=[ C(FileBlock, path='file.txt', - content='.. code-block:: python\n\nprint "hello"' + content='print("hello")' '\nout = \'there\'\n\nfoo = \'bar\'\n', action='write'), ]) Index: testfixtures-6.18.3/docs/django.txt =================================================================== --- testfixtures-6.18.3.orig/docs/django.txt +++ testfixtures-6.18.3/docs/django.txt @@ -23,7 +23,7 @@ Traceback (most recent call last): AssertionError: SampleModel not as expected: <BLANKLINE> same: -[u'id'] +['id'] <BLANKLINE> values differ: 'value': 1 != 2 @@ -38,7 +38,7 @@ Traceback (most recent call last): AssertionError: SampleModel not as expected: <BLANKLINE> same: -[u'id'] +['id'] <BLANKLINE> values differ: 'value': 1 != 2 @@ -70,7 +70,7 @@ Traceback (most recent call last): AssertionError: SampleModel not as expected: <BLANKLINE> same: -['created', u'id', 'value'] +['created', 'id', 'value'] <BLANKLINE> values differ: 'not_editable': 1 != 2

1 0

commit python-raven for openSUSE:Factory
by Source-Sync 29 Dec '21

29 Dec '21

Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package python-raven for openSUSE:Factory checked in at 2021-12-29 21:10:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-raven (Old) and /work/SRC/openSUSE:Factory/.python-raven.new.2520 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "python-raven" Wed Dec 29 21:10:37 2021 rev:15 rq:942856 version:6.10.0 Changes: -------- --- /work/SRC/openSUSE:Factory/python-raven/python-raven.changes 2020-09-04 11:04:37.494800567 +0200 +++ /work/SRC/openSUSE:Factory/.python-raven.new.2520/python-raven.changes 2021-12-29 21:10:40.354271511 +0100 @@ -1,0 +2,8 @@ +Mon Dec 27 16:34:28 UTC 2021 - Ben Greiner <code(a)bnavigator.de> + +- Don't test Django: not compatible with Django 4 in TW +- After fixing the test collection: Force tornado5, tornado6 is + not compatible +- Add raven-fix-flask-test.patch + +------------------------------------------------------------------- New: ---- raven-fix-flask-test.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-raven.spec ++++++ --- /var/tmp/diff_new_pack.ZZKTGS/_old 2021-12-29 21:10:40.810271886 +0100 +++ /var/tmp/diff_new_pack.ZZKTGS/_new 2021-12-29 21:10:40.814271889 +0100 @@ -1,7 +1,7 @@ # # spec file for package python-raven # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2021 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -29,7 +29,8 @@ Patch0: remove-unittest2.patch Patch1: pytest4.patch Patch2: fix-tests.patch -BuildRequires: %{python_module Django} +# https://github.com/getsentry/raven-python/commit/20caf26ff33ac1efbace74ef99… +Patch3: raven-fix-flask-test.patch BuildRequires: %{python_module Flask >= 0.8} BuildRequires: %{python_module Flask-Login >= 0.2.0} BuildRequires: %{python_module Logbook} @@ -44,19 +45,24 @@ BuildRequires: %{python_module exam >= 0.5.2} BuildRequires: %{python_module kombu} BuildRequires: %{python_module mock} -BuildRequires: %{python_module pytest-django} BuildRequires: %{python_module pytest-pythonpath} BuildRequires: %{python_module pytest-timeout >= 0.4} BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} BuildRequires: %{python_module requests} BuildRequires: %{python_module setuptools} -BuildRequires: %{python_module tornado >= 4.1} +# async errors on tornado6 +BuildRequires: %{python_module tornado < 6 if %python-base < 3.10} BuildRequires: %{python_module vine} BuildRequires: fdupes BuildRequires: python-rpm-macros +%if 0%{?suse_version} < 1550 +# not compatible with Django 4 in TW +BuildRequires: %{python_module Django} +BuildRequires: %{python_module pytest-django} +%endif Requires(post): update-alternatives -Requires(postun): update-alternatives +Requires(postun):update-alternatives Recommends: python-Flask >= 0.8 Recommends: python-blinker >= 1.1 BuildArch: noarch @@ -73,8 +79,7 @@ %prep %setup -q -n raven-%{version} %autopatch -p1 - -rm -f setup.cfg tox.ini pytest.ini +sed -i 's/--cov=raven//' setup.cfg %build %python_build @@ -86,8 +91,9 @@ %python_expand rm -rf %{buildroot}/%{$python_sitelib}/raven/data/cacert.pem %check -export DJANGO_SETTINGS_MODULE=tests.contrib.django.settings -%pytest -k 'not (TornadoAsyncClientTestCase or TornadoTransportTests)' +# no tornado5 in py310 +python310_flags="--ignore tests/contrib/tornado --ignore tests/transport/tornado" +%pytest -k 'not (TornadoTransportTests and (test_send or test__sending))' ${$python_flags} %post %python_install_alternative raven @@ -99,6 +105,7 @@ %license LICENSE %doc README.rst %python_alternative %{_bindir}/raven -%{python_sitelib}/* +%{python_sitelib}/raven +%{python_sitelib}/raven-%{version}*-info %changelog ++++++ raven-fix-flask-test.patch ++++++ From 20caf26ff33ac1efbace74ef99d6f0f911720568 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer <markus(a)unterwaditzer.net> Date: Mon, 6 May 2019 18:55:31 +0200 Subject: [PATCH] fix: Fix Flask tests --- tests/contrib/flask/tests.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tests/contrib/flask/tests.py b/tests/contrib/flask/tests.py index 593876c4..e7a46f2a 100644 --- a/tests/contrib/flask/tests.py +++ b/tests/contrib/flask/tests.py @@ -148,10 +148,6 @@ def test_get(self): self.assertEquals(http['data'], {}) self.assertTrue('headers' in http) headers = http['headers'] - self.assertTrue('Content-Length' in headers, headers.keys()) - self.assertEquals(headers['Content-Length'], '0') - self.assertTrue('Content-Type' in headers, headers.keys()) - self.assertEquals(headers['Content-Type'], '') self.assertTrue('Host' in headers, headers.keys()) self.assertEquals(headers['Host'], 'localhost') env = http['env']

1 0