Accepting request 1073063 from Base:System

- Drop 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch
  These obsolete symlinks were kept because several years ago VLC was still
  relying on some of them. However it's been a long a time ago that it's been
  fixed and cdrom or similar devices are discovered in a better way.

- Enable that systemd can load the IMA policy from
  /etc/ima/ima-policy.  This is used to complement dracut-ima when
  using SELinux, as the SELinux policy should not be loaded in the
  initrd (https://github.com/openSUSE/microos-tools/pull/14)

OBS-URL: https://build.opensuse.org/request/show/1073063
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=384

0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch

@@ -1,29 +0,0 @@
-From ae4741127dc0ae575d13b8a7b201207da6167517 Mon Sep 17 00:00:00 2001
-From: Robert Milasan <rmilasan@suse.com>
-Date: Sat, 12 Jul 2014 14:20:36 +0200
-Subject: [PATCH 05/11] udev: create default symlinks for primary cd_dvd drive
-
-Imported from SLE12-SP1, commit 4f8bacfbffd7049608b5076.
-
-[rmilasan: fixes bnc#783054]
----
- rules.d/60-cdrom_id.rules | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/rules.d/60-cdrom_id.rules b/rules.d/60-cdrom_id.rules
-index 288f8ce2f9..578c77441c 100644
---- a/rules.d/60-cdrom_id.rules
-+++ b/rules.d/60-cdrom_id.rules
-@@ -25,5 +25,9 @@ IMPORT{program}="cdrom_id --lock-media $devnode"
- ENV{DISK_MEDIA_CHANGE}=="?*", ENV{ID_CDROM_MEDIA}!="?*", ENV{SYSTEMD_READY}="0"
- 
- KERNEL=="sr0", SYMLINK+="cdrom", OPTIONS+="link_priority=-100"
-+KERNEL=="sr0", ENV{ID_CDROM}=="1", SYMLINK+="cdrom", OPTIONS+="link_priority=-100"
-+KERNEL=="sr0", ENV{ID_CDROM_CD_RW}=="1", SYMLINK+="cdrw", OPTIONS+="link_priority=-100"
-+KERNEL=="sr0", ENV{ID_CDROM_DVD}=="1", SYMLINK+="dvd", OPTIONS+="link_priority=-100"
-+KERNEL=="sr0", ENV{ID_CDROM_DVD_RW}=="1", SYMLINK+="dvdrw", OPTIONS+="link_priority=-100"
- 
- LABEL="cdrom_end"
--- 
-2.26.2
-

systemd.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Mon Mar 20 08:32:49 UTC 2023 - Franck Bui <fbui@suse.com>
+
+- Drop 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch
+
+  These obsolete symlinks were kept because several years ago VLC was still
+  relying on some of them. However it's been a long a time ago that it's been
+  fixed and cdrom or similar devices are discovered in a better way.
+
+-------------------------------------------------------------------
+Mon Mar 20 07:48:49 UTC 2023 - Alberto Planas Dominguez <aplanas@suse.com>
+
+- Enable that systemd can load the IMA policy from
+  /etc/ima/ima-policy.  This is used to complement dracut-ima when
+  using SELinux, as the SELinux policy should not be loaded in the
+  initrd (https://github.com/openSUSE/microos-tools/pull/14)
+
 -------------------------------------------------------------------
 Thu Mar 16 07:33:21 UTC 2023 - Franck Bui <fbui@suse.com>
 

systemd.spec

@@ -200,7 +200,6 @@ Source207:      files.experimental
 Patch1:         0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch
 Patch2:         0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch
 Patch3:         0003-strip-the-domain-part-from-etc-hostname-when-setting.patch
-Patch5:         0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch
 %if %{with sysvcompat}
 Patch8:         0008-sysv-generator-translate-Required-Start-into-a-Wants.patch
 %endif
@@ -684,7 +683,6 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
         \
         -Dbump-proc-sys-fs-nr-open=false \
         -Dgshadow=false \
-        -Dima=false \
         -Dldconfig=false \
         -Dsmack=false \
         \
@@ -695,6 +693,7 @@ export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2"
         -Defi=%{when_not bootstrap} \
         -Delfutils=%{when_not bootstrap} \
         -Dhtml=%{when_not bootstrap} \
+        -Dima=%{when_not bootstrap} \
         -Dlibcryptsetup-plugins=%{when_not bootstrap} \
         -Dman=%{when_not bootstrap} \
         -Dnss-myhostname=%{when_not bootstrap} \