From 6904556372953e86d31af6f17968805b167d0fe391896ea6a35a02daf731b0ff Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 8 Jul 2022 16:30:45 +0000 Subject: [PATCH 01/14] - Import commit 69abca7794ed06d823bc0a9bb55daf822adcc632 f29b146685 pstore: Run after modules are loaded OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1292 --- systemd-v251.2+suse.21.ge9fc337d97.tar.xz | 3 --- systemd-v251.2+suse.23.g69abca7794.tar.xz | 3 +++ systemd.changes | 7 +++++++ systemd.spec | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) delete mode 100644 systemd-v251.2+suse.21.ge9fc337d97.tar.xz create mode 100644 systemd-v251.2+suse.23.g69abca7794.tar.xz diff --git a/systemd-v251.2+suse.21.ge9fc337d97.tar.xz b/systemd-v251.2+suse.21.ge9fc337d97.tar.xz deleted file mode 100644 index 9edde95..0000000 --- a/systemd-v251.2+suse.21.ge9fc337d97.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b6b345714da705a4dd420ae4ebec9192b009d5d00c0186b7300894f961d3495c -size 7827816 diff --git a/systemd-v251.2+suse.23.g69abca7794.tar.xz b/systemd-v251.2+suse.23.g69abca7794.tar.xz new file mode 100644 index 0000000..37eee6f --- /dev/null +++ b/systemd-v251.2+suse.23.g69abca7794.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ed90d3007f0452fc774e2b47773bb8b26587527f0c358ff855f828f646d25e5 +size 7828384 diff --git a/systemd.changes b/systemd.changes index 25f7c3d..61345b7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jun 21 14:24:43 UTC 2022 - Franck Bui + +- Import commit 69abca7794ed06d823bc0a9bb55daf822adcc632 + + f29b146685 pstore: Run after modules are loaded + ------------------------------------------------------------------- Tue Jun 21 14:09:51 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index cfd91bc..c777aec 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.21.ge9fc337d97 +%define archive_version +suse.23.g69abca7794 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit From ac3a4814a551eac0434725717337f5700dbd58f81c0935b7ccbba31c28a643ea Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 8 Jul 2022 18:43:30 +0000 Subject: [PATCH 02/14] - Make {/etc,/usr/lib}/systemd/network owned by both udev and systemd-network (bsc#1201276) This configuration files put in these directories are read by both udevd and systemd-networkd. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1293 --- files.udev | 1 + systemd.changes | 8 ++++++++ 2 files changed, 9 insertions(+) diff --git a/files.udev b/files.udev index b003475..0b7e58f 100644 --- a/files.udev +++ b/files.udev @@ -11,6 +11,7 @@ %if %{without bootstrap} %dir %{_sysconfdir}/modules-load.d %endif +%dir %{_sysconfdir}/systemd/network %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %dir %{_systemd_util_dir}/network diff --git a/systemd.changes b/systemd.changes index 61345b7..99805b7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jul 8 16:39:07 UTC 2022 - Franck Bui + +- Make {/etc,/usr/lib}/systemd/network owned by both udev and systemd-network (bsc#1201276) + + This configuration files put in these directories are read by both udevd and + systemd-networkd. + ------------------------------------------------------------------- Tue Jun 21 14:24:43 UTC 2022 - Franck Bui From 49cdefb529ffcc9b2c9e68a5fa81bbc976fbd2eed8c7516b602c28cc514ac4d3 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 12 Jul 2022 18:43:33 +0000 Subject: [PATCH 03/14] - systemd.spec: add files.experimental OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1294 --- files.experimental | 40 ++++++++++++++++++++++++++++++++++++++++ systemd.changes | 5 +++++ systemd.spec | 33 ++------------------------------- 3 files changed, 47 insertions(+), 31 deletions(-) create mode 100644 files.experimental diff --git a/files.experimental b/files.experimental new file mode 100644 index 0000000..b007b4c --- /dev/null +++ b/files.experimental @@ -0,0 +1,40 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%config(noreplace) %{_sysconfdir}/systemd/homed.conf +%{_bindir}/homectl +%{_bindir}/systemd-repart +%{_bindir}/userdbctl +%{_datadir}/bash-completion/completions/homectl +%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Home.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml +%{_datadir}/dbus-1/system-services/org.freedesktop.home1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.home1.policy +%{_mandir}/man1/homectl.1.gz +%{_mandir}/man1/userdbctl.1.gz +%{_mandir}/man5/homed.conf.5.gz +%{_mandir}/man5/homed.conf.d.5.gz +%{_mandir}/man5/org.freedesktop.home1.5.gz +%{_mandir}/man5/repart.d.5.gz +%{_mandir}/man8/pam_systemd_home.8.gz +%{_mandir}/man8/systemd-homed.8.gz +%{_mandir}/man8/systemd-homed.service.8.gz +%{_mandir}/man8/systemd-repart.8.gz +%{_mandir}/man8/systemd-repart.service.8.gz +%{_mandir}/man8/systemd-userdbd.8.gz +%{_mandir}/man8/systemd-userdbd.service.8.gz +%{_pam_moduledir}/pam_systemd_home.so +%{_systemd_util_dir}/system/initrd-root-fs.target.wants/systemd-repart.service +%{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service +%{_systemd_util_dir}/systemd-homed +%{_systemd_util_dir}/systemd-homework +%{_systemd_util_dir}/systemd-userdbd +%{_systemd_util_dir}/systemd-userwork +%{_unitdir}/systemd-homed-activate.service +%{_unitdir}/systemd-homed.service +%{_unitdir}/systemd-repart.service +%{_unitdir}/systemd-userdbd.service +%{_unitdir}/systemd-userdbd.socket diff --git a/systemd.changes b/systemd.changes index 99805b7..22e6f3e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 12 14:41:48 UTC 2022 - Franck Bui + +- systemd.spec: add files.experimental + ------------------------------------------------------------------- Fri Jul 8 16:39:07 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index c777aec..0510c7e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -178,6 +178,7 @@ Source203: files.network Source204: files.devel Source205: files.sysvcompat Source206: files.uefi-boot +Source207: files.experimental # # All changes backported from upstream are tracked by the git repository, which @@ -1409,37 +1410,7 @@ fi %if %{with experimental} %files experimental %defattr(-,root,root) -%{_bindir}/systemd-repart -%{_unitdir}/systemd-repart.service -%{_mandir}/man*/*repart* -%{_bindir}/userdbctl -%{_prefix}/lib/systemd/systemd-userwork -%{_prefix}/lib/systemd/systemd-userdbd -%{_systemd_util_dir}/system/initrd-root-fs.target.wants/systemd-repart.service -%{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service -%{_unitdir}/systemd-userdbd.service -%{_unitdir}/systemd-userdbd.socket -%{_mandir}/man*/userdbctl* -%{_mandir}/man*/systemd-userdbd* -%config(noreplace) %{_sysconfdir}/systemd/homed.conf -%{_bindir}/homectl -%{_prefix}/lib/systemd/systemd-homed -%{_prefix}/lib/systemd/systemd-homework -%{_unitdir}/systemd-homed.service -%{_unitdir}/systemd-homed-activate.service -%{_pam_moduledir}/pam_systemd_home.so -%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Home.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Manager.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml -%{_datadir}/dbus-1/system-services/org.freedesktop.home1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf -%{_datadir}/polkit-1/actions/org.freedesktop.home1.policy -%{_datadir}/bash-completion/completions/homectl -%{_mandir}/man*/*homectl* -%{_mandir}/man*/*homed* -%{_mandir}/man*/org.freedesktop.home1* -%{_mandir}/man*/pam_systemd_home* +%include %{SOURCE207} %endif %changelog From de7f0bab9e3c9c23c794d5de7a27ba0864abeaaef92831611b736a2165db7745 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Mon, 18 Jul 2022 16:35:38 +0000 Subject: [PATCH 04/14] - When systemd-container is installed install tar/gpg too So `machinectl import-tar` always works flawlessly. systemd-container already is an optional package and both tar and gpg are rather basic anyway so no harm should be done by requiring them. - Move the systemd sysupdate stuff from the main package to the experimental sub-package while it's still time. The method used (currently) for updating openSUSE distro is rpm, not systemd-sysupdate. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1295 --- files.experimental | 11 +++++++++++ files.systemd | 15 --------------- systemd.changes | 13 +++++++++++++ systemd.spec | 5 ++++- 4 files changed, 28 insertions(+), 16 deletions(-) diff --git a/files.experimental b/files.experimental index b007b4c..1649dfe 100644 --- a/files.experimental +++ b/files.experimental @@ -19,11 +19,17 @@ %{_mandir}/man5/homed.conf.d.5.gz %{_mandir}/man5/org.freedesktop.home1.5.gz %{_mandir}/man5/repart.d.5.gz +%{_mandir}/man5/sysupdate.d.5.gz %{_mandir}/man8/pam_systemd_home.8.gz %{_mandir}/man8/systemd-homed.8.gz %{_mandir}/man8/systemd-homed.service.8.gz %{_mandir}/man8/systemd-repart.8.gz %{_mandir}/man8/systemd-repart.service.8.gz +%{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz +%{_mandir}/man8/systemd-sysupdate-reboot.timer.8.gz +%{_mandir}/man8/systemd-sysupdate.8.gz +%{_mandir}/man8/systemd-sysupdate.service.8.gz +%{_mandir}/man8/systemd-sysupdate.timer.8.gz %{_mandir}/man8/systemd-userdbd.8.gz %{_mandir}/man8/systemd-userdbd.service.8.gz %{_pam_moduledir}/pam_systemd_home.so @@ -31,10 +37,15 @@ %{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_systemd_util_dir}/systemd-homed %{_systemd_util_dir}/systemd-homework +%{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork %{_unitdir}/systemd-homed-activate.service %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-repart.service +%{_unitdir}/systemd-sysupdate-reboot.service +%{_unitdir}/systemd-sysupdate-reboot.timer +%{_unitdir}/systemd-sysupdate.service +%{_unitdir}/systemd-sysupdate.timer %{_unitdir}/systemd-userdbd.service %{_unitdir}/systemd-userdbd.socket diff --git a/files.systemd b/files.systemd index 482666b..12ce668 100644 --- a/files.systemd +++ b/files.systemd @@ -302,7 +302,6 @@ %{_mandir}/man5/systemd.target.5.gz %{_mandir}/man5/systemd.timer.5.gz %{_mandir}/man5/systemd.unit.5.gz -%{_mandir}/man5/sysupdate.d.5.gz %{_mandir}/man5/sysusers.d.5.gz %{_mandir}/man5/timesyncd.conf.5.gz %{_mandir}/man5/timesyncd.conf.d.5.gz @@ -388,11 +387,6 @@ %{_mandir}/man8/systemd-sysext.8.gz %{_mandir}/man8/systemd-sysext.service.8.gz %{_mandir}/man8/systemd-system-update-generator.8.gz -%{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz -%{_mandir}/man8/systemd-sysupdate-reboot.timer.8.gz -%{_mandir}/man8/systemd-sysupdate.8.gz -%{_mandir}/man8/systemd-sysupdate.service.8.gz -%{_mandir}/man8/systemd-sysupdate.timer.8.gz %{_mandir}/man8/systemd-sysusers.8.gz %{_mandir}/man8/systemd-sysusers.service.8.gz %{_mandir}/man8/systemd-time-wait-sync.8.gz @@ -452,9 +446,6 @@ %{_systemd_util_dir}/systemd-socket-proxyd %{_systemd_util_dir}/systemd-sulogin-shell %{_systemd_util_dir}/systemd-sysctl -%if %{without bootstrap} -%{_systemd_util_dir}/systemd-sysupdate -%endif %{_systemd_util_dir}/systemd-time-wait-sync %{_systemd_util_dir}/systemd-timedated %{_systemd_util_dir}/systemd-timesyncd @@ -649,12 +640,6 @@ %{_unitdir}/systemd-suspend.service %{_unitdir}/systemd-sysctl.service %{_unitdir}/systemd-sysext.service -%if %{without bootstrap} -%{_unitdir}/systemd-sysupdate-reboot.service -%{_unitdir}/systemd-sysupdate-reboot.timer -%{_unitdir}/systemd-sysupdate.service -%{_unitdir}/systemd-sysupdate.timer -%endif %{_unitdir}/systemd-sysusers.service %{_unitdir}/systemd-time-wait-sync.service %{_unitdir}/systemd-timedated.service diff --git a/systemd.changes b/systemd.changes index 22e6f3e..03ffb72 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jul 18 15:54:51 UTC 2022 - Franck Bui + +- When systemd-container is installed install tar/gpg too + + So `machinectl import-tar` always works flawlessly. systemd-container already + is an optional package and both tar and gpg are rather basic anyway so no harm + should be done by requiring them. + +- Move the systemd sysupdate stuff from the main package to the experimental + sub-package while it's still time. The method used (currently) for updating + openSUSE distro is rpm, not systemd-sysupdate. + ------------------------------------------------------------------- Tue Jul 12 14:41:48 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 0510c7e..3f2d83c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -388,6 +388,9 @@ BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(zlib) %endif Requires: %{name} = %{version}-%{release} +# import-tar needs tar and gpg +Requires: /usr/bin/tar +Requires: /usr/bin/gpg %systemd_requires Obsoletes: nss-mymachines < %{version}-%{release} Provides: nss-mymachines = %{version}-%{release} @@ -693,7 +696,6 @@ Have fun with these services at your own risk. -Dnss-systemd=%{when_not bootstrap} \ -Dseccomp=%{when_not bootstrap} \ -Dselinux=%{when_not bootstrap} \ - -Dsysupdate=%{when_not bootstrap} \ -Dtpm=%{when_not bootstrap} \ -Dtpm2=%{when_not bootstrap} \ -Dtranslations=%{when_not bootstrap} \ @@ -722,6 +724,7 @@ Have fun with these services at your own risk. \ -Dhomed=%{when experimental} \ -Drepart=%{when experimental} \ + -Dsysupdate=%{when experimental} \ -Duserdb=%{when experimental} \ \ -Dtests=%{when testsuite unsafe} \ From 729b03caeae7918a853a59776e1801928f13cd39b9c98e24e60239b5887401ba Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 19 Jul 2022 08:59:20 +0000 Subject: [PATCH 05/14] - Enable bpf framework OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1296 --- systemd.changes | 5 +++++ systemd.spec | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/systemd.changes b/systemd.changes index 03ffb72..fd3d831 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 19 08:58:21 UTC 2022 - Franck Bui + +- Enable bpf framework + ------------------------------------------------------------------- Mon Jul 18 15:54:51 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 3f2d83c..22f3bc9 100644 --- a/systemd.spec +++ b/systemd.spec @@ -78,6 +78,8 @@ Summary: A System and Session Manager License: LGPL-2.1-or-later BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %{without bootstrap} +BuildRequires: bpftool +BuildRequires: clang BuildRequires: docbook-xsl-stylesheets BuildRequires: kbd BuildRequires: libapparmor-devel @@ -88,6 +90,7 @@ BuildRequires: polkit BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: pkgconfig(audit) +BuildRequires: pkgconfig(libbpf) BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(liblz4) @@ -137,6 +140,8 @@ Requires: util-linux >= 2.27.1 Requires: group(lock) # This Recommends because some symbols of libpcre2 are dlopen()ed by journalctl Recommends: libpcre2-8-0 +Recommends: libbpf0 + Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -688,6 +693,7 @@ Have fun with these services at your own risk. -Dpstore=true \ \ -Dapparmor=%{when_not bootstrap} \ + -Dbpf-framework=%{when_not bootstrap} \ -Defi=%{when_not bootstrap} \ -Delfutils=%{when_not bootstrap} \ -Dhtml=%{when_not bootstrap} \ From 934b0e481676534bde093046c0453e86ef780737da43d4fb39720298b7b745ab Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 19 Jul 2022 11:25:58 +0000 Subject: [PATCH 06/14] - Import commit 32912879062bb1595d8498b6f9c77d5acd1dc66a 111b96ca86 logind: don't delay login for root even if systemd-user-sessions.service is not activated yet (bsc#1195059) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1297 --- files.systemd | 4 ++++ systemd-v251.2+suse.23.g69abca7794.tar.xz | 3 --- systemd-v251.2+suse.25.g3291287906.tar.xz | 3 +++ systemd.changes | 7 +++++++ systemd.spec | 2 +- 5 files changed, 15 insertions(+), 4 deletions(-) delete mode 100644 systemd-v251.2+suse.23.g69abca7794.tar.xz create mode 100644 systemd-v251.2+suse.25.g3291287906.tar.xz diff --git a/files.systemd b/files.systemd index 12ce668..a245c56 100644 --- a/files.systemd +++ b/files.systemd @@ -73,6 +73,8 @@ %dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sysinit.target.wants %dir %{_unitdir}/timers.target.wants +%dir %{_unitdir}/user@.service.d +%dir %{_unitdir}/user@0.service.d %dir %{xinitconfdir} %dir %{xinitconfdir}/xinitrc.d %doc %{_modprobedir}/README @@ -663,6 +665,8 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service +%{_unitdir}/user@.service.d/10-login-barrier.conf +%{_unitdir}/user@0.service.d/10-login-barrier.conf %{xinitconfdir}/xinitrc.d/50-systemd-user.sh %if %{with split_usr} /bin/systemctl diff --git a/systemd-v251.2+suse.23.g69abca7794.tar.xz b/systemd-v251.2+suse.23.g69abca7794.tar.xz deleted file mode 100644 index 37eee6f..0000000 --- a/systemd-v251.2+suse.23.g69abca7794.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3ed90d3007f0452fc774e2b47773bb8b26587527f0c358ff855f828f646d25e5 -size 7828384 diff --git a/systemd-v251.2+suse.25.g3291287906.tar.xz b/systemd-v251.2+suse.25.g3291287906.tar.xz new file mode 100644 index 0000000..f9f79c1 --- /dev/null +++ b/systemd-v251.2+suse.25.g3291287906.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e953bd5df8c946914d5d2c9d708d09d99d1f59f49a59c74fca11673d7f0d5b52 +size 7828568 diff --git a/systemd.changes b/systemd.changes index fd3d831..86c9652 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 19 10:18:03 UTC 2022 - Franck Bui + +- Import commit 32912879062bb1595d8498b6f9c77d5acd1dc66a + + 111b96ca86 logind: don't delay login for root even if systemd-user-sessions.service is not activated yet (bsc#1195059) + ------------------------------------------------------------------- Tue Jul 19 08:58:21 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 22f3bc9..f814ffb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.23.g69abca7794 +%define archive_version +suse.25.g3291287906 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit From 0f44c51ec75969d19546dfb48af7585c7d71eb9e6b9b6addfd2961ad2d11056d Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 19 Jul 2022 11:35:56 +0000 Subject: [PATCH 07/14] - Import commit 8cd784e9250b38d20d8e14fccbfb211010283c79 (merge of v251.3) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/32912879062bb1595d8498b6f9c77d5acd1dc66a...8cd784e9250b38d20d8e14fccbfb211010283c79 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1298 --- systemd-v251.2+suse.25.g3291287906.tar.xz | 3 --- systemd-v251.3+suse.27.g8cd784e925.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 systemd-v251.2+suse.25.g3291287906.tar.xz create mode 100644 systemd-v251.3+suse.27.g8cd784e925.tar.xz diff --git a/systemd-v251.2+suse.25.g3291287906.tar.xz b/systemd-v251.2+suse.25.g3291287906.tar.xz deleted file mode 100644 index f9f79c1..0000000 --- a/systemd-v251.2+suse.25.g3291287906.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e953bd5df8c946914d5d2c9d708d09d99d1f59f49a59c74fca11673d7f0d5b52 -size 7828568 diff --git a/systemd-v251.3+suse.27.g8cd784e925.tar.xz b/systemd-v251.3+suse.27.g8cd784e925.tar.xz new file mode 100644 index 0000000..0af4209 --- /dev/null +++ b/systemd-v251.3+suse.27.g8cd784e925.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b85c656fb5c904dced2f5add19bcd3ad463fd766ae1e435697fe4da321d721c +size 7829628 diff --git a/systemd.changes b/systemd.changes index 86c9652..b3e2c89 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Jul 19 11:32:25 UTC 2022 - Franck Bui + +- Import commit 8cd784e9250b38d20d8e14fccbfb211010283c79 (merge of v251.3) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/32912879062bb1595d8498b6f9c77d5acd1dc66a...8cd784e9250b38d20d8e14fccbfb211010283c79 + ------------------------------------------------------------------- Tue Jul 19 10:18:03 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f814ffb..bbaf964 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.25.g3291287906 +%define archive_version +suse.27.g8cd784e925 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 251.2 +Version: 251.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 3afc4cd3df5e65e8a4e47610bd797b0dab1fd9c80fec17e52a7e43f6bd9d2450 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 19 Jul 2022 12:27:38 +0000 Subject: [PATCH 08/14] - Enable oomd (bsc#1200456) It's part of the experimental sub-package for now. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1299 --- files.experimental | 17 +++++++++++++++++ systemd.changes | 7 +++++++ systemd.spec | 4 ++-- 3 files changed, 26 insertions(+), 2 deletions(-) diff --git a/files.experimental b/files.experimental index 1649dfe..ea0da12 100644 --- a/files.experimental +++ b/files.experimental @@ -2,27 +2,40 @@ # Please keep the list sorted (with `LC_ALL=C sort`). # %config(noreplace) %{_sysconfdir}/systemd/homed.conf +%config(noreplace) %{_sysconfdir}/systemd/oomd.conf %{_bindir}/homectl +%{_bindir}/oomctl %{_bindir}/systemd-repart %{_bindir}/userdbctl %{_datadir}/bash-completion/completions/homectl +%{_datadir}/bash-completion/completions/oomctl %{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Home.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.home1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.oom1.Manager.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Image.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.portable1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.oom1.service %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.oom1.conf %{_datadir}/polkit-1/actions/org.freedesktop.home1.policy +%{_datadir}/zsh/site-functions/_oomctl %{_mandir}/man1/homectl.1.gz +%{_mandir}/man1/oomctl.1.gz %{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/homed.conf.5.gz %{_mandir}/man5/homed.conf.d.5.gz +%{_mandir}/man5/oomd.conf.5.gz +%{_mandir}/man5/oomd.conf.d.5.gz %{_mandir}/man5/org.freedesktop.home1.5.gz +%{_mandir}/man5/org.freedesktop.oom1.5.gz %{_mandir}/man5/repart.d.5.gz %{_mandir}/man5/sysupdate.d.5.gz %{_mandir}/man8/pam_systemd_home.8.gz %{_mandir}/man8/systemd-homed.8.gz %{_mandir}/man8/systemd-homed.service.8.gz +%{_mandir}/man8/systemd-oomd.8.gz +%{_mandir}/man8/systemd-oomd.service.8.gz %{_mandir}/man8/systemd-repart.8.gz %{_mandir}/man8/systemd-repart.service.8.gz %{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz @@ -37,11 +50,15 @@ %{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_systemd_util_dir}/systemd-homed %{_systemd_util_dir}/systemd-homework +%{_systemd_util_dir}/systemd-oomd %{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork +%{_sysusersdir}/systemd-oom.conf %{_unitdir}/systemd-homed-activate.service %{_unitdir}/systemd-homed.service +%{_unitdir}/systemd-oomd.service +%{_unitdir}/systemd-oomd.socket %{_unitdir}/systemd-repart.service %{_unitdir}/systemd-sysupdate-reboot.service %{_unitdir}/systemd-sysupdate-reboot.timer diff --git a/systemd.changes b/systemd.changes index b3e2c89..21af42c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 19 12:18:35 UTC 2022 - Franck Bui + +- Enable oomd (bsc#1200456) + + It's part of the experimental sub-package for now. + ------------------------------------------------------------------- Tue Jul 19 11:32:25 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index bbaf964..29a51bf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -637,7 +637,7 @@ Components that turn out to be stable and considered as fully supported will be merged into the main package or moved into a dedicated package. -The package contains: homed, repart, userdbd. +The package contains: homed, repart, userdbd, oomd. Have fun with these services at your own risk. %endif @@ -687,7 +687,6 @@ Have fun with these services at your own risk. -Dima=false \ -Dldconfig=false \ -Dlibcryptsetup-plugins=false \ - -Doomd=false \ -Dsmack=false \ \ -Dpstore=true \ @@ -729,6 +728,7 @@ Have fun with these services at your own risk. -Dresolve=%{when resolved} \ \ -Dhomed=%{when experimental} \ + -Doomd=%{when experimental} \ -Drepart=%{when experimental} \ -Dsysupdate=%{when experimental} \ -Duserdb=%{when experimental} \ From 127267652ea75a684d6215f7a5cc929deb4dd8b679ad210783bb9ce22779fc90 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 19 Jul 2022 12:36:24 +0000 Subject: [PATCH 09/14] - Don't try to apply presets to any services shipped by the experimental sub-package Experimental services will never be enabled by default. OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1300 --- systemd.changes | 7 +++++++ systemd.spec | 18 ------------------ 2 files changed, 7 insertions(+), 18 deletions(-) diff --git a/systemd.changes b/systemd.changes index 21af42c..2ebea12 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jul 19 12:31:24 UTC 2022 - Franck Bui + +- Don't try to apply presets to any services shipped by the experimental sub-package + + Experimental services will never be enabled by default. + ------------------------------------------------------------------- Tue Jul 19 12:18:35 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 29a51bf..ffa94bd 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1272,24 +1272,6 @@ fi %service_del_postun systemd-portabled.service %endif -%if %{with experimental} -%pre experimental -%service_add_pre systemd-userdbd.service systemd-userdbd.socket -%service_add_pre systemd-homed.service - -%post experimental -%service_add_post systemd-userdbd.service systemd-userdbd.socket -%service_add_post systemd-homed.service - -%preun experimental -%service_del_preun systemd-userdbd.service systemd-userdbd.socket -%service_del_preun systemd-homed.service - -%postun experimental -%service_del_postun systemd-userdbd.service systemd-userdbd.socket -%service_del_postun systemd-homed.service -%endif - %files %defattr(-,root,root) %include %{SOURCE200} From ad55fe6b211254134840bb01c4f4229ba0a4df014e74a150cbdbed3810b0e94e Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Mon, 15 Aug 2022 11:44:59 +0000 Subject: [PATCH 10/14] Add 1001-statx.patch OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1301 --- 1001-statx.patch | 151 +++++++++++++++++++++++++++++++++++++++++++++++ systemd.changes | 10 ++++ systemd.spec | 1 + 3 files changed, 162 insertions(+) create mode 100644 1001-statx.patch diff --git a/1001-statx.patch b/1001-statx.patch new file mode 100644 index 0000000..2fc6986 --- /dev/null +++ b/1001-statx.patch @@ -0,0 +1,151 @@ +From 3657d3a01c7e25ff86d7a4642065b367c4ff7484 Mon Sep 17 00:00:00 2001 +From: Rudi Heitbaum +Date: Sat, 23 Jul 2022 10:38:49 +0000 +Subject: [PATCH] glibc: Remove #include to resolve + fsconfig_command/mount_attr conflict with glibc 2.36 + +--- + meson.build | 13 ++++++++++++- + src/basic/fd-util.c | 2 ++ + src/core/namespace.c | 2 ++ + src/shared/mount-util.c | 2 ++ + 4 files changed, 18 insertions(+), 1 deletion(-) + +diff --git meson.build meson.build +index 61073d4ead..4315914a2e 100644 +--- a/meson.build ++++ b/meson.build +@@ -511,7 +511,6 @@ decl_headers = ''' + #include + #include + #include +-#include + ''' + + foreach decl : ['char16_t', +@@ -523,6 +522,17 @@ foreach decl : ['char16_t', + # We get -1 if the size cannot be determined + have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0 + ++ if decl == 'struct mount_attr' ++ if have ++ want_linux_fs_h = false ++ else ++ have = cc.sizeof(decl, ++ prefix : decl_headers + '#include ', ++ args : '-D_GNU_SOURCE') > 0 ++ want_linux_fs_h = have ++ endif ++ endif ++ + if decl == 'struct statx' + if have + want_linux_stat_h = false +@@ -538,6 +548,7 @@ foreach decl : ['char16_t', + endforeach + + conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h) ++conf.set10('WANT_LINUX_FS_H', want_linux_fs_h) + + foreach ident : ['secure_getenv', '__secure_getenv'] + conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident)) +diff --git src/basic/fd-util.c src/basic/fd-util.c +index 6c1de92a26..00591d6c2d 100644 +--- a/src/basic/fd-util.c ++++ b/src/basic/fd-util.c +@@ -3,7 +3,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + #include + #include + #include +diff --git src/core/namespace.c src/core/namespace.c +index 41457ea816..016afe4d9e 100644 +--- a/src/core/namespace.c ++++ b/src/core/namespace.c +@@ -7,7 +7,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #include "alloc-util.h" + #include "base-filesystem.h" +diff --git src/shared/mount-util.c src/shared/mount-util.c +index 8cf16affcb..a119a7c3c1 100644 +--- a/src/shared/mount-util.c ++++ b/src/shared/mount-util.c +@@ -7,7 +7,9 @@ + #include + #include + #include ++#if WANT_LINUX_FS_H + #include ++#endif + + #include "alloc-util.h" + #include "chase-symlinks.h" +-- +2.35.3 + +Hmmm ... commit 3657d3a01c7e25ff86d7a4642065b367c4ff7484 is not enough + +--- systemd-v251.3+suse.27.g8cd784e925/src/basic/chattr-util.h ++++ systemd-v251.3+suse.27.g8cd784e925/src/basic/chattr-util.h 2022-08-15 10:36:27.022215514 +0000 +@@ -1,7 +1,8 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #pragma once + ++#define _LINUX_MOUNT_H + #include + #include + #include + +--- systemd-v251.3+suse.27.g8cd784e925/src/home/homework.h ++++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework.h 2022-08-15 10:46:08.835534459 +0000 +@@ -1,7 +1,9 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + #pragma once + ++#define _LINUX_MOUNT_H + #include ++#include + #include + + #include "sd-id128.h" +--- systemd-v251.3+suse.27.g8cd784e925/src/home/homework-mount.c ++++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework-mount.c 2022-08-15 10:48:58.804414702 +0000 +@@ -2,6 +2,7 @@ + + #include + #include ++#define _LINUX_MOUNT_H + #include + + #include "alloc-util.h" +--- systemd-v251.3+suse.27.g8cd784e925/src/home/homework-fscrypt.c ++++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework-fscrypt.c 2022-08-15 10:52:29.452548623 +0000 +@@ -1,5 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + ++#include ++#define _LINUX_MOUNT_H + #include + #include + #include +--- systemd-v251.3+suse.27.g8cd784e925/src/home/homed-manager.c ++++ systemd-v251.3+suse.27.g8cd784e925/src/home/homed-manager.c 2022-08-15 10:54:20.750506089 +0000 +@@ -1,6 +1,7 @@ + /* SPDX-License-Identifier: LGPL-2.1-or-later */ + + #include ++#define _LINUX_MOUNT_H + #include + #include + #include diff --git a/systemd.changes b/systemd.changes index 2ebea12..05d67dc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Mon Aug 15 10:25:34 UTC 2022 - Dr. Werner Fink + +- Add patch 1001-statx.patch based on commit 3657d3a0 + * to resolve conflicts with glibc 2.36 with + * add dirty hack to get in src/basic/chattr-util.h, + src/home/homework.h, src/home/homework-fscrypt.c, + src/home/homed-manager.c, and src/home/homework-mount.c as well + to avoid that does include + ------------------------------------------------------------------- Tue Jul 19 12:31:24 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ffa94bd..671c9a5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -206,6 +206,7 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Temporary workaround until bsc#1197178 is addressed. Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch +Patch1001: 1001-statx.patch # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git From 35f444399363e729fa97a5a7e47f5b238dc78d5606372037da24fc49653eb051 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 16 Aug 2022 16:17:07 +0000 Subject: [PATCH 11/14] - Import commit 532faa39ebaa6f56e493cc938a91a40df082b74f (merge of v251.4) It includes the following fixes: - 739d7130cb home: drop conflicted headers (bsc#1202221) - fe0c12178 glibc: Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 (bsc#1202221) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8cd784e9250b38d20d8e14fccbfb211010283c79...532faa39ebaa6f56e493cc938a91a40df082b74f OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1302 --- 1001-statx.patch | 151 ---------------------- systemd-v251.3+suse.27.g8cd784e925.tar.xz | 3 - systemd-v251.4+suse.29.g532faa39eb.tar.xz | 3 + systemd.changes | 15 +++ systemd.spec | 5 +- 5 files changed, 20 insertions(+), 157 deletions(-) delete mode 100644 1001-statx.patch delete mode 100644 systemd-v251.3+suse.27.g8cd784e925.tar.xz create mode 100644 systemd-v251.4+suse.29.g532faa39eb.tar.xz diff --git a/1001-statx.patch b/1001-statx.patch deleted file mode 100644 index 2fc6986..0000000 --- a/1001-statx.patch +++ /dev/null @@ -1,151 +0,0 @@ -From 3657d3a01c7e25ff86d7a4642065b367c4ff7484 Mon Sep 17 00:00:00 2001 -From: Rudi Heitbaum -Date: Sat, 23 Jul 2022 10:38:49 +0000 -Subject: [PATCH] glibc: Remove #include to resolve - fsconfig_command/mount_attr conflict with glibc 2.36 - ---- - meson.build | 13 ++++++++++++- - src/basic/fd-util.c | 2 ++ - src/core/namespace.c | 2 ++ - src/shared/mount-util.c | 2 ++ - 4 files changed, 18 insertions(+), 1 deletion(-) - -diff --git meson.build meson.build -index 61073d4ead..4315914a2e 100644 ---- a/meson.build -+++ b/meson.build -@@ -511,7 +511,6 @@ decl_headers = ''' - #include - #include - #include --#include - ''' - - foreach decl : ['char16_t', -@@ -523,6 +522,17 @@ foreach decl : ['char16_t', - # We get -1 if the size cannot be determined - have = cc.sizeof(decl, prefix : decl_headers, args : '-D_GNU_SOURCE') > 0 - -+ if decl == 'struct mount_attr' -+ if have -+ want_linux_fs_h = false -+ else -+ have = cc.sizeof(decl, -+ prefix : decl_headers + '#include ', -+ args : '-D_GNU_SOURCE') > 0 -+ want_linux_fs_h = have -+ endif -+ endif -+ - if decl == 'struct statx' - if have - want_linux_stat_h = false -@@ -538,6 +548,7 @@ foreach decl : ['char16_t', - endforeach - - conf.set10('WANT_LINUX_STAT_H', want_linux_stat_h) -+conf.set10('WANT_LINUX_FS_H', want_linux_fs_h) - - foreach ident : ['secure_getenv', '__secure_getenv'] - conf.set10('HAVE_' + ident.to_upper(), cc.has_function(ident)) -diff --git src/basic/fd-util.c src/basic/fd-util.c -index 6c1de92a26..00591d6c2d 100644 ---- a/src/basic/fd-util.c -+++ b/src/basic/fd-util.c -@@ -3,7 +3,9 @@ - #include - #include - #include -+#if WANT_LINUX_FS_H - #include -+#endif - #include - #include - #include -diff --git src/core/namespace.c src/core/namespace.c -index 41457ea816..016afe4d9e 100644 ---- a/src/core/namespace.c -+++ b/src/core/namespace.c -@@ -7,7 +7,9 @@ - #include - #include - #include -+#if WANT_LINUX_FS_H - #include -+#endif - - #include "alloc-util.h" - #include "base-filesystem.h" -diff --git src/shared/mount-util.c src/shared/mount-util.c -index 8cf16affcb..a119a7c3c1 100644 ---- a/src/shared/mount-util.c -+++ b/src/shared/mount-util.c -@@ -7,7 +7,9 @@ - #include - #include - #include -+#if WANT_LINUX_FS_H - #include -+#endif - - #include "alloc-util.h" - #include "chase-symlinks.h" --- -2.35.3 - -Hmmm ... commit 3657d3a01c7e25ff86d7a4642065b367c4ff7484 is not enough - ---- systemd-v251.3+suse.27.g8cd784e925/src/basic/chattr-util.h -+++ systemd-v251.3+suse.27.g8cd784e925/src/basic/chattr-util.h 2022-08-15 10:36:27.022215514 +0000 -@@ -1,7 +1,8 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - #pragma once - -+#define _LINUX_MOUNT_H - #include - #include - #include - ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homework.h -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework.h 2022-08-15 10:46:08.835534459 +0000 -@@ -1,7 +1,9 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - #pragma once - -+#define _LINUX_MOUNT_H - #include -+#include - #include - - #include "sd-id128.h" ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homework-mount.c -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework-mount.c 2022-08-15 10:48:58.804414702 +0000 -@@ -2,6 +2,7 @@ - - #include - #include -+#define _LINUX_MOUNT_H - #include - - #include "alloc-util.h" ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homework-fscrypt.c -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homework-fscrypt.c 2022-08-15 10:52:29.452548623 +0000 -@@ -1,5 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - -+#include -+#define _LINUX_MOUNT_H - #include - #include - #include ---- systemd-v251.3+suse.27.g8cd784e925/src/home/homed-manager.c -+++ systemd-v251.3+suse.27.g8cd784e925/src/home/homed-manager.c 2022-08-15 10:54:20.750506089 +0000 -@@ -1,6 +1,7 @@ - /* SPDX-License-Identifier: LGPL-2.1-or-later */ - - #include -+#define _LINUX_MOUNT_H - #include - #include - #include diff --git a/systemd-v251.3+suse.27.g8cd784e925.tar.xz b/systemd-v251.3+suse.27.g8cd784e925.tar.xz deleted file mode 100644 index 0af4209..0000000 --- a/systemd-v251.3+suse.27.g8cd784e925.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6b85c656fb5c904dced2f5add19bcd3ad463fd766ae1e435697fe4da321d721c -size 7829628 diff --git a/systemd-v251.4+suse.29.g532faa39eb.tar.xz b/systemd-v251.4+suse.29.g532faa39eb.tar.xz new file mode 100644 index 0000000..84e72c3 --- /dev/null +++ b/systemd-v251.4+suse.29.g532faa39eb.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:664d40000001006998ad05c7aa90093ee6f997f8d04fb0414dcecddf0670e583 +size 7831508 diff --git a/systemd.changes b/systemd.changes index 05d67dc..d4d5958 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Aug 16 15:55:26 UTC 2022 - Franck Bui + +- Import commit 532faa39ebaa6f56e493cc938a91a40df082b74f (merge of v251.4) + + It includes the following fixes: + + - 739d7130cb home: drop conflicted headers (bsc#1202221) + - fe0c12178 glibc: Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 (bsc#1202221) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8cd784e9250b38d20d8e14fccbfb211010283c79...532faa39ebaa6f56e493cc938a91a40df082b74f + +- Drop 1001-statx.patch, it's no more needed. + ------------------------------------------------------------------- Mon Aug 15 10:25:34 UTC 2022 - Dr. Werner Fink diff --git a/systemd.spec b/systemd.spec index 671c9a5..bc831ba 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.27.g8cd784e925 +%define archive_version +suse.29.g532faa39eb %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 251.3 +Version: 251.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -206,7 +206,6 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Temporary workaround until bsc#1197178 is addressed. Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch -Patch1001: 1001-statx.patch # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git From 7e306f4f894b2f8a6259635f09dc7e2e8bbfd0ddd6532c5379b2f4875d02b1b3 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 18 Aug 2022 07:02:18 +0000 Subject: [PATCH 12/14] Revert "Don't try to apply presets to any services shipped by the experimental sub-package" OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1303 --- systemd.changes | 7 ------- systemd.spec | 22 ++++++++++++++++++++++ 2 files changed, 22 insertions(+), 7 deletions(-) diff --git a/systemd.changes b/systemd.changes index d4d5958..353471f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -23,13 +23,6 @@ Mon Aug 15 10:25:34 UTC 2022 - Dr. Werner Fink src/home/homed-manager.c, and src/home/homework-mount.c as well to avoid that does include -------------------------------------------------------------------- -Tue Jul 19 12:31:24 UTC 2022 - Franck Bui - -- Don't try to apply presets to any services shipped by the experimental sub-package - - Experimental services will never be enabled by default. - ------------------------------------------------------------------- Tue Jul 19 12:18:35 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index bc831ba..434c88a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1272,6 +1272,28 @@ fi %service_del_postun systemd-portabled.service %endif +%if %{with experimental} +%pre experimental +%service_add_pre systemd-homed.service +%service_add_pre systemd-oomd.service systemd-oomd.socket +%service_add_pre systemd-userdbd.service systemd-userdbd.socket + +%post experimental +%service_add_post systemd-homed.service +%service_add_post systemd-oomd.service systemd-oomd.socket +%service_add_post systemd-userdbd.service systemd-userdbd.socket + +%preun experimental +%service_del_preun systemd-homed.service +%service_del_preun systemd-oomd.service systemd-oomd.socket +%service_del_preun systemd-userdbd.service systemd-userdbd.socket + +%postun experimental +%service_del_postun systemd-homed.service +%service_del_postun systemd-oomd.service systemd-oomd.socket +%service_del_postun systemd-userdbd.service systemd-userdbd.socket +%endif + %files %defattr(-,root,root) %include %{SOURCE200} From d1c209b23b7921740e4deec140ba9ba4604ef925b361404e11161ffcfba1acd3 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 18 Aug 2022 09:29:25 +0000 Subject: [PATCH 13/14] Add reference to bsc#1201766 in the changelogs OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1304 --- systemd.changes | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index 353471f..fe438c3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -6,7 +6,8 @@ Tue Aug 16 15:55:26 UTC 2022 - Franck Bui It includes the following fixes: - 739d7130cb home: drop conflicted headers (bsc#1202221) - - fe0c12178 glibc: Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 (bsc#1202221) + - 8fe0c12178 glibc: Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 (bsc#1202221) + - 0c5b7ee318 udev: allow to execute longer command line (bsc#1201766) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8cd784e9250b38d20d8e14fccbfb211010283c79...532faa39ebaa6f56e493cc938a91a40df082b74f From 5ef5a26c4dd4a9bff5d6b50bd9aefabe87b8df71e6c65fd6516db24b5351f2fc Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 18 Aug 2022 12:51:19 +0000 Subject: [PATCH 14/14] Add creation of systemd-oom user (it was forgotten previously) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=1305 --- systemd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd.spec b/systemd.spec index 434c88a..eea6b0f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1279,6 +1279,7 @@ fi %service_add_pre systemd-userdbd.service systemd-userdbd.socket %post experimental +%sysusers_create systemd-oom.conf %service_add_post systemd-homed.service %service_add_post systemd-oomd.service systemd-oomd.socket %service_add_post systemd-userdbd.service systemd-userdbd.socket