Accepting request 997974 from Base:System

- Import commit 532faa39ebaa6f56e493cc938a91a40df082b74f (merge of v251.4)
  It includes the following fixes:
  - 739d7130cb home: drop conflicted headers (bsc#1202221)
  - 8fe0c12178 glibc: Remove #include <linux/fs.h> 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:
  8cd784e925...532faa39eb
- Drop 1001-statx.patch, it's no more needed.

- Add patch 1001-statx.patch based on commit 3657d3a0
  * to resolve conflicts with glibc 2.36 with <linux/fs.h>
  * 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 <linux/fs.h> does include <linux/mount.h>

- Enable oomd (bsc#1200456)
  It's part of the experimental sub-package for now.

- Import commit 8cd784e9250b38d20d8e14fccbfb211010283c79 (merge of v251.3)
  For a complete list of changes, visit:
  3291287906...8cd784e925

- Import commit 32912879062bb1595d8498b6f9c77d5acd1dc66a
  111b96ca86 logind: don't delay login for root even if systemd-user-sessions.service is not activated yet (bsc#1195059)

- Enable bpf framework

- When systemd-container is installed install tar/gpg too
  So `machinectl import-tar` always works flawlessly. systemd-container already

OBS-URL: https://build.opensuse.org/request/show/997974
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=362
This commit is contained in:
Dominique Leuenberger 2022-08-20 18:28:06 +00:00 committed by Git OBS Bridge
parent 444d3c0a79
commit 65ac557c9c
7 changed files with 187 additions and 58 deletions

68
files.experimental Normal file
View File

@ -0,0 +1,68 @@
#
# 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
%{_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
%{_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-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
%{_unitdir}/systemd-sysupdate.service
%{_unitdir}/systemd-sysupdate.timer
%{_unitdir}/systemd-userdbd.service
%{_unitdir}/systemd-userdbd.socket

View File

@ -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
@ -302,7 +304,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 +389,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 +448,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 +642,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
@ -678,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

View File

@ -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

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b6b345714da705a4dd420ae4ebec9192b009d5d00c0186b7300894f961d3495c
size 7827816

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:664d40000001006998ad05c7aa90093ee6f997f8d04fb0414dcecddf0670e583
size 7831508

View File

@ -1,3 +1,89 @@
-------------------------------------------------------------------
Tue Aug 16 15:55:26 UTC 2022 - Franck Bui <fbui@suse.com>
- Import commit 532faa39ebaa6f56e493cc938a91a40df082b74f (merge of v251.4)
It includes the following fixes:
- 739d7130cb home: drop conflicted headers (bsc#1202221)
- 8fe0c12178 glibc: Remove #include <linux/fs.h> 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
- Drop 1001-statx.patch, it's no more needed.
-------------------------------------------------------------------
Mon Aug 15 10:25:34 UTC 2022 - Dr. Werner Fink <werner@suse.de>
- Add patch 1001-statx.patch based on commit 3657d3a0
* to resolve conflicts with glibc 2.36 with <linux/fs.h>
* 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 <linux/fs.h> does include <linux/mount.h>
-------------------------------------------------------------------
Tue Jul 19 12:18:35 UTC 2022 - Franck Bui <fbui@suse.com>
- Enable oomd (bsc#1200456)
It's part of the experimental sub-package for now.
-------------------------------------------------------------------
Tue Jul 19 11:32:25 UTC 2022 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com>
- 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 <fbui@suse.com>
- Enable bpf framework
-------------------------------------------------------------------
Mon Jul 18 15:54:51 UTC 2022 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com>
- systemd.spec: add files.experimental
-------------------------------------------------------------------
Fri Jul 8 16:39:07 UTC 2022 - Franck Bui <fbui@suse.com>
- 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 <fbui@suse.com>
- Import commit 69abca7794ed06d823bc0a9bb55daf822adcc632
f29b146685 pstore: Run after modules are loaded
-------------------------------------------------------------------
Tue Jun 21 14:09:51 UTC 2022 - Franck Bui <fbui@suse.com>

View File

@ -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.29.g532faa39eb
%define _testsuitedir /usr/lib/systemd/tests
%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit
@ -72,12 +72,14 @@
Name: systemd%{?mini}
URL: http://www.freedesktop.org/wiki/Software/systemd
Version: 251.2
Version: 251.4
Release: 0
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
@ -178,6 +183,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
@ -387,6 +393,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}
@ -628,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
@ -678,12 +687,12 @@ Have fun with these services at your own risk.
-Dima=false \
-Dldconfig=false \
-Dlibcryptsetup-plugins=false \
-Doomd=false \
-Dsmack=false \
\
-Dpstore=true \
\
-Dapparmor=%{when_not bootstrap} \
-Dbpf-framework=%{when_not bootstrap} \
-Defi=%{when_not bootstrap} \
-Delfutils=%{when_not bootstrap} \
-Dhtml=%{when_not bootstrap} \
@ -692,7 +701,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} \
@ -720,7 +728,9 @@ 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} \
\
-Dtests=%{when testsuite unsafe} \
@ -1264,20 +1274,25 @@ fi
%if %{with experimental}
%pre experimental
%service_add_pre systemd-userdbd.service systemd-userdbd.socket
%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-userdbd.service systemd-userdbd.socket
%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
%preun experimental
%service_del_preun systemd-userdbd.service systemd-userdbd.socket
%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-userdbd.service systemd-userdbd.socket
%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
@ -1409,37 +1424,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