From fa9365f7b62960932b077a6a9cf7a72ed62e7ef874c4bb046f82750b4693856c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 29 Jul 2017 06:54:38 +0000 Subject: [PATCH 001/124] Accepting request 512933 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/512933 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=259 --- systemd-233.tar.xz | 3 --- systemd-234.tar.xz | 3 +++ systemd-mini.changes | 58 +++++++++++++++++++++++++++++++++++++++++++- systemd-mini.spec | 20 ++++++--------- systemd.changes | 58 +++++++++++++++++++++++++++++++++++++++++++- systemd.spec | 20 ++++++--------- 6 files changed, 131 insertions(+), 31 deletions(-) delete mode 100644 systemd-233.tar.xz create mode 100644 systemd-234.tar.xz diff --git a/systemd-233.tar.xz b/systemd-233.tar.xz deleted file mode 100644 index a77e6941..00000000 --- a/systemd-233.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31fe0c3bea971e0dd40b9bec3f08080859ab3710f3882e0009582dd0bf16086d -size 3257376 diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz new file mode 100644 index 00000000..53f5ae9d --- /dev/null +++ b/systemd-234.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a67ec597500cf2b739c1656738704845b2ff6bfaa153d7de79f66c6bb18336f1 +size 3350088 diff --git a/systemd-mini.changes b/systemd-mini.changes index cf442750..95df3373 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com + +- Import commit 6887cc21f23e33ac37801a01d76176e5c16fd8ea + + 9dcc6c04e pid1: forward port console specificities handling for s390 arch to v234 + +------------------------------------------------------------------- +Fri Jul 28 13:06:27 UTC 2017 - fbui@suse.com + +- Import commit 986e98fd5a75470ba17e21fea12d7d4e966c1ecc + + 4706ebc62 call chase_symlinks without the /sysroot prefix (#6411) (boo#1051172) + +------------------------------------------------------------------- +Thu Jul 27 16:55:33 UTC 2017 - fbui@suse.com + +- Remove the unneeded hack forcing systemd-crypsetup binary to be linked against the just built libudev + + I don't remember why it was added but it looks unnecessary: most of + all systemd components are linked againt libsystemd-shared.so which + includes all the just built symbols. + + Also I don't see why it was done only for systemd-cryptsetup since + all other binaries should have had suffered from the same issue. + +------------------------------------------------------------------- +Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com + +- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 + + 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) + +------------------------------------------------------------------- +Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com + +- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b + + 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled + 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" + +------------------------------------------------------------------- +Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com + +- Drop support of compression from the mini package + + Hence remove the relevant build-requires from the mini package. + +------------------------------------------------------------------- +Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com + +- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) + + - package /etc/systemd/system/dbus-org.freedesktop.network1.service + - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled + ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -86,7 +142,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) +- Make sure dracut (if installed) will embed the new compat rule The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd-mini.spec b/systemd-mini.spec index dbb34853..1ed187ec 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -49,7 +49,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 233 +Version: 234 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -66,6 +66,8 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -83,8 +85,6 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -414,16 +414,6 @@ cp %{SOURCE7} m4/ %endif %build -# -# Be sure that fresh build libudev is found and used at linkage time -# -sed -ri '/^systemd_cryptsetup_CFLAGS/,/^systemd_cryptsetup_LDADD/{ /^$/a\ -systemd_cryptsetup_LDFLAGS =\\\ - $(AM_LDFLAGS)\\\ - -Wl,-rpath-link=$(top_srcdir)/.libs\ - -}' Makefile.am - ./autogen.sh # keep split-usr until all packages have moved their systemd rules to /usr @@ -954,7 +944,9 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so +%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf +%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1034,9 +1026,11 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} diff --git a/systemd.changes b/systemd.changes index cf442750..95df3373 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com + +- Import commit 6887cc21f23e33ac37801a01d76176e5c16fd8ea + + 9dcc6c04e pid1: forward port console specificities handling for s390 arch to v234 + +------------------------------------------------------------------- +Fri Jul 28 13:06:27 UTC 2017 - fbui@suse.com + +- Import commit 986e98fd5a75470ba17e21fea12d7d4e966c1ecc + + 4706ebc62 call chase_symlinks without the /sysroot prefix (#6411) (boo#1051172) + +------------------------------------------------------------------- +Thu Jul 27 16:55:33 UTC 2017 - fbui@suse.com + +- Remove the unneeded hack forcing systemd-crypsetup binary to be linked against the just built libudev + + I don't remember why it was added but it looks unnecessary: most of + all systemd components are linked againt libsystemd-shared.so which + includes all the just built symbols. + + Also I don't see why it was done only for systemd-cryptsetup since + all other binaries should have had suffered from the same issue. + +------------------------------------------------------------------- +Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com + +- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 + + 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) + +------------------------------------------------------------------- +Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com + +- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b + + 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled + 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" + +------------------------------------------------------------------- +Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com + +- Drop support of compression from the mini package + + Hence remove the relevant build-requires from the mini package. + +------------------------------------------------------------------- +Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com + +- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) + + - package /etc/systemd/system/dbus-org.freedesktop.network1.service + - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled + ------------------------------------------------------------------- Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de @@ -86,7 +142,7 @@ Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com ------------------------------------------------------------------- Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com -- Make sure dracut (if installed) will embed the new compat rule (bsc#982303) +- Make sure dracut (if installed) will embed the new compat rule The new compat rule must be embedded in the initramfs so make sure that the installed dracut supports it. diff --git a/systemd.spec b/systemd.spec index 680dcecb..56d0a028 100644 --- a/systemd.spec +++ b/systemd.spec @@ -47,7 +47,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 233 +Version: 234 Release: 0 Summary: A System and Session Manager License: LGPL-2.1+ @@ -64,6 +64,8 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(liblz4) +BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) %endif BuildRequires: fdupes @@ -81,8 +83,6 @@ BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) BuildRequires: pkgconfig(libselinux) >= 2.1.9 @@ -412,16 +412,6 @@ cp %{SOURCE7} m4/ %endif %build -# -# Be sure that fresh build libudev is found and used at linkage time -# -sed -ri '/^systemd_cryptsetup_CFLAGS/,/^systemd_cryptsetup_LDADD/{ /^$/a\ -systemd_cryptsetup_LDFLAGS =\\\ - $(AM_LDFLAGS)\\\ - -Wl,-rpath-link=$(top_srcdir)/.libs\ - -}' Makefile.am - ./autogen.sh # keep split-usr until all packages have moved their systemd rules to /usr @@ -952,7 +942,9 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so +%if %{with resolved} %{_prefix}/lib/systemd/resolv.conf +%endif %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog @@ -1032,9 +1024,11 @@ fi %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} +%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} From 84bc363096025975f3d766c5f1683d631102f55e2661346c222c70f9ce3e19f4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 4 Sep 2017 10:20:42 +0000 Subject: [PATCH 002/124] Accepting request 519864 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/519864 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=260 --- ...ce-Use-JobRunningTimeoutSec-for-devi.patch | 48 +++++++++++++++++++ systemd-234.tar.xz | 4 +- systemd-mini.changes | 27 +++++++++++ systemd-mini.spec | 4 +- systemd.changes | 27 +++++++++++ systemd.spec | 4 +- 6 files changed, 108 insertions(+), 6 deletions(-) create mode 100644 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch diff --git a/0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch b/0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch new file mode 100644 index 00000000..cc49aea0 --- /dev/null +++ b/0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch @@ -0,0 +1,48 @@ +From 02a4361a931a210b547795a49d062e90d2462cbc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michal=20Koutn=C3=BD?= +Date: Wed, 23 Aug 2017 15:18:19 +0200 +Subject: [PATCH 1/1] Revert "core/device: Use JobRunningTimeoutSec= for device + units" + +This reverts commit d9732d78034cd01a75f2cda6ebaddb4c3a0929ea. + +This is not backwards compatible for outer callers that are used to set +JobTimeoutSec= for devices. The compatibility breaks if JobTimeoutSec= is +longer than default JobRunningTimeoutSec=90, especially JobTimeoutSec=infinity. + +[mkoutny: fixes bsc#1048605] +[fbui: as a consequence, reintroduces bsc#1004995] +--- + src/core/device.c | 2 +- + src/shared/generator.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/device.c b/src/core/device.c +index 434a6a9c5..89549f43b 100644 +--- a/src/core/device.c ++++ b/src/core/device.c +@@ -114,7 +114,7 @@ static void device_init(Unit *u) { + * indefinitely for plugged in devices, something which cannot + * happen for the other units since their operations time out + * anyway. */ +- u->job_running_timeout = u->manager->default_timeout_start_usec; ++ u->job_timeout = u->manager->default_timeout_start_usec; + + u->ignore_on_isolate = true; + } +diff --git a/src/shared/generator.c b/src/shared/generator.c +index 47be354ba..743bc88f6 100644 +--- a/src/shared/generator.c ++++ b/src/shared/generator.c +@@ -187,7 +187,7 @@ int generator_write_timeouts( + + return write_drop_in_format(dir, unit, 50, "device-timeout", + "# Automatically generated by %s\n\n" +- "[Unit]\nJobRunningTimeoutSec=%s", ++ "[Unit]\nJobTimeoutSec=%s", + program_invocation_short_name, timeout); + } + +-- +2.13.1 + diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 53f5ae9d..99fbec2d 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:a67ec597500cf2b739c1656738704845b2ff6bfaa153d7de79f66c6bb18336f1 -size 3350088 +oid sha256:ca0e6e98e69ba6a809d145ac5562f594c86acce052fbfbbf291fa61e9b8352a2 +size 3351252 diff --git a/systemd-mini.changes b/systemd-mini.changes index 95df3373..53d736b7 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Aug 30 15:17:24 UTC 2017 - fbui@suse.com + +- Add 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch (bsc#1048605) + + It's a temporary but urgent fix for a regression discovered in bug + 1048605. The fix is still under discussion with upstream but we need + to make progress here and limit the number of affected users. + + Consequently this fix reintroduces bsc#1004995 (the bug report has + been re-opened) but this one is far less critical and a workaround + was provided. + + The final solution will fix both bugs. + +------------------------------------------------------------------- +Tue Aug 29 10:30:00 UTC 2017 - fbui@suse.com + +- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1 + + 7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268) + +------------------------------------------------------------------- +Tue Aug 1 13:39:41 UTC 2017 - fbui@suse.com + +- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section + ------------------------------------------------------------------- Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 1ed187ec..658f2c2f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -162,6 +162,7 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch +Patch2: 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -765,8 +766,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then end %pre -n udev%{?mini} -%regenerate_initrd_post - if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then rm /usr/lib/udev mv /lib/udev /usr/lib @@ -784,6 +783,7 @@ if [ $1 -eq 1 ]; then fi %post -n udev%{?mini} +%regenerate_initrd_post %udev_hwdb_update # add KERNEL name match to existing persistent net rules diff --git a/systemd.changes b/systemd.changes index 95df3373..53d736b7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Wed Aug 30 15:17:24 UTC 2017 - fbui@suse.com + +- Add 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch (bsc#1048605) + + It's a temporary but urgent fix for a regression discovered in bug + 1048605. The fix is still under discussion with upstream but we need + to make progress here and limit the number of affected users. + + Consequently this fix reintroduces bsc#1004995 (the bug report has + been re-opened) but this one is far less critical and a workaround + was provided. + + The final solution will fix both bugs. + +------------------------------------------------------------------- +Tue Aug 29 10:30:00 UTC 2017 - fbui@suse.com + +- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1 + + 7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268) + +------------------------------------------------------------------- +Tue Aug 1 13:39:41 UTC 2017 - fbui@suse.com + +- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section + ------------------------------------------------------------------- Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 56d0a028..3955b61a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -160,6 +160,7 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch +Patch2: 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -763,8 +764,6 @@ if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then end %pre -n udev%{?mini} -%regenerate_initrd_post - if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then rm /usr/lib/udev mv /lib/udev /usr/lib @@ -782,6 +781,7 @@ if [ $1 -eq 1 ]; then fi %post -n udev%{?mini} +%regenerate_initrd_post %udev_hwdb_update # add KERNEL name match to existing persistent net rules From 027474f6bc1205c03842fd97abdafc3f74a2e50a13bc86367dd7659548b6a0ca Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 17 Sep 2017 20:36:37 +0000 Subject: [PATCH 003/124] Accepting request 526196 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/526196 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=261 --- ...ripts-systemd-fix-machines-btrfs-subvol.sh | 0 scripts-systemd-upgrade-from-pre-210.sh | 30 ++++++ scripts-udev-convert-lib-udev-path.sh | 92 +++++++++++++++++++ systemd-234.tar.xz | 4 +- systemd-mini.changes | 59 ++++++++++++ systemd-mini.spec | 62 +++++-------- systemd.changes | 59 ++++++++++++ systemd.spec | 62 +++++-------- 8 files changed, 288 insertions(+), 80 deletions(-) rename fix-machines-subvol-for-rollbacks.sh => scripts-systemd-fix-machines-btrfs-subvol.sh (100%) create mode 100644 scripts-systemd-upgrade-from-pre-210.sh create mode 100644 scripts-udev-convert-lib-udev-path.sh diff --git a/fix-machines-subvol-for-rollbacks.sh b/scripts-systemd-fix-machines-btrfs-subvol.sh similarity index 100% rename from fix-machines-subvol-for-rollbacks.sh rename to scripts-systemd-fix-machines-btrfs-subvol.sh diff --git a/scripts-systemd-upgrade-from-pre-210.sh b/scripts-systemd-upgrade-from-pre-210.sh new file mode 100644 index 00000000..b94a3985 --- /dev/null +++ b/scripts-systemd-upgrade-from-pre-210.sh @@ -0,0 +1,30 @@ +#! /bin/bash + +# +# This script is supposed to be executed from the %post section. It +# contains all hacks needed to update a system which was running +# systemd < v210. This also includes systems migrating from SysV. +# +# All hacks can potentially break the admin settings since they work +# in /etc... + +# Try to read default runlevel from the old inittab if it exists +if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then + runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) + if [ -n "$runlevel" ] ; then + ln -sf /usr/lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target + fi +fi + +# since v207 /etc/sysctl.conf is no longer parsed, however +# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf +if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then + ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf +fi + +# migrate any symlink which may refer to the old path +for f in $(find /etc/systemd/system -type l -xtype l); do + new_target="/usr$(readlink $f)" + [ -f "$new_target" ] && ln -s -f $new_target $f +done + diff --git a/scripts-udev-convert-lib-udev-path.sh b/scripts-udev-convert-lib-udev-path.sh new file mode 100644 index 00000000..1463f787 --- /dev/null +++ b/scripts-udev-convert-lib-udev-path.sh @@ -0,0 +1,92 @@ +#! /bin/bash +# +# When upgrading from systems predating systemd (SLE11, openSUSE +# 12.x), udev libexec directory was changed from /lib/udev to +# /usr/lib/udev. Some customer scripts might still rely on the old +# path, therefore try to create a symlink that preserves the old path +# (see bsc#1050152). +# +# This script is supposed to be called from the %posttrans scection of +# the udev package. +# +convert_lib_udev_path () { + local failed=/bin/false + + # Sanity check: /usr/lib/udev must exist at that point since + # the new udev package should have been installed. + if ! test -d /usr/lib/udev; then + echo >&2 "/usr/lib/udev does not exist, refusing to create" + echo >&2 "/lib/udev compat symlink." + return 1 + fi + + # If the symlink is missing it probably means that we're + # upgrading and the old /lib/udev path was removed as it was + # empty at the time the old version of udev was uninstalled. + if ! test -e /lib/udev; then + echo "Creating /lib/udev -> /usr/lib/udev symlink." + ln -s /usr/lib/udev /lib/udev + return + fi + + # If a symlink already exists, simply assume that we already + # did the job. IOW we're just doing a simple update of + # systemd/udev (not upgrading). + if test -L /lib/udev; then + return + fi + + # Sanity check: refuse to deal with anything but a directory. + if ! test -d /lib/udev; then + echo >&2 "/lib/udev is not either a directory nor a symlink !" + echo >&2 "It won't be converted into a symlink to /usr/lib/udev." + echo >&2 "Please create it manually." + return 1 + fi + + # /lib/udev exists and is still a directory (probably not + # empty otherwise it would have been removed when the old + # version of udev was uninstalled), we try to merge its + # content with the new location and if it fails we warn the + # user and let him sort this out. + shopt -s globstar + for f in /lib/udev/**; do + if test -d "$f"; then + continue + fi + if test -e /usr/"$f"; then + echo >&2 "Failed to migrate '$f' to /usr/lib/udev because it already exists." + failed=/bin/true + continue + fi + + echo "Migrating '$f' in /usr/lib/udev" + if ! cp -a --parents "$f" /usr; then + echo >&2 "Failed to move '$f' in /usr/lib/udev." + failed=/bin/true + continue + fi + rm "$f" + done + shopt -u globstar + + if ! $failed; then + rm -fr /lib/udev && + ln -s ../usr/lib/udev /lib/udev && + echo "The content of /lib/udev has been moved in /usr/lib/udev successfully" && + echo "and /lib/udev is now a symlink pointing to /usr/lib/udev." && + echo "Please note /lib/udev is deprecated and shouldn't be used by" && + echo "new scripts/applications anymore." || + failed=/bin/true + fi + + if $failed; then + echo >&2 "Converting /lib/udev into a symlink pointing to /usr/lib/udev was not" + echo >&2 "possible due to previous error(s)." + echo >&2 "Please fix them and then create the symlink with:" + echo >&2 " 'ln -s ../usr/lib/udev /lib/udev'." + return 1 + fi +} + +convert_lib_udev_path diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 99fbec2d..07321344 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ca0e6e98e69ba6a809d145ac5562f594c86acce052fbfbbf291fa61e9b8352a2 -size 3351252 +oid sha256:3e6748a9e064fa60601d85dd13b360142e3d54f31be45b17773d6be3abb9b05f +size 3350944 diff --git a/systemd-mini.changes b/systemd-mini.changes index 53d736b7..cbbe1a27 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Thu Sep 14 16:34:16 UTC 2017 - fbui@suse.com + +- Import commit 58ea3c819cca1639ef8c922505c573ba5e262b3d + + 334945091 shutdown: fix incorrect fscanf() result check (#6806) + 027202892 shutdown: don't remount,ro network filesystems. (#6588) (bsc#1035386) + bc77b53a5 shutdown: don't be fooled when detaching DM devices with BTRFS (boo#1055641) + d9d293847 util: make get_block_device() available + 421ce7382 tmpfiles: silently ignore any path that passes through autofs (#6506) (bsc#1045472) + ca8f90e62 device: make sure to remove all device units sharing the same sysfs path (#6679) + +------------------------------------------------------------------- +Thu Sep 14 16:12:30 UTC 2017 - fbui@suse.com + +- Make use of "%tmpfiles_create" in %post of the logger subpackage + +------------------------------------------------------------------- +Thu Sep 14 15:51:54 UTC 2017 - fbui@suse.com + +- Add scripts-udev-convert-lib-udev-path.sh (bsc#1050152) + + This script takes care of converting /lib/udev into a symlink + pointing to /usr/lib/udev when upgrading a distro using an old + version of udev. + +------------------------------------------------------------------- +Thu Sep 14 12:23:26 UTC 2017 - fbui@suse.com + +- Make use of "%make_build" rpm macro + +------------------------------------------------------------------- +Thu Sep 14 12:18:21 UTC 2017 - fbui@suse.com + +- Renumber scripts to start at index 100 + +------------------------------------------------------------------- +Thu Sep 14 11:32:28 UTC 2017 - fbui@suse.com + +- Introduce scripts-systemd-upgrade-from-pre-210.sh + + It collects all existing hacks done in %post to fix old/deprecated + settings in systemd older than 210. This includes hacks needed to + fix system that are migrating from SysV. + + There shouldn't be any functional changes. + +------------------------------------------------------------------- +Thu Sep 14 11:06:35 UTC 2017 - fbui@suse.com + +- Move scripts for packaging workaround/fixes in /usr/lib/systemd/scripts + + It also renames fix-machines-subvol-for-rollbacks.sh into + scripts-systemd-fix-machines-btrfs-subvol.sh + + Note that the "scripts-systemd-" prefix is used for those scripts so + we can gather them. Why not using a directory instead ? because osc + doesn't allow that. + ------------------------------------------------------------------- Wed Aug 30 15:17:24 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 658f2c2f..c63b0f9a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -150,9 +150,12 @@ Source7: libgcrypt.m4 Source10: macros.systemd.upstream Source11: after-local.service Source12: systemd-sysv-install -Source13: fix-machines-subvol-for-rollbacks.sh Source14: kbd-model-map.legacy +Source100: scripts-systemd-fix-machines-btrfs-subvol.sh +Source101: scripts-systemd-upgrade-from-pre-210.sh +Source200: scripts-udev-convert-lib-udev-path.sh + Source1065: udev-remount-tmpfs # Patches listed in here are really special cases. Normally all @@ -460,7 +463,7 @@ cp %{SOURCE7} m4/ %endif --disable-kdbus -make %{?_smp_mflags} V=e +%make_build V=e %install %make_install @@ -488,7 +491,16 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install -install -m0755 %{S:13} %{buildroot}/%{_prefix}/lib/systemd/ + +# Package the scripts used to fix all packaging issues. Also drop the +# "scripts-{systemd/udev}" prefix which is used because osc doesn't +# allow directory structure... +for s in %{S:100} %{S:101}; do + install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} +done +for s in %{S:200}; do + install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-} +done ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -669,14 +681,6 @@ systemctl daemon-reexec || : %journal_catalog_update %tmpfiles_create 2>/dev/null -# Try to read default runlevel from the old inittab if it exists -if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then - runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) - if [ -n "$runlevel" ] ; then - ln -sf /usr/lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target || : - fi -fi - # Create default config in /etc at first install. # Later package updates should not overwrite these settings. if [ $1 -eq 1 ]; then @@ -695,18 +699,6 @@ if [ $1 -eq 1 ]; then %endif fi >/dev/null -# since v207 /etc/sysctl.conf is no longer parsed, however -# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf -if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then - ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : -fi - -# migrate any symlink which may refer to the old path -for f in $(find /etc/systemd/system -type l -xtype l); do - new_target="/usr$(readlink $f)" - [ -f "$new_target" ] && ln -s -f $new_target $f || : -done - # Keep tmp.mount if it's been enabled explicitly by the user otherwise # make sure it wont be activated since it's the default for Suse # distros. This unit can be pulled (implicitely) in various ways @@ -729,6 +721,9 @@ for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do chmod 0644 $username done +# This includes all hacks needed when upgrading from SysV. +%{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : + # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed # to create it at installation time. @@ -745,7 +740,7 @@ done # tmpfiles_create macro previously however it's empty so there # shouldn't be any issues. if [ $1 -gt 1 ]; then - %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh || : + %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi %postun @@ -760,20 +755,7 @@ fi %systemd_postun_with_restart systemd-resolved.service %endif -%pretrans -n udev%{?mini} -p -if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then - posix.symlink("/lib/udev", "/usr/lib/udev") -end - %pre -n udev%{?mini} -if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then - rm /usr/lib/udev - mv /lib/udev /usr/lib - ln -s /usr/lib/udev /lib/udev -elif [ ! -e /lib/udev ]; then - ln -s /usr/lib/udev /lib/udev -fi - # New installations uses the last compat symlink generation number # (currently at 2), which basically disables all compat symlinks. On # old systems, the file doesn't exist. This is equivalent to @@ -807,6 +789,7 @@ systemctl daemon-reload || : %posttrans -n udev%{?mini} %regenerate_initrd_posttrans +%{_prefix}/lib/udev/scripts/convert-lib-udev-path.sh || : %post -n libudev%{?mini}1 -p /sbin/ldconfig %post -n libsystemd0%{?mini} -p /sbin/ldconfig @@ -816,7 +799,7 @@ systemctl daemon-reload || : %if ! 0%{?bootstrap} %post logger -systemd-tmpfiles --create --prefix=%{_localstatedir}/log/journal/ || : +%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then # tell journal to start logging on disk if directory didn't exist before systemctl --no-block restart systemd-journal-flush.service >/dev/null || : @@ -947,7 +930,7 @@ fi %if %{with resolved} %{_prefix}/lib/systemd/resolv.conf %endif -%{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh +%{_prefix}/lib/systemd/scripts %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog %{_prefix}/lib/systemd/catalog/systemd.*.catalog @@ -1198,6 +1181,7 @@ fi %exclude %{_prefix}/lib/udev/rules.d/99-systemd.rules %{_prefix}/lib/udev/rules.d/*.rules %{_prefix}/lib/udev/hwdb.d/ +%{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ %ghost %{_sysconfdir}/udev/hwdb.bin diff --git a/systemd.changes b/systemd.changes index 53d736b7..cbbe1a27 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Thu Sep 14 16:34:16 UTC 2017 - fbui@suse.com + +- Import commit 58ea3c819cca1639ef8c922505c573ba5e262b3d + + 334945091 shutdown: fix incorrect fscanf() result check (#6806) + 027202892 shutdown: don't remount,ro network filesystems. (#6588) (bsc#1035386) + bc77b53a5 shutdown: don't be fooled when detaching DM devices with BTRFS (boo#1055641) + d9d293847 util: make get_block_device() available + 421ce7382 tmpfiles: silently ignore any path that passes through autofs (#6506) (bsc#1045472) + ca8f90e62 device: make sure to remove all device units sharing the same sysfs path (#6679) + +------------------------------------------------------------------- +Thu Sep 14 16:12:30 UTC 2017 - fbui@suse.com + +- Make use of "%tmpfiles_create" in %post of the logger subpackage + +------------------------------------------------------------------- +Thu Sep 14 15:51:54 UTC 2017 - fbui@suse.com + +- Add scripts-udev-convert-lib-udev-path.sh (bsc#1050152) + + This script takes care of converting /lib/udev into a symlink + pointing to /usr/lib/udev when upgrading a distro using an old + version of udev. + +------------------------------------------------------------------- +Thu Sep 14 12:23:26 UTC 2017 - fbui@suse.com + +- Make use of "%make_build" rpm macro + +------------------------------------------------------------------- +Thu Sep 14 12:18:21 UTC 2017 - fbui@suse.com + +- Renumber scripts to start at index 100 + +------------------------------------------------------------------- +Thu Sep 14 11:32:28 UTC 2017 - fbui@suse.com + +- Introduce scripts-systemd-upgrade-from-pre-210.sh + + It collects all existing hacks done in %post to fix old/deprecated + settings in systemd older than 210. This includes hacks needed to + fix system that are migrating from SysV. + + There shouldn't be any functional changes. + +------------------------------------------------------------------- +Thu Sep 14 11:06:35 UTC 2017 - fbui@suse.com + +- Move scripts for packaging workaround/fixes in /usr/lib/systemd/scripts + + It also renames fix-machines-subvol-for-rollbacks.sh into + scripts-systemd-fix-machines-btrfs-subvol.sh + + Note that the "scripts-systemd-" prefix is used for those scripts so + we can gather them. Why not using a directory instead ? because osc + doesn't allow that. + ------------------------------------------------------------------- Wed Aug 30 15:17:24 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 3955b61a..97ac7b9b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -148,9 +148,12 @@ Source7: libgcrypt.m4 Source10: macros.systemd.upstream Source11: after-local.service Source12: systemd-sysv-install -Source13: fix-machines-subvol-for-rollbacks.sh Source14: kbd-model-map.legacy +Source100: scripts-systemd-fix-machines-btrfs-subvol.sh +Source101: scripts-systemd-upgrade-from-pre-210.sh +Source200: scripts-udev-convert-lib-udev-path.sh + Source1065: udev-remount-tmpfs # Patches listed in here are really special cases. Normally all @@ -458,7 +461,7 @@ cp %{SOURCE7} m4/ %endif --disable-kdbus -make %{?_smp_mflags} V=e +%make_build V=e %install %make_install @@ -486,7 +489,16 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install -install -m0755 %{S:13} %{buildroot}/%{_prefix}/lib/systemd/ + +# Package the scripts used to fix all packaging issues. Also drop the +# "scripts-{systemd/udev}" prefix which is used because osc doesn't +# allow directory structure... +for s in %{S:100} %{S:101}; do + install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} +done +for s in %{S:200}; do + install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-} +done ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -667,14 +679,6 @@ systemctl daemon-reexec || : %journal_catalog_update %tmpfiles_create 2>/dev/null -# Try to read default runlevel from the old inittab if it exists -if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then - runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) - if [ -n "$runlevel" ] ; then - ln -sf /usr/lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target || : - fi -fi - # Create default config in /etc at first install. # Later package updates should not overwrite these settings. if [ $1 -eq 1 ]; then @@ -693,18 +697,6 @@ if [ $1 -eq 1 ]; then %endif fi >/dev/null -# since v207 /etc/sysctl.conf is no longer parsed, however -# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf -if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then - ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf || : -fi - -# migrate any symlink which may refer to the old path -for f in $(find /etc/systemd/system -type l -xtype l); do - new_target="/usr$(readlink $f)" - [ -f "$new_target" ] && ln -s -f $new_target $f || : -done - # Keep tmp.mount if it's been enabled explicitly by the user otherwise # make sure it wont be activated since it's the default for Suse # distros. This unit can be pulled (implicitely) in various ways @@ -727,6 +719,9 @@ for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do chmod 0644 $username done +# This includes all hacks needed when upgrading from SysV. +%{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : + # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed # to create it at installation time. @@ -743,7 +738,7 @@ done # tmpfiles_create macro previously however it's empty so there # shouldn't be any issues. if [ $1 -gt 1 ]; then - %{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh || : + %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi %postun @@ -758,20 +753,7 @@ fi %systemd_postun_with_restart systemd-resolved.service %endif -%pretrans -n udev%{?mini} -p -if posix.stat("/lib/udev") and not posix.stat("/usr/lib/udev") then - posix.symlink("/lib/udev", "/usr/lib/udev") -end - %pre -n udev%{?mini} -if test -L /usr/lib/udev -a /lib/udev -ef /usr/lib/udev ; then - rm /usr/lib/udev - mv /lib/udev /usr/lib - ln -s /usr/lib/udev /lib/udev -elif [ ! -e /lib/udev ]; then - ln -s /usr/lib/udev /lib/udev -fi - # New installations uses the last compat symlink generation number # (currently at 2), which basically disables all compat symlinks. On # old systems, the file doesn't exist. This is equivalent to @@ -805,6 +787,7 @@ systemctl daemon-reload || : %posttrans -n udev%{?mini} %regenerate_initrd_posttrans +%{_prefix}/lib/udev/scripts/convert-lib-udev-path.sh || : %post -n libudev%{?mini}1 -p /sbin/ldconfig %post -n libsystemd0%{?mini} -p /sbin/ldconfig @@ -814,7 +797,7 @@ systemctl daemon-reload || : %if ! 0%{?bootstrap} %post logger -systemd-tmpfiles --create --prefix=%{_localstatedir}/log/journal/ || : +%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then # tell journal to start logging on disk if directory didn't exist before systemctl --no-block restart systemd-journal-flush.service >/dev/null || : @@ -945,7 +928,7 @@ fi %if %{with resolved} %{_prefix}/lib/systemd/resolv.conf %endif -%{_prefix}/lib/systemd/fix-machines-subvol-for-rollbacks.sh +%{_prefix}/lib/systemd/scripts %dir %{_prefix}/lib/systemd/catalog %{_prefix}/lib/systemd/catalog/systemd.catalog %{_prefix}/lib/systemd/catalog/systemd.*.catalog @@ -1196,6 +1179,7 @@ fi %exclude %{_prefix}/lib/udev/rules.d/99-systemd.rules %{_prefix}/lib/udev/rules.d/*.rules %{_prefix}/lib/udev/hwdb.d/ +%{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ %ghost %{_sysconfdir}/udev/hwdb.bin From 3f0ebd0ca165beea1dbcc80e34c7bb0f4b5dff812cd0895ff2ef18e353915acc Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 29 Sep 2017 09:49:48 +0000 Subject: [PATCH 004/124] Accepting request 528802 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/528802 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=262 --- macros.systemd.upstream | 105 ------------------------ scripts-systemd-upgrade-from-pre-210.sh | 16 ++-- systemd-234.tar.xz | 4 +- systemd-mini.changes | 26 ++++++ systemd-mini.spec | 2 - systemd.changes | 26 ++++++ systemd.spec | 2 - 7 files changed, 65 insertions(+), 116 deletions(-) delete mode 100644 macros.systemd.upstream diff --git a/macros.systemd.upstream b/macros.systemd.upstream deleted file mode 100644 index 2ba0ff05..00000000 --- a/macros.systemd.upstream +++ /dev/null @@ -1,105 +0,0 @@ -# -*- Mode: rpm-spec; indent-tabs-mode: nil -*- */ -# -# This file is part of systemd. -# -# Copyright 2012 Lennart Poettering -# -# systemd is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as published by -# the Free Software Foundation; either version 2.1 of the License, or -# (at your option) any later version. -# -# systemd 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 -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public License -# along with systemd; If not, see . - -# RPM macros for packages installing systemd unit files - -%_unitdir @systemunitdir@ -%_userunitdir @userunitdir@ -%_presetdir @systempresetdir@ -%_udevhwdbdir @udevhwdbdir@ -%_udevrulesdir @udevrulesdir@ -%_journalcatalogdir @catalogdir@ -%_tmpfilesdir @tmpfilesdir@ -%_sysusersdir @sysusersdir@ -%_sysctldir @sysctldir@ -%_binfmtdir @binfmtdir@ - -%systemd_requires \ -Requires(post): systemd \ -Requires(preun): systemd \ -Requires(postun): systemd \ -%{nil} - -%systemd_post() \ -if [ $1 -eq 1 ] ; then \ - # Initial installation \ - systemctl --no-reload preset %{?*} >/dev/null 2>&1 || : \ -fi \ -%{nil} - -%systemd_user_post() %systemd_post --user --global %{?*} - -%systemd_preun() \ -if [ $1 -eq 0 ] ; then \ - # Package removal, not upgrade \ - systemctl --no-reload disable --now %{?*} > /dev/null 2>&1 || : \ -fi \ -%{nil} - -%systemd_user_preun() \ -if [ $1 -eq 0 ] ; then \ - # Package removal, not upgrade \ - systemctl --no-reload --user --global disable %{?*} > /dev/null 2>&1 || : \ -fi \ -%{nil} - -%systemd_postun() %{nil} - -%systemd_user_postun() %{nil} - -%systemd_postun_with_restart() \ -if [ $1 -ge 1 ] ; then \ - # Package upgrade, not uninstall \ - systemctl try-restart %{?*} >/dev/null 2>&1 || : \ -fi \ -%{nil} - -%systemd_user_postun_with_restart() %{nil} - -%udev_hwdb_update() \ -udevadm hwdb --update >/dev/null 2>&1 || : \ -%{nil} - -%udev_rules_update() \ -udevadm control --reload >/dev/null 2>&1 || : \ -%{nil} - -%journal_catalog_update() \ -journalctl --update-catalog >/dev/null 2>&1 || : \ -%{nil} - -%tmpfiles_create() \ -systemd-tmpfiles --create %{?*} >/dev/null 2>&1 || : \ -%{nil} - -%sysusers_create() \ -systemd-sysusers %{?*} >/dev/null 2>&1 || : \ -%{nil} - -%sysusers_create_inline() \ -echo %{?*} | systemd-sysusers - >/dev/null 2>&1 || : \ -%{nil} - -%sysctl_apply() \ -@rootlibexecdir@/systemd-sysctl %{?*} >/dev/null 2>&1 || : \ -%{nil} - -%binfmt_apply() \ -@rootlibexecdir@/systemd-binfmt %{?*} >/dev/null 2>&1 || : \ -%{nil} diff --git a/scripts-systemd-upgrade-from-pre-210.sh b/scripts-systemd-upgrade-from-pre-210.sh index b94a3985..24738567 100644 --- a/scripts-systemd-upgrade-from-pre-210.sh +++ b/scripts-systemd-upgrade-from-pre-210.sh @@ -8,12 +8,18 @@ # All hacks can potentially break the admin settings since they work # in /etc... -# Try to read default runlevel from the old inittab if it exists +# Try to read default runlevel from the old inittab if it exists. If +# it fails fallback to runlevel 3 which should still be better than +# the rescue shell. +# +# Note: /etc/inittab was part of the aaa_base package which can be +# upgraded before systemd is. Therefore this file is likely to be +# missing. if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then - runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab) - if [ -n "$runlevel" ] ; then - ln -sf /usr/lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target - fi + runlevel=$(sed -n -r "s/^id:([[:digit:]]):initdefault:/\1/p" /etc/inittab) + : ${runlevel:=3} + echo "Initializing default.target to runlevel${runlevel}.target" + ln -s /usr/lib/systemd/system/runlevel${runlevel}.target /etc/systemd/system/default.target fi # since v207 /etc/sysctl.conf is no longer parsed, however diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 07321344..e3b02184 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3e6748a9e064fa60601d85dd13b360142e3d54f31be45b17773d6be3abb9b05f -size 3350944 +oid sha256:6ee3972f4e9cb106edc944878ffd753b55e3318efad555bf06c8e66770e7605e +size 3351148 diff --git a/systemd-mini.changes b/systemd-mini.changes index cbbe1a27..e8f8c007 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Sep 26 10:14:22 UTC 2017 - fbui@suse.com + +- Import commit 9e0985dc330b1cf04bc44049962343bdf4ba851a + + 4fd7cd041 pam_logind: skip leading /dev/ from PAM_TTY field before passing it on + dd6312828 logind: make sure we don't process the same method call twice (#6583) + +------------------------------------------------------------------- +Tue Sep 26 09:27:12 UTC 2017 - fbui@suse.com + +- Update scripts-systemd-upgrade-from-pre-210.sh script + + - drop dependency on awk + - fallback to runlevel #3 if something goes wrong + + Note: I'm not sure how this is supposed to work as /etc/inittab is + likely to be missing in my understanding. Indeed this file is part + of the aaa_base package which might be upgraded before systemd is + installed... + +------------------------------------------------------------------- +Tue Sep 26 08:08:22 UTC 2017 - fbui@suse.com + +- Drop macros.systemd.upstream as it's not used + ------------------------------------------------------------------- Thu Sep 14 16:34:16 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index c63b0f9a..02ebdf99 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -128,7 +128,6 @@ Requires(post): findutils Requires(post): systemd-presets-branding Requires(post): pam-config >= 0.79-5 %endif -Requires(post): /usr/bin/awk %if 0%{?bootstrap} Conflicts: systemd @@ -147,7 +146,6 @@ Source2: systemd-user Source3: systemd-sysv-convert Source6: baselibs.conf Source7: libgcrypt.m4 -Source10: macros.systemd.upstream Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy diff --git a/systemd.changes b/systemd.changes index cbbe1a27..e8f8c007 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Sep 26 10:14:22 UTC 2017 - fbui@suse.com + +- Import commit 9e0985dc330b1cf04bc44049962343bdf4ba851a + + 4fd7cd041 pam_logind: skip leading /dev/ from PAM_TTY field before passing it on + dd6312828 logind: make sure we don't process the same method call twice (#6583) + +------------------------------------------------------------------- +Tue Sep 26 09:27:12 UTC 2017 - fbui@suse.com + +- Update scripts-systemd-upgrade-from-pre-210.sh script + + - drop dependency on awk + - fallback to runlevel #3 if something goes wrong + + Note: I'm not sure how this is supposed to work as /etc/inittab is + likely to be missing in my understanding. Indeed this file is part + of the aaa_base package which might be upgraded before systemd is + installed... + +------------------------------------------------------------------- +Tue Sep 26 08:08:22 UTC 2017 - fbui@suse.com + +- Drop macros.systemd.upstream as it's not used + ------------------------------------------------------------------- Thu Sep 14 16:34:16 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 97ac7b9b..304d2471 100644 --- a/systemd.spec +++ b/systemd.spec @@ -126,7 +126,6 @@ Requires(post): findutils Requires(post): systemd-presets-branding Requires(post): pam-config >= 0.79-5 %endif -Requires(post): /usr/bin/awk %if 0%{?bootstrap} Conflicts: systemd @@ -145,7 +144,6 @@ Source2: systemd-user Source3: systemd-sysv-convert Source6: baselibs.conf Source7: libgcrypt.m4 -Source10: macros.systemd.upstream Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy From e31b324c6fc467c999c3f6c9c87de8549e49113e51c5ac86057aa5f5c5824f49 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 10 Oct 2017 09:37:40 +0000 Subject: [PATCH 005/124] Accepting request 532104 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/532104 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=263 --- ...ce-Use-JobRunningTimeoutSec-for-devi.patch | 48 ------------------- systemd-234.tar.xz | 4 +- systemd-mini.changes | 31 ++++++++++++ systemd-mini.spec | 1 - systemd.changes | 31 ++++++++++++ systemd.spec | 1 - 6 files changed, 64 insertions(+), 52 deletions(-) delete mode 100644 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch diff --git a/0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch b/0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch deleted file mode 100644 index cc49aea0..00000000 --- a/0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 02a4361a931a210b547795a49d062e90d2462cbc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michal=20Koutn=C3=BD?= -Date: Wed, 23 Aug 2017 15:18:19 +0200 -Subject: [PATCH 1/1] Revert "core/device: Use JobRunningTimeoutSec= for device - units" - -This reverts commit d9732d78034cd01a75f2cda6ebaddb4c3a0929ea. - -This is not backwards compatible for outer callers that are used to set -JobTimeoutSec= for devices. The compatibility breaks if JobTimeoutSec= is -longer than default JobRunningTimeoutSec=90, especially JobTimeoutSec=infinity. - -[mkoutny: fixes bsc#1048605] -[fbui: as a consequence, reintroduces bsc#1004995] ---- - src/core/device.c | 2 +- - src/shared/generator.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/core/device.c b/src/core/device.c -index 434a6a9c5..89549f43b 100644 ---- a/src/core/device.c -+++ b/src/core/device.c -@@ -114,7 +114,7 @@ static void device_init(Unit *u) { - * indefinitely for plugged in devices, something which cannot - * happen for the other units since their operations time out - * anyway. */ -- u->job_running_timeout = u->manager->default_timeout_start_usec; -+ u->job_timeout = u->manager->default_timeout_start_usec; - - u->ignore_on_isolate = true; - } -diff --git a/src/shared/generator.c b/src/shared/generator.c -index 47be354ba..743bc88f6 100644 ---- a/src/shared/generator.c -+++ b/src/shared/generator.c -@@ -187,7 +187,7 @@ int generator_write_timeouts( - - return write_drop_in_format(dir, unit, 50, "device-timeout", - "# Automatically generated by %s\n\n" -- "[Unit]\nJobRunningTimeoutSec=%s", -+ "[Unit]\nJobTimeoutSec=%s", - program_invocation_short_name, timeout); - } - --- -2.13.1 - diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index e3b02184..4b8380f6 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ee3972f4e9cb106edc944878ffd753b55e3318efad555bf06c8e66770e7605e -size 3351148 +oid sha256:6fd8f4674008055ae6b3fb870e84fbd64f53c1edaf43c84d95d7a9b6b7bec00b +size 3351212 diff --git a/systemd-mini.changes b/systemd-mini.changes index e8f8c007..1515ef89 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Oct 6 07:44:38 UTC 2017 - fbui@suse.com + +- Damn forgot to drop 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch in + the spec file + +------------------------------------------------------------------- +Fri Oct 6 07:30:01 UTC 2017 - fbui@suse.com + +- Import commit 6dea894131d78b20b9e0482f75afa6ee4dec8627 + + 1cdd944b0 unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec= too (bsc#1004995) + + This make 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch + not needed anymore. + +------------------------------------------------------------------- +Thu Oct 5 12:24:35 UTC 2017 - fbui@suse.com + +- Import commit 93688f8e53b4e482a55a7d4aba2d927ddedebdde + + c53522be3 compat-rules: allow to specify the generation number through the kernel cmdline + +------------------------------------------------------------------- +Wed Oct 4 15:44:14 UTC 2017 - fbui@suse.com + +- Import commit c1e8af7d1e8b09c2878a5b17f513bfc41ae46dc6 + + 982754275 build-sys: make sure 61-persitent-storage-compat.rules is installed with meson + 9ac2e8b9b udev: proc_cmdline_get_key() FTW! (#6925) + ------------------------------------------------------------------- Tue Sep 26 10:14:22 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 02ebdf99..10c9941c 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -163,7 +163,6 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch -Patch2: 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch %description Systemd is a system and service manager, compatible with SysV and LSB diff --git a/systemd.changes b/systemd.changes index e8f8c007..1515ef89 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Oct 6 07:44:38 UTC 2017 - fbui@suse.com + +- Damn forgot to drop 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch in + the spec file + +------------------------------------------------------------------- +Fri Oct 6 07:30:01 UTC 2017 - fbui@suse.com + +- Import commit 6dea894131d78b20b9e0482f75afa6ee4dec8627 + + 1cdd944b0 unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec= too (bsc#1004995) + + This make 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch + not needed anymore. + +------------------------------------------------------------------- +Thu Oct 5 12:24:35 UTC 2017 - fbui@suse.com + +- Import commit 93688f8e53b4e482a55a7d4aba2d927ddedebdde + + c53522be3 compat-rules: allow to specify the generation number through the kernel cmdline + +------------------------------------------------------------------- +Wed Oct 4 15:44:14 UTC 2017 - fbui@suse.com + +- Import commit c1e8af7d1e8b09c2878a5b17f513bfc41ae46dc6 + + 982754275 build-sys: make sure 61-persitent-storage-compat.rules is installed with meson + 9ac2e8b9b udev: proc_cmdline_get_key() FTW! (#6925) + ------------------------------------------------------------------- Tue Sep 26 10:14:22 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 304d2471..d1e982e5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -161,7 +161,6 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch -Patch2: 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 677bbb9f2efa63406c036114bbbfd063241f78adf00435b36251a22f9ff0b07a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 28 Oct 2017 12:19:43 +0000 Subject: [PATCH 006/124] Accepting request 536877 from Base:System 1 OBS-URL: https://build.opensuse.org/request/show/536877 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=264 --- ...irstboot-add-vconsole-keymap-support.patch | 525 ++++++++++++++++++ systemd-234.tar.xz | 4 +- systemd-mini.changes | 16 + systemd-mini.spec | 1 + systemd.changes | 16 + systemd.spec | 1 + 6 files changed, 561 insertions(+), 2 deletions(-) create mode 100644 0001-systemd-firstboot-add-vconsole-keymap-support.patch diff --git a/0001-systemd-firstboot-add-vconsole-keymap-support.patch b/0001-systemd-firstboot-add-vconsole-keymap-support.patch new file mode 100644 index 00000000..415d86be --- /dev/null +++ b/0001-systemd-firstboot-add-vconsole-keymap-support.patch @@ -0,0 +1,525 @@ +From 349fd7b2fe35d2fd6c7ba6493d2e44ae93013804 Mon Sep 17 00:00:00 2001 +From: Thomas Blume +Date: Wed, 18 Oct 2017 12:30:03 +0200 +Subject: [PATCH 1/1] systemd-firstboot: add vconsole keymap support + +yast installer needs systemd-firstboot support for setting the keymap + +This is a temporary patch to be superseded when upstream commit is available, +see https://github.com/systemd/systemd/pull/7035 for the relevant PR. + +[tblume: fixes bsc#1046436] +--- + src/basic/locale-util.c | 95 +++++++++++++++++++++++++++++++++++ + src/basic/locale-util.h | 3 ++ + src/firstboot/firstboot.c | 117 ++++++++++++++++++++++++++++++++++++++++++-- + src/locale/localectl.c | 65 +++--------------------- + src/test/test-locale-util.c | 29 +++++++++++ + 5 files changed, 247 insertions(+), 62 deletions(-) + +diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c +index ada0a28cd..f3fa918b8 100644 +--- a/src/basic/locale-util.c ++++ b/src/basic/locale-util.c +@@ -20,6 +20,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -30,6 +31,7 @@ + #include + #include + ++#include "def.h" + #include "dirent-util.h" + #include "fd-util.h" + #include "hashmap.h" +@@ -270,6 +272,99 @@ out: + return (bool) cached_answer; + } + ++static thread_local Set *keymaps = NULL; ++ ++static int nftw_cb( ++ const char *fpath, ++ const struct stat *sb, ++ int tflag, ++ struct FTW *ftwbuf) { ++ ++ char *p, *e; ++ int r; ++ ++ if (tflag != FTW_F) ++ return 0; ++ ++ if (!endswith(fpath, ".map") && ++ !endswith(fpath, ".map.gz")) ++ return 0; ++ ++ p = strdup(basename(fpath)); ++ if (!p) ++ return FTW_STOP; ++ ++ e = endswith(p, ".map"); ++ if (e) ++ *e = 0; ++ ++ e = endswith(p, ".map.gz"); ++ if (e) ++ *e = 0; ++ ++ r = set_consume(keymaps, p); ++ if (r < 0 && r != -EEXIST) ++ return r; ++ ++ return 0; ++} ++ ++int get_keymaps(char ***ret) { ++ _cleanup_strv_free_ char **l = NULL; ++ const char *dir; ++ int r; ++ ++ keymaps = set_new(&string_hash_ops); ++ if (!keymaps) ++ return -ENOMEM; ++ ++ NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) { ++ r = nftw(dir, nftw_cb, 20, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL); ++ ++ if (r == FTW_STOP) ++ log_debug("Directory not found %s", dir); ++ else if (r < 0) ++ log_debug_errno(r, "Can't add keymap: %m"); ++ } ++ ++ l = set_get_strv(keymaps); ++ if (!l) { ++ set_free_free(keymaps); ++ return -ENOMEM; ++ } ++ ++ set_free(keymaps); ++ ++ if (strv_isempty(l)) ++ return -ENOENT; ++ ++ strv_sort(l); ++ ++ *ret = l; ++ l = NULL; ++ ++ return 0; ++} ++ ++bool keymap_is_valid(const char *name) { ++ ++ if (isempty(name)) ++ return false; ++ ++ if (strlen(name) >= 128) ++ return false; ++ ++ if (!utf8_is_valid(name)) ++ return false; ++ ++ if (!filename_is_valid(name)) ++ return false; ++ ++ if (!string_is_safe(name)) ++ return false; ++ ++ return true; ++} + + const char *special_glyph(SpecialGlyph code) { + +diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h +index 0630a034a..104864501 100644 +--- a/src/basic/locale-util.h ++++ b/src/basic/locale-util.h +@@ -71,3 +71,6 @@ const char *special_glyph(SpecialGlyph code) _const_; + + const char* locale_variable_to_string(LocaleVariable i) _const_; + LocaleVariable locale_variable_from_string(const char *s) _pure_; ++ ++int get_keymaps(char ***l); ++bool keymap_is_valid(const char *name); +diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c +index b3578d3e1..fd60ee518 100644 +--- a/src/firstboot/firstboot.c ++++ b/src/firstboot/firstboot.c +@@ -44,16 +44,19 @@ + + static char *arg_root = NULL; + static char *arg_locale = NULL; /* $LANG */ ++static char *arg_keymap = NULL; + static char *arg_locale_messages = NULL; /* $LC_MESSAGES */ + static char *arg_timezone = NULL; + static char *arg_hostname = NULL; + static sd_id128_t arg_machine_id = {}; + static char *arg_root_password = NULL; + static bool arg_prompt_locale = false; ++static bool arg_prompt_keymap = false; + static bool arg_prompt_timezone = false; + static bool arg_prompt_hostname = false; + static bool arg_prompt_root_password = false; + static bool arg_copy_locale = false; ++static bool arg_copy_keymap = false; + static bool arg_copy_timezone = false; + static bool arg_copy_root_password = false; + +@@ -285,6 +288,80 @@ static int process_locale(void) { + return 0; + } + ++static int prompt_keymap(void) { ++ _cleanup_strv_free_ char **kmaps = NULL; ++ int r; ++ ++ if (arg_keymap) ++ return 0; ++ ++ if (!arg_prompt_keymap) ++ return 0; ++ ++ r = get_keymaps(&kmaps); ++ if (r < 0) ++ return log_error_errno(r, "Cannot query keymap list: %m"); ++ ++ print_welcome(); ++ ++ printf("\nAvailable keymaps:\n\n"); ++ r = show_menu(kmaps, 3, 22, 60); ++ if (r < 0) ++ return r; ++ ++ putchar('\n'); ++ ++ r = prompt_loop("Please enter system keymap name or number", kmaps, keymap_is_valid, &arg_keymap); ++ if (r < 0) ++ return r; ++ ++ if (isempty(arg_keymap)) ++ return 0; ++ ++ return 0; ++} ++ ++static int process_keymap(void) { ++ const char *etc_vconsoleconf; ++ char **keymap; ++ int r; ++ ++ etc_vconsoleconf = prefix_roota(arg_root, "/etc/vconsole.conf"); ++ if (laccess(etc_vconsoleconf, F_OK) >= 0) ++ return 0; ++ ++ if (arg_copy_keymap && arg_root) { ++ ++ mkdir_parents(etc_vconsoleconf, 0755); ++ r = copy_file("/etc/vconsole.conf", etc_vconsoleconf, 0, 0644, 0, COPY_REFLINK); ++ if (r != -ENOENT) { ++ if (r < 0) ++ return log_error_errno(r, "Failed to copy %s: %m", etc_vconsoleconf); ++ ++ log_info("%s copied.", etc_vconsoleconf); ++ return 0; ++ } ++ } ++ ++ r = prompt_keymap(); ++ if (r < 0) ++ return r; ++ ++ if (!isempty(arg_keymap)) ++ keymap = STRV_MAKE(strjoina("KEYMAP=", arg_keymap)); ++ ++ if (!keymap) ++ return 0; ++ ++ mkdir_parents(etc_vconsoleconf, 0755); ++ r = write_env_file(etc_vconsoleconf, keymap); ++ if (r < 0) ++ return log_error_errno(r, "Failed to write %s: %m", etc_vconsoleconf); ++ ++ log_info("%s written.", etc_vconsoleconf); ++ return 0; ++} ++ + static int prompt_timezone(void) { + _cleanup_strv_free_ char **zones = NULL; + int r; +@@ -611,20 +688,23 @@ static void help(void) { + " --root=PATH Operate on an alternate filesystem root\n" + " --locale=LOCALE Set primary locale (LANG=)\n" + " --locale-messages=LOCALE Set message locale (LC_MESSAGES=)\n" ++ " --keymap=KEYMAP Set keymap\n" + " --timezone=TIMEZONE Set timezone\n" + " --hostname=NAME Set host name\n" + " --machine-ID=ID Set machine ID\n" + " --root-password=PASSWORD Set root password\n" + " --root-password-file=FILE Set root password from file\n" + " --prompt-locale Prompt the user for locale settings\n" ++ " --prompt-keymap Prompt the user for keymap settings\n" + " --prompt-timezone Prompt the user for timezone\n" + " --prompt-hostname Prompt the user for hostname\n" + " --prompt-root-password Prompt the user for root password\n" + " --prompt Prompt for all of the above\n" + " --copy-locale Copy locale from host\n" ++ " --copy-keymap Copy keymap from host\n" + " --copy-timezone Copy timezone from host\n" + " --copy-root-password Copy root password from host\n" +- " --copy Copy locale, timezone, root password\n" ++ " --copy Copy locale, keymap, timezone, root password\n" + " --setup-machine-id Generate a new random machine ID\n" + , program_invocation_short_name); + } +@@ -636,6 +716,7 @@ static int parse_argv(int argc, char *argv[]) { + ARG_ROOT, + ARG_LOCALE, + ARG_LOCALE_MESSAGES, ++ ARG_KEYMAP, + ARG_TIMEZONE, + ARG_HOSTNAME, + ARG_MACHINE_ID, +@@ -643,11 +724,13 @@ static int parse_argv(int argc, char *argv[]) { + ARG_ROOT_PASSWORD_FILE, + ARG_PROMPT, + ARG_PROMPT_LOCALE, ++ ARG_PROMPT_KEYMAP, + ARG_PROMPT_TIMEZONE, + ARG_PROMPT_HOSTNAME, + ARG_PROMPT_ROOT_PASSWORD, + ARG_COPY, + ARG_COPY_LOCALE, ++ ARG_COPY_KEYMAP, + ARG_COPY_TIMEZONE, + ARG_COPY_ROOT_PASSWORD, + ARG_SETUP_MACHINE_ID, +@@ -659,6 +742,7 @@ static int parse_argv(int argc, char *argv[]) { + { "root", required_argument, NULL, ARG_ROOT }, + { "locale", required_argument, NULL, ARG_LOCALE }, + { "locale-messages", required_argument, NULL, ARG_LOCALE_MESSAGES }, ++ { "keymap", required_argument, NULL, ARG_KEYMAP }, + { "timezone", required_argument, NULL, ARG_TIMEZONE }, + { "hostname", required_argument, NULL, ARG_HOSTNAME }, + { "machine-id", required_argument, NULL, ARG_MACHINE_ID }, +@@ -666,11 +750,13 @@ static int parse_argv(int argc, char *argv[]) { + { "root-password-file", required_argument, NULL, ARG_ROOT_PASSWORD_FILE }, + { "prompt", no_argument, NULL, ARG_PROMPT }, + { "prompt-locale", no_argument, NULL, ARG_PROMPT_LOCALE }, ++ { "prompt-keymap", no_argument, NULL, ARG_PROMPT_KEYMAP }, + { "prompt-timezone", no_argument, NULL, ARG_PROMPT_TIMEZONE }, + { "prompt-hostname", no_argument, NULL, ARG_PROMPT_HOSTNAME }, + { "prompt-root-password", no_argument, NULL, ARG_PROMPT_ROOT_PASSWORD }, + { "copy", no_argument, NULL, ARG_COPY }, + { "copy-locale", no_argument, NULL, ARG_COPY_LOCALE }, ++ { "copy-keymap", no_argument, NULL, ARG_COPY_KEYMAP }, + { "copy-timezone", no_argument, NULL, ARG_COPY_TIMEZONE }, + { "copy-root-password", no_argument, NULL, ARG_COPY_ROOT_PASSWORD }, + { "setup-machine-id", no_argument, NULL, ARG_SETUP_MACHINE_ID }, +@@ -723,6 +809,18 @@ static int parse_argv(int argc, char *argv[]) { + + break; + ++ case ARG_KEYMAP: ++ if (!keymap_is_valid(optarg)) { ++ log_error("Keymap %s is not valid.", optarg); ++ return -EINVAL; ++ } ++ ++ r = free_and_strdup(&arg_keymap, optarg); ++ if (r < 0) ++ return log_oom(); ++ ++ break; ++ + case ARG_TIMEZONE: + if (!timezone_is_valid(optarg)) { + log_error("Timezone %s is not valid.", optarg); +@@ -772,13 +870,17 @@ static int parse_argv(int argc, char *argv[]) { + break; + + case ARG_PROMPT: +- arg_prompt_locale = arg_prompt_timezone = arg_prompt_hostname = arg_prompt_root_password = true; ++ arg_prompt_locale = arg_prompt_keymap = arg_prompt_timezone = arg_prompt_hostname = arg_prompt_root_password = true; + break; + + case ARG_PROMPT_LOCALE: + arg_prompt_locale = true; + break; + ++ case ARG_PROMPT_KEYMAP: ++ arg_prompt_keymap = true; ++ break; ++ + case ARG_PROMPT_TIMEZONE: + arg_prompt_timezone = true; + break; +@@ -792,13 +894,17 @@ static int parse_argv(int argc, char *argv[]) { + break; + + case ARG_COPY: +- arg_copy_locale = arg_copy_timezone = arg_copy_root_password = true; ++ arg_copy_locale = arg_copy_keymap = arg_copy_timezone = arg_copy_root_password = true; + break; + + case ARG_COPY_LOCALE: + arg_copy_locale = true; + break; + ++ case ARG_COPY_KEYMAP: ++ arg_copy_keymap = true; ++ break; ++ + case ARG_COPY_TIMEZONE: + arg_copy_timezone = true; + break; +@@ -853,6 +959,10 @@ int main(int argc, char *argv[]) { + if (r < 0) + goto finish; + ++ r = process_keymap(); ++ if (r < 0) ++ goto finish; ++ + r = process_timezone(); + if (r < 0) + goto finish; +@@ -873,6 +983,7 @@ finish: + free(arg_root); + free(arg_locale); + free(arg_locale_messages); ++ free(arg_keymap); + free(arg_timezone); + free(arg_hostname); + string_erase(arg_root_password); +diff --git a/src/locale/localectl.c b/src/locale/localectl.c +index 0bd18a5c0..efdd73a8f 100644 +--- a/src/locale/localectl.c ++++ b/src/locale/localectl.c +@@ -273,68 +273,15 @@ static int set_vconsole_keymap(sd_bus *bus, char **args, unsigned n) { + return r; + } + +-static Set *keymaps = NULL; +- +-static int nftw_cb( +- const char *fpath, +- const struct stat *sb, +- int tflag, +- struct FTW *ftwbuf) { +- +- char *p, *e; +- int r; +- +- if (tflag != FTW_F) +- return 0; +- +- if (!endswith(fpath, ".map") && +- !endswith(fpath, ".map.gz")) +- return 0; +- +- p = strdup(basename(fpath)); +- if (!p) +- return log_oom(); +- +- e = endswith(p, ".map"); +- if (e) +- *e = 0; +- +- e = endswith(p, ".map.gz"); +- if (e) +- *e = 0; +- +- r = set_consume(keymaps, p); +- if (r < 0 && r != -EEXIST) +- return log_error_errno(r, "Can't add keymap: %m"); +- +- return 0; +-} +- + static int list_vconsole_keymaps(sd_bus *bus, char **args, unsigned n) { +- _cleanup_strv_free_ char **l = NULL; +- const char *dir; +- +- keymaps = set_new(&string_hash_ops); +- if (!keymaps) +- return log_oom(); +- +- NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) +- nftw(dir, nftw_cb, 20, FTW_MOUNT|FTW_PHYS); +- +- l = set_get_strv(keymaps); +- if (!l) { +- set_free_free(keymaps); +- return log_oom(); +- } +- +- set_free(keymaps); ++ _cleanup_strv_free_ char **l = NULL; ++ int r; + +- if (strv_isempty(l)) { +- log_error("Couldn't find any console keymaps."); +- return -ENOENT; +- } ++ assert(args); + +- strv_sort(l); ++ r = get_keymaps(&l); ++ if (r < 0) ++ return log_error_errno(r, "Failed to read list of keymaps: %m"); + + pager_open(arg_no_pager, false); + +diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c +index 427c698d1..e6876c82e 100644 +--- a/src/test/test-locale-util.c ++++ b/src/test/test-locale-util.c +@@ -50,9 +50,38 @@ static void test_locale_is_valid(void) { + assert_se(!locale_is_valid("\x01gar\x02 bage\x03")); + } + ++static void test_get_keymaps(void) { ++ _cleanup_strv_free_ char **kmaps = NULL; ++ char **p; ++ int r; ++ ++ r = get_keymaps(&kmaps); ++ assert_se(r >= 0); ++ assert_se(kmaps); ++ ++ STRV_FOREACH(p, kmaps) { ++ puts(*p); ++ assert_se(keymap_is_valid(*p)); ++ } ++} ++ ++static void test_keymap_is_valid(void) { ++ assert_se(keymap_is_valid("uk")); ++ assert_se(keymap_is_valid("de-nodeadkeys")); ++ assert_se(keymap_is_valid("ANSI-dvorak")); ++ assert_se(keymap_is_valid("unicode")); ++ ++ assert_se(!keymap_is_valid("")); ++ assert_se(!keymap_is_valid("/usr/bin/foo")); ++ assert_se(!keymap_is_valid("\x01gar\x02 bage\x03")); ++} ++ + int main(int argc, char *argv[]) { + test_get_locales(); + test_locale_is_valid(); + ++ test_get_keymaps(); ++ test_keymap_is_valid(); ++ + return 0; + } +-- +2.14.2 + diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 4b8380f6..55f00c98 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6fd8f4674008055ae6b3fb870e84fbd64f53c1edaf43c84d95d7a9b6b7bec00b -size 3351212 +oid sha256:42bf64dac8b5fa739b53c12c5cba492340b09ebdc78890cd429088158f95e285 +size 3352176 diff --git a/systemd-mini.changes b/systemd-mini.changes index 1515ef89..32a9bcd0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Oct 26 12:29:29 UTC 2017 - fbui@suse.com + +- Import commit e44237e76f6e133e62ff6c681d3fd06ebf12f66d + + a4e02c099 udev-rules: all values can contain escaped double quotes now (#6890) + d2b767a76 tmpfiles: remove old ICE and X11 sockets at boot (#6979) + +------------------------------------------------------------------- +Thu Oct 19 07:47:16 UTC 2017 - fbui@suse.com + +- Add 0001-systemd-firstboot-add-vconsole-keymap-support.patch (bsc#1046436) + + Temporary patch until it's been merged by upstream, see + https://github.com/systemd/systemd/pull/7035 + ------------------------------------------------------------------- Fri Oct 6 07:44:38 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 10c9941c..59abc06e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -163,6 +163,7 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch +Patch2: 0001-systemd-firstboot-add-vconsole-keymap-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB diff --git a/systemd.changes b/systemd.changes index 1515ef89..32a9bcd0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Oct 26 12:29:29 UTC 2017 - fbui@suse.com + +- Import commit e44237e76f6e133e62ff6c681d3fd06ebf12f66d + + a4e02c099 udev-rules: all values can contain escaped double quotes now (#6890) + d2b767a76 tmpfiles: remove old ICE and X11 sockets at boot (#6979) + +------------------------------------------------------------------- +Thu Oct 19 07:47:16 UTC 2017 - fbui@suse.com + +- Add 0001-systemd-firstboot-add-vconsole-keymap-support.patch (bsc#1046436) + + Temporary patch until it's been merged by upstream, see + https://github.com/systemd/systemd/pull/7035 + ------------------------------------------------------------------- Fri Oct 6 07:44:38 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index d1e982e5..493a9cc8 100644 --- a/systemd.spec +++ b/systemd.spec @@ -161,6 +161,7 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch +Patch2: 0001-systemd-firstboot-add-vconsole-keymap-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 52c26aaa4e1ee23aaab1950fcf3d638556d25957a14fcc1386778a41762c8200 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 30 Nov 2017 11:38:54 +0000 Subject: [PATCH 007/124] Accepting request 546399 from Base:System OBS-URL: https://build.opensuse.org/request/show/546399 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=265 --- ...-rid-of-scsi_id-when-generating-comp.patch | 77 +++ ...irstboot-add-vconsole-keymap-support.patch | 525 ------------------ systemd-234.tar.xz | 4 +- systemd-mini.changes | 55 ++ systemd-mini.spec | 8 +- systemd.changes | 55 ++ systemd.spec | 8 +- 7 files changed, 195 insertions(+), 537 deletions(-) create mode 100644 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch delete mode 100644 0001-systemd-firstboot-add-vconsole-keymap-support.patch diff --git a/0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch b/0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch new file mode 100644 index 00000000..16bb923c --- /dev/null +++ b/0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch @@ -0,0 +1,77 @@ +From 17be35b017aa39fad8aec98c81d4fade917096ec Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Mon, 27 Nov 2017 11:46:40 +0100 +Subject: [PATCH 1/1] compat-rules: get rid of scsi_id when generating compat + symlinks for NVMe devices + +The SCSI translation layer for NVMe devices has been removed from the +kernel since 4.13 (commit 3f7f25a910ed8988b2a87c1ca2bfee6b4fb83ac7), +so drop scsi_id in favor of the sysfs interface to generate the +name of the compat symlinks. + +Unfortunately we have to retrieve manually the model attribute +because %s{} strips trailing whitespaces otherwise. Indeed scsi_id +replaced them with a single '_' char due to the use of the +'--replace-whitespace' option. + +[tblume: fixes bsc#1051465] +--- + rules/61-persistent-storage-compat.rules | 34 ++++++++++++++++++++++++++++---- + 1 file changed, 30 insertions(+), 4 deletions(-) + +diff --git a/rules/61-persistent-storage-compat.rules b/rules/61-persistent-storage-compat.rules +index 82a38fac7..639dc1ee1 100644 +--- a/rules/61-persistent-storage-compat.rules ++++ b/rules/61-persistent-storage-compat.rules +@@ -16,6 +16,10 @@ + # doesn't rely on them and they could be disabled permanently. + # + # Thanks ! ++# ++# Note: this rules file can rely on all ID_* variables (set by ++# 60-persistent-storage.rule) but should not overwrite them, see ++# bsc#1048679 for details. + + ACTION=="remove", GOTO="persistent_storage_end" + +@@ -49,11 +53,33 @@ ENV{COMPAT_SYMLINK_GENERATION}!="?*", ENV{COMPAT_SYMLINK_GENERATION}="1" + # + ENV{COMPAT_SYMLINK_GENERATION}!="1", GOTO="generation_2" + +-# NVMe links were introduced first via a SUSE specific commit ++# NVMe symlinks were introduced first via a SUSE specific commit + # (bsc#944132) and upstream gained support later but of course using a +-# different scheme. Also note that ID_SERIAL is already used by the +-# contemporary rules, see bsc#1048679 for details. +-KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", PROGRAM="scsi_id --whitelisted --replace-whitespace -d $devnode", RESULT=="?*", ENV{ID_NVME_SERIAL_COMPAT}="$result" ++# different scheme. ++ ++# The SCSI translation layer for NVMe devices has been removed from ++# the kernel since 4.13, therefore we switched from scsi_id to the ++# sysfs interface to generate the name of the compat symlinks. ++# Unfortunately we can't use %s{model} to retrieve the model string ++# because udev strips any trailing whitespaces and some plateforms ++# (QEMU does that) might append such chars. In those cases scsi_id was ++# replacing them with a single trailing '_'. Therefore the currently ++# code retrieves the model string manually making sure to preserve all ++# characters so trailing whitespaces are still converted when the ++# symlink is created. ++ ++# KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", ATTRS{model}=="?*", ATTRS{serial}=="?*" \ ++# PROGRAM=="/bin/sh -c 'MODEL=\"%s{model}\"; echo \"${MODEL:0:16}\"'", ENV{ID_NVME_SERIAL_COMPAT}="SNVMe_%c%s{serial}" ++ ++KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", ATTRS{model}=="?*", ATTRS{serial}=="?*" \ ++ PROGRAM=="/bin/sh -c ' \ ++ cd /sys/%p; \ ++ while ! [ -f model ]; do \ ++ cd ..; \ ++ [ $(pwd) = %S ] && exit 1; \ ++ done; \ ++ cut -c 1-16 model'", ENV{ID_NVME_SERIAL_COMPAT}="SNVMe_%c%s{serial}" ++ + KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}=="?*", SYMLINK+="disk/by-id/nvme-$env{ID_NVME_SERIAL_COMPAT}" + KERNEL=="nvme*", ENV{DEVTYPE}=="partition", ENV{ID_NVME_SERIAL_COMPAT}=="?*", SYMLINK+="disk/by-id/nvme-$env{ID_NVME_SERIAL_COMPAT}-part%n" + +-- +2.14.2 + diff --git a/0001-systemd-firstboot-add-vconsole-keymap-support.patch b/0001-systemd-firstboot-add-vconsole-keymap-support.patch deleted file mode 100644 index 415d86be..00000000 --- a/0001-systemd-firstboot-add-vconsole-keymap-support.patch +++ /dev/null @@ -1,525 +0,0 @@ -From 349fd7b2fe35d2fd6c7ba6493d2e44ae93013804 Mon Sep 17 00:00:00 2001 -From: Thomas Blume -Date: Wed, 18 Oct 2017 12:30:03 +0200 -Subject: [PATCH 1/1] systemd-firstboot: add vconsole keymap support - -yast installer needs systemd-firstboot support for setting the keymap - -This is a temporary patch to be superseded when upstream commit is available, -see https://github.com/systemd/systemd/pull/7035 for the relevant PR. - -[tblume: fixes bsc#1046436] ---- - src/basic/locale-util.c | 95 +++++++++++++++++++++++++++++++++++ - src/basic/locale-util.h | 3 ++ - src/firstboot/firstboot.c | 117 ++++++++++++++++++++++++++++++++++++++++++-- - src/locale/localectl.c | 65 +++--------------------- - src/test/test-locale-util.c | 29 +++++++++++ - 5 files changed, 247 insertions(+), 62 deletions(-) - -diff --git a/src/basic/locale-util.c b/src/basic/locale-util.c -index ada0a28cd..f3fa918b8 100644 ---- a/src/basic/locale-util.c -+++ b/src/basic/locale-util.c -@@ -20,6 +20,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -30,6 +31,7 @@ - #include - #include - -+#include "def.h" - #include "dirent-util.h" - #include "fd-util.h" - #include "hashmap.h" -@@ -270,6 +272,99 @@ out: - return (bool) cached_answer; - } - -+static thread_local Set *keymaps = NULL; -+ -+static int nftw_cb( -+ const char *fpath, -+ const struct stat *sb, -+ int tflag, -+ struct FTW *ftwbuf) { -+ -+ char *p, *e; -+ int r; -+ -+ if (tflag != FTW_F) -+ return 0; -+ -+ if (!endswith(fpath, ".map") && -+ !endswith(fpath, ".map.gz")) -+ return 0; -+ -+ p = strdup(basename(fpath)); -+ if (!p) -+ return FTW_STOP; -+ -+ e = endswith(p, ".map"); -+ if (e) -+ *e = 0; -+ -+ e = endswith(p, ".map.gz"); -+ if (e) -+ *e = 0; -+ -+ r = set_consume(keymaps, p); -+ if (r < 0 && r != -EEXIST) -+ return r; -+ -+ return 0; -+} -+ -+int get_keymaps(char ***ret) { -+ _cleanup_strv_free_ char **l = NULL; -+ const char *dir; -+ int r; -+ -+ keymaps = set_new(&string_hash_ops); -+ if (!keymaps) -+ return -ENOMEM; -+ -+ NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) { -+ r = nftw(dir, nftw_cb, 20, FTW_MOUNT|FTW_PHYS|FTW_ACTIONRETVAL); -+ -+ if (r == FTW_STOP) -+ log_debug("Directory not found %s", dir); -+ else if (r < 0) -+ log_debug_errno(r, "Can't add keymap: %m"); -+ } -+ -+ l = set_get_strv(keymaps); -+ if (!l) { -+ set_free_free(keymaps); -+ return -ENOMEM; -+ } -+ -+ set_free(keymaps); -+ -+ if (strv_isempty(l)) -+ return -ENOENT; -+ -+ strv_sort(l); -+ -+ *ret = l; -+ l = NULL; -+ -+ return 0; -+} -+ -+bool keymap_is_valid(const char *name) { -+ -+ if (isempty(name)) -+ return false; -+ -+ if (strlen(name) >= 128) -+ return false; -+ -+ if (!utf8_is_valid(name)) -+ return false; -+ -+ if (!filename_is_valid(name)) -+ return false; -+ -+ if (!string_is_safe(name)) -+ return false; -+ -+ return true; -+} - - const char *special_glyph(SpecialGlyph code) { - -diff --git a/src/basic/locale-util.h b/src/basic/locale-util.h -index 0630a034a..104864501 100644 ---- a/src/basic/locale-util.h -+++ b/src/basic/locale-util.h -@@ -71,3 +71,6 @@ const char *special_glyph(SpecialGlyph code) _const_; - - const char* locale_variable_to_string(LocaleVariable i) _const_; - LocaleVariable locale_variable_from_string(const char *s) _pure_; -+ -+int get_keymaps(char ***l); -+bool keymap_is_valid(const char *name); -diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c -index b3578d3e1..fd60ee518 100644 ---- a/src/firstboot/firstboot.c -+++ b/src/firstboot/firstboot.c -@@ -44,16 +44,19 @@ - - static char *arg_root = NULL; - static char *arg_locale = NULL; /* $LANG */ -+static char *arg_keymap = NULL; - static char *arg_locale_messages = NULL; /* $LC_MESSAGES */ - static char *arg_timezone = NULL; - static char *arg_hostname = NULL; - static sd_id128_t arg_machine_id = {}; - static char *arg_root_password = NULL; - static bool arg_prompt_locale = false; -+static bool arg_prompt_keymap = false; - static bool arg_prompt_timezone = false; - static bool arg_prompt_hostname = false; - static bool arg_prompt_root_password = false; - static bool arg_copy_locale = false; -+static bool arg_copy_keymap = false; - static bool arg_copy_timezone = false; - static bool arg_copy_root_password = false; - -@@ -285,6 +288,80 @@ static int process_locale(void) { - return 0; - } - -+static int prompt_keymap(void) { -+ _cleanup_strv_free_ char **kmaps = NULL; -+ int r; -+ -+ if (arg_keymap) -+ return 0; -+ -+ if (!arg_prompt_keymap) -+ return 0; -+ -+ r = get_keymaps(&kmaps); -+ if (r < 0) -+ return log_error_errno(r, "Cannot query keymap list: %m"); -+ -+ print_welcome(); -+ -+ printf("\nAvailable keymaps:\n\n"); -+ r = show_menu(kmaps, 3, 22, 60); -+ if (r < 0) -+ return r; -+ -+ putchar('\n'); -+ -+ r = prompt_loop("Please enter system keymap name or number", kmaps, keymap_is_valid, &arg_keymap); -+ if (r < 0) -+ return r; -+ -+ if (isempty(arg_keymap)) -+ return 0; -+ -+ return 0; -+} -+ -+static int process_keymap(void) { -+ const char *etc_vconsoleconf; -+ char **keymap; -+ int r; -+ -+ etc_vconsoleconf = prefix_roota(arg_root, "/etc/vconsole.conf"); -+ if (laccess(etc_vconsoleconf, F_OK) >= 0) -+ return 0; -+ -+ if (arg_copy_keymap && arg_root) { -+ -+ mkdir_parents(etc_vconsoleconf, 0755); -+ r = copy_file("/etc/vconsole.conf", etc_vconsoleconf, 0, 0644, 0, COPY_REFLINK); -+ if (r != -ENOENT) { -+ if (r < 0) -+ return log_error_errno(r, "Failed to copy %s: %m", etc_vconsoleconf); -+ -+ log_info("%s copied.", etc_vconsoleconf); -+ return 0; -+ } -+ } -+ -+ r = prompt_keymap(); -+ if (r < 0) -+ return r; -+ -+ if (!isempty(arg_keymap)) -+ keymap = STRV_MAKE(strjoina("KEYMAP=", arg_keymap)); -+ -+ if (!keymap) -+ return 0; -+ -+ mkdir_parents(etc_vconsoleconf, 0755); -+ r = write_env_file(etc_vconsoleconf, keymap); -+ if (r < 0) -+ return log_error_errno(r, "Failed to write %s: %m", etc_vconsoleconf); -+ -+ log_info("%s written.", etc_vconsoleconf); -+ return 0; -+} -+ - static int prompt_timezone(void) { - _cleanup_strv_free_ char **zones = NULL; - int r; -@@ -611,20 +688,23 @@ static void help(void) { - " --root=PATH Operate on an alternate filesystem root\n" - " --locale=LOCALE Set primary locale (LANG=)\n" - " --locale-messages=LOCALE Set message locale (LC_MESSAGES=)\n" -+ " --keymap=KEYMAP Set keymap\n" - " --timezone=TIMEZONE Set timezone\n" - " --hostname=NAME Set host name\n" - " --machine-ID=ID Set machine ID\n" - " --root-password=PASSWORD Set root password\n" - " --root-password-file=FILE Set root password from file\n" - " --prompt-locale Prompt the user for locale settings\n" -+ " --prompt-keymap Prompt the user for keymap settings\n" - " --prompt-timezone Prompt the user for timezone\n" - " --prompt-hostname Prompt the user for hostname\n" - " --prompt-root-password Prompt the user for root password\n" - " --prompt Prompt for all of the above\n" - " --copy-locale Copy locale from host\n" -+ " --copy-keymap Copy keymap from host\n" - " --copy-timezone Copy timezone from host\n" - " --copy-root-password Copy root password from host\n" -- " --copy Copy locale, timezone, root password\n" -+ " --copy Copy locale, keymap, timezone, root password\n" - " --setup-machine-id Generate a new random machine ID\n" - , program_invocation_short_name); - } -@@ -636,6 +716,7 @@ static int parse_argv(int argc, char *argv[]) { - ARG_ROOT, - ARG_LOCALE, - ARG_LOCALE_MESSAGES, -+ ARG_KEYMAP, - ARG_TIMEZONE, - ARG_HOSTNAME, - ARG_MACHINE_ID, -@@ -643,11 +724,13 @@ static int parse_argv(int argc, char *argv[]) { - ARG_ROOT_PASSWORD_FILE, - ARG_PROMPT, - ARG_PROMPT_LOCALE, -+ ARG_PROMPT_KEYMAP, - ARG_PROMPT_TIMEZONE, - ARG_PROMPT_HOSTNAME, - ARG_PROMPT_ROOT_PASSWORD, - ARG_COPY, - ARG_COPY_LOCALE, -+ ARG_COPY_KEYMAP, - ARG_COPY_TIMEZONE, - ARG_COPY_ROOT_PASSWORD, - ARG_SETUP_MACHINE_ID, -@@ -659,6 +742,7 @@ static int parse_argv(int argc, char *argv[]) { - { "root", required_argument, NULL, ARG_ROOT }, - { "locale", required_argument, NULL, ARG_LOCALE }, - { "locale-messages", required_argument, NULL, ARG_LOCALE_MESSAGES }, -+ { "keymap", required_argument, NULL, ARG_KEYMAP }, - { "timezone", required_argument, NULL, ARG_TIMEZONE }, - { "hostname", required_argument, NULL, ARG_HOSTNAME }, - { "machine-id", required_argument, NULL, ARG_MACHINE_ID }, -@@ -666,11 +750,13 @@ static int parse_argv(int argc, char *argv[]) { - { "root-password-file", required_argument, NULL, ARG_ROOT_PASSWORD_FILE }, - { "prompt", no_argument, NULL, ARG_PROMPT }, - { "prompt-locale", no_argument, NULL, ARG_PROMPT_LOCALE }, -+ { "prompt-keymap", no_argument, NULL, ARG_PROMPT_KEYMAP }, - { "prompt-timezone", no_argument, NULL, ARG_PROMPT_TIMEZONE }, - { "prompt-hostname", no_argument, NULL, ARG_PROMPT_HOSTNAME }, - { "prompt-root-password", no_argument, NULL, ARG_PROMPT_ROOT_PASSWORD }, - { "copy", no_argument, NULL, ARG_COPY }, - { "copy-locale", no_argument, NULL, ARG_COPY_LOCALE }, -+ { "copy-keymap", no_argument, NULL, ARG_COPY_KEYMAP }, - { "copy-timezone", no_argument, NULL, ARG_COPY_TIMEZONE }, - { "copy-root-password", no_argument, NULL, ARG_COPY_ROOT_PASSWORD }, - { "setup-machine-id", no_argument, NULL, ARG_SETUP_MACHINE_ID }, -@@ -723,6 +809,18 @@ static int parse_argv(int argc, char *argv[]) { - - break; - -+ case ARG_KEYMAP: -+ if (!keymap_is_valid(optarg)) { -+ log_error("Keymap %s is not valid.", optarg); -+ return -EINVAL; -+ } -+ -+ r = free_and_strdup(&arg_keymap, optarg); -+ if (r < 0) -+ return log_oom(); -+ -+ break; -+ - case ARG_TIMEZONE: - if (!timezone_is_valid(optarg)) { - log_error("Timezone %s is not valid.", optarg); -@@ -772,13 +870,17 @@ static int parse_argv(int argc, char *argv[]) { - break; - - case ARG_PROMPT: -- arg_prompt_locale = arg_prompt_timezone = arg_prompt_hostname = arg_prompt_root_password = true; -+ arg_prompt_locale = arg_prompt_keymap = arg_prompt_timezone = arg_prompt_hostname = arg_prompt_root_password = true; - break; - - case ARG_PROMPT_LOCALE: - arg_prompt_locale = true; - break; - -+ case ARG_PROMPT_KEYMAP: -+ arg_prompt_keymap = true; -+ break; -+ - case ARG_PROMPT_TIMEZONE: - arg_prompt_timezone = true; - break; -@@ -792,13 +894,17 @@ static int parse_argv(int argc, char *argv[]) { - break; - - case ARG_COPY: -- arg_copy_locale = arg_copy_timezone = arg_copy_root_password = true; -+ arg_copy_locale = arg_copy_keymap = arg_copy_timezone = arg_copy_root_password = true; - break; - - case ARG_COPY_LOCALE: - arg_copy_locale = true; - break; - -+ case ARG_COPY_KEYMAP: -+ arg_copy_keymap = true; -+ break; -+ - case ARG_COPY_TIMEZONE: - arg_copy_timezone = true; - break; -@@ -853,6 +959,10 @@ int main(int argc, char *argv[]) { - if (r < 0) - goto finish; - -+ r = process_keymap(); -+ if (r < 0) -+ goto finish; -+ - r = process_timezone(); - if (r < 0) - goto finish; -@@ -873,6 +983,7 @@ finish: - free(arg_root); - free(arg_locale); - free(arg_locale_messages); -+ free(arg_keymap); - free(arg_timezone); - free(arg_hostname); - string_erase(arg_root_password); -diff --git a/src/locale/localectl.c b/src/locale/localectl.c -index 0bd18a5c0..efdd73a8f 100644 ---- a/src/locale/localectl.c -+++ b/src/locale/localectl.c -@@ -273,68 +273,15 @@ static int set_vconsole_keymap(sd_bus *bus, char **args, unsigned n) { - return r; - } - --static Set *keymaps = NULL; -- --static int nftw_cb( -- const char *fpath, -- const struct stat *sb, -- int tflag, -- struct FTW *ftwbuf) { -- -- char *p, *e; -- int r; -- -- if (tflag != FTW_F) -- return 0; -- -- if (!endswith(fpath, ".map") && -- !endswith(fpath, ".map.gz")) -- return 0; -- -- p = strdup(basename(fpath)); -- if (!p) -- return log_oom(); -- -- e = endswith(p, ".map"); -- if (e) -- *e = 0; -- -- e = endswith(p, ".map.gz"); -- if (e) -- *e = 0; -- -- r = set_consume(keymaps, p); -- if (r < 0 && r != -EEXIST) -- return log_error_errno(r, "Can't add keymap: %m"); -- -- return 0; --} -- - static int list_vconsole_keymaps(sd_bus *bus, char **args, unsigned n) { -- _cleanup_strv_free_ char **l = NULL; -- const char *dir; -- -- keymaps = set_new(&string_hash_ops); -- if (!keymaps) -- return log_oom(); -- -- NULSTR_FOREACH(dir, KBD_KEYMAP_DIRS) -- nftw(dir, nftw_cb, 20, FTW_MOUNT|FTW_PHYS); -- -- l = set_get_strv(keymaps); -- if (!l) { -- set_free_free(keymaps); -- return log_oom(); -- } -- -- set_free(keymaps); -+ _cleanup_strv_free_ char **l = NULL; -+ int r; - -- if (strv_isempty(l)) { -- log_error("Couldn't find any console keymaps."); -- return -ENOENT; -- } -+ assert(args); - -- strv_sort(l); -+ r = get_keymaps(&l); -+ if (r < 0) -+ return log_error_errno(r, "Failed to read list of keymaps: %m"); - - pager_open(arg_no_pager, false); - -diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c -index 427c698d1..e6876c82e 100644 ---- a/src/test/test-locale-util.c -+++ b/src/test/test-locale-util.c -@@ -50,9 +50,38 @@ static void test_locale_is_valid(void) { - assert_se(!locale_is_valid("\x01gar\x02 bage\x03")); - } - -+static void test_get_keymaps(void) { -+ _cleanup_strv_free_ char **kmaps = NULL; -+ char **p; -+ int r; -+ -+ r = get_keymaps(&kmaps); -+ assert_se(r >= 0); -+ assert_se(kmaps); -+ -+ STRV_FOREACH(p, kmaps) { -+ puts(*p); -+ assert_se(keymap_is_valid(*p)); -+ } -+} -+ -+static void test_keymap_is_valid(void) { -+ assert_se(keymap_is_valid("uk")); -+ assert_se(keymap_is_valid("de-nodeadkeys")); -+ assert_se(keymap_is_valid("ANSI-dvorak")); -+ assert_se(keymap_is_valid("unicode")); -+ -+ assert_se(!keymap_is_valid("")); -+ assert_se(!keymap_is_valid("/usr/bin/foo")); -+ assert_se(!keymap_is_valid("\x01gar\x02 bage\x03")); -+} -+ - int main(int argc, char *argv[]) { - test_get_locales(); - test_locale_is_valid(); - -+ test_get_keymaps(); -+ test_keymap_is_valid(); -+ - return 0; - } --- -2.14.2 - diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 55f00c98..37172a16 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:42bf64dac8b5fa739b53c12c5cba492340b09ebdc78890cd429088158f95e285 -size 3352176 +oid sha256:41f96893041fe93197c142ca64f51f882e6c5d4c50c774091e5ff4fc36a814e0 +size 3352496 diff --git a/systemd-mini.changes b/systemd-mini.changes index 32a9bcd0..5b3da895 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Wed Nov 29 10:11:54 UTC 2017 - fbui@suse.com + +- Import commit e30f1b10e276fb18db10ea2463fbd7146ae778f6 + + 63481b24b firstboot: do not write vconsole.conf when arg_keymap is empty (bsc#1070124) + +------------------------------------------------------------------- +Wed Nov 29 09:58:08 UTC 2017 - fbui@suse.com + +- Add 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch (bsc#1051465) + + This patch is not yet merged in the 'compats/udev-compat-symlinks' + branch: we asked to upstream if it would be possible to introduce a + new specifier that wouldn't strip trailing whitespaces , see + https://github.com/systemd/systemd/issues/7462 + + Also this allows to give the patch more testing before merging it in + the git repo. + +------------------------------------------------------------------- +Thu Nov 23 17:33:19 UTC 2017 - fbui@suse.com + +- Drop a useless rm(1) from the specfile + +------------------------------------------------------------------- +Thu Nov 23 09:59:46 CET 2017 - kukuk@suse.de + +- Remove requires for pwdutils, we don't need the shadow tools + anymore [bsc#1069150] + +------------------------------------------------------------------- +Fri Nov 17 08:59:50 UTC 2017 - fbui@suse.com + +- Import commit 4b9afa11f918796184e1264d618b4ff5d18e481b + + 22dcb1d04 tmpfiles: when /etc is not fully initialized, some specifiers are expected to be unresolvable (#6860) (bsc#1055664) + 216beb768 tmpfiles: Allow create symlink on directories (#6039) + baf85eb79 udev: net_setup_link: don't error out when we couldn't apply link config (#7328) + +- Remove stderr redirection to /dev/null when calling %tmpfiles_create + since it's not needed anymore due to commit 22dcb1d04. Indeed the + messages are no more emitted at LOG_WARN but LOG_NOTICE. + +------------------------------------------------------------------- +Mon Nov 13 11:06:09 UTC 2017 - fbui@suse.com + +- Import commit b9a41367b6c1164318443491cc3dae0e8208e15c + + 86804326f systemd-firstboot: add vconsole keymap support (#7035) (bsc#1046436) + 9b64225e9 resolved: fix loop on packets with pseudo dns types (bsc#1065276 CVE-2017-15908) + +- Drop 0001-systemd-firstboot-add-vconsole-keymap-support.patch since + it's been merged upstream and backported to SUSE/v234 (see above). + ------------------------------------------------------------------- Thu Oct 26 12:29:29 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 59abc06e..00f024d7 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -116,7 +116,6 @@ Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 -Requires: pwdutils Requires: systemd-presets-branding Requires: sysvinit-tools Requires: udev = %{version}-%{release} @@ -156,14 +155,14 @@ Source200: scripts-udev-convert-lib-udev-path.sh Source1065: udev-remount-tmpfs -# Patches listed in here are really special cases. Normally all +# Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the # SUSE git repository. But in very few cases, some stuff might be # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch -Patch2: 0001-systemd-firstboot-add-vconsole-keymap-support.patch +Patch2: 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -482,7 +481,6 @@ ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs -rm -rf %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -677,7 +675,7 @@ pam-config -a --systemd || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : %journal_catalog_update -%tmpfiles_create 2>/dev/null +%tmpfiles_create # Create default config in /etc at first install. # Later package updates should not overwrite these settings. diff --git a/systemd.changes b/systemd.changes index 32a9bcd0..5b3da895 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,58 @@ +------------------------------------------------------------------- +Wed Nov 29 10:11:54 UTC 2017 - fbui@suse.com + +- Import commit e30f1b10e276fb18db10ea2463fbd7146ae778f6 + + 63481b24b firstboot: do not write vconsole.conf when arg_keymap is empty (bsc#1070124) + +------------------------------------------------------------------- +Wed Nov 29 09:58:08 UTC 2017 - fbui@suse.com + +- Add 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch (bsc#1051465) + + This patch is not yet merged in the 'compats/udev-compat-symlinks' + branch: we asked to upstream if it would be possible to introduce a + new specifier that wouldn't strip trailing whitespaces , see + https://github.com/systemd/systemd/issues/7462 + + Also this allows to give the patch more testing before merging it in + the git repo. + +------------------------------------------------------------------- +Thu Nov 23 17:33:19 UTC 2017 - fbui@suse.com + +- Drop a useless rm(1) from the specfile + +------------------------------------------------------------------- +Thu Nov 23 09:59:46 CET 2017 - kukuk@suse.de + +- Remove requires for pwdutils, we don't need the shadow tools + anymore [bsc#1069150] + +------------------------------------------------------------------- +Fri Nov 17 08:59:50 UTC 2017 - fbui@suse.com + +- Import commit 4b9afa11f918796184e1264d618b4ff5d18e481b + + 22dcb1d04 tmpfiles: when /etc is not fully initialized, some specifiers are expected to be unresolvable (#6860) (bsc#1055664) + 216beb768 tmpfiles: Allow create symlink on directories (#6039) + baf85eb79 udev: net_setup_link: don't error out when we couldn't apply link config (#7328) + +- Remove stderr redirection to /dev/null when calling %tmpfiles_create + since it's not needed anymore due to commit 22dcb1d04. Indeed the + messages are no more emitted at LOG_WARN but LOG_NOTICE. + +------------------------------------------------------------------- +Mon Nov 13 11:06:09 UTC 2017 - fbui@suse.com + +- Import commit b9a41367b6c1164318443491cc3dae0e8208e15c + + 86804326f systemd-firstboot: add vconsole keymap support (#7035) (bsc#1046436) + 9b64225e9 resolved: fix loop on packets with pseudo dns types (bsc#1065276 CVE-2017-15908) + +- Drop 0001-systemd-firstboot-add-vconsole-keymap-support.patch since + it's been merged upstream and backported to SUSE/v234 (see above). + ------------------------------------------------------------------- Thu Oct 26 12:29:29 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 493a9cc8..2ffba83c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -114,7 +114,6 @@ Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 -Requires: pwdutils Requires: systemd-presets-branding Requires: sysvinit-tools Requires: udev = %{version}-%{release} @@ -154,14 +153,14 @@ Source200: scripts-udev-convert-lib-udev-path.sh Source1065: udev-remount-tmpfs -# Patches listed in here are really special cases. Normally all +# Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the # SUSE git repository. But in very few cases, some stuff might be # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch -Patch2: 0001-systemd-firstboot-add-vconsole-keymap-support.patch +Patch2: 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -480,7 +479,6 @@ ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs -rm -rf %{buildroot}%{_sysconfdir}/rpm mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -675,7 +673,7 @@ pam-config -a --systemd || : /usr/lib/systemd/systemd-random-seed save || : systemctl daemon-reexec || : %journal_catalog_update -%tmpfiles_create 2>/dev/null +%tmpfiles_create # Create default config in /etc at first install. # Later package updates should not overwrite these settings. From 0cbb91056c3fa5a62e1eb949416c2a0427bfb9ad8a8109ba620f8b74c23c28b9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Dec 2017 10:56:29 +0000 Subject: [PATCH 008/124] Accepting request 555848 from Base:System Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/555848 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=266 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 1 + systemd.changes | 5 +++++ systemd.spec | 1 + 4 files changed, 12 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 5b3da895..bc2907cb 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 4 07:53:34 UTC 2017 - pavlix@pavlix.net + +- Add missing /etc/systemd/network directory + ------------------------------------------------------------------- Wed Nov 29 10:11:54 UTC 2017 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 00f024d7..6e767915 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -982,6 +982,7 @@ fi %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user +%dir %{_sysconfdir}/systemd/network %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh diff --git a/systemd.changes b/systemd.changes index 5b3da895..bc2907cb 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 4 07:53:34 UTC 2017 - pavlix@pavlix.net + +- Add missing /etc/systemd/network directory + ------------------------------------------------------------------- Wed Nov 29 10:11:54 UTC 2017 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 2ffba83c..3edcacb1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -980,6 +980,7 @@ fi %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user +%dir %{_sysconfdir}/systemd/network %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh From d25fcc94c728c8921305759ea3650b1748b8571abc5eb665e7de8b82767779c0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 13 Jan 2018 20:34:41 +0000 Subject: [PATCH 009/124] Accepting request 563317 from Base:System OBS-URL: https://build.opensuse.org/request/show/563317 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=267 --- systemd-234.tar.xz | 4 ++-- systemd-mini.changes | 20 ++++++++++++++++++++ systemd-mini.spec | 2 +- systemd.changes | 20 ++++++++++++++++++++ systemd.spec | 2 +- 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 37172a16..39b59e1a 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:41f96893041fe93197c142ca64f51f882e6c5d4c50c774091e5ff4fc36a814e0 -size 3352496 +oid sha256:3b761b2045a378ccd840e3e95257adc1de122b6864706a3a521f86ceff7782fc +size 3353740 diff --git a/systemd-mini.changes b/systemd-mini.changes index bc2907cb..e8400dc3 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jan 10 11:04:21 UTC 2018 - fbui@suse.com + +- Import commit 82dbe8a2ae56649231111eaadd4c302a2d2175ee + + 8c7f0c449 service: Don't stop unneeded units needed by restarted service (bsc#1066156) + 869be64ce sysctl: use raw file descriptor in sysctl_write (#7753) + 0c2400810 sysctl: disable buffer while writing to /proc (bsc#1071558) + 9eb1f30b8 Use read_line() and LONG_LINE_MAX to read values configuration files. (bsc#1071558) + 4dbea654f def: add new constant LONG_LINE_MAX + 48f14cd71 fileio: add new helper call read_line() as bounded getline() replacement + 861e1a222 build-sys: udevadm should have LOG_REALM=LOG_REALM_UDEV + 8ed5cf3fb meson: libudev_core and udevadm should have LOG_REALM=LOG_REALM_UDEV (#7666) + a9f93f1d0 virt: use XENFEAT_dom0 to detect the hardware domain (#6442, #6662) (#7581) (bsc#1048510) + fe56abdf9 seccomp: arm64/x32 do not have _sysctl + c9194fe37 seccomp: arm64 does not have mmap2 + 31d9b3c32 fs-util: small tweak in chase_symlinks() + 9dd0bc7a3 meson: do not include man/meson.build if xsltproc not found + 7e29e2b07 analyze: replace --no-man with --man=no in the man page (bsc#1068251) + ------------------------------------------------------------------- Mon Dec 4 07:53:34 UTC 2017 - pavlix@pavlix.net diff --git a/systemd-mini.spec b/systemd-mini.spec index 6e767915..3376805e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed diff --git a/systemd.changes b/systemd.changes index bc2907cb..e8400dc3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Wed Jan 10 11:04:21 UTC 2018 - fbui@suse.com + +- Import commit 82dbe8a2ae56649231111eaadd4c302a2d2175ee + + 8c7f0c449 service: Don't stop unneeded units needed by restarted service (bsc#1066156) + 869be64ce sysctl: use raw file descriptor in sysctl_write (#7753) + 0c2400810 sysctl: disable buffer while writing to /proc (bsc#1071558) + 9eb1f30b8 Use read_line() and LONG_LINE_MAX to read values configuration files. (bsc#1071558) + 4dbea654f def: add new constant LONG_LINE_MAX + 48f14cd71 fileio: add new helper call read_line() as bounded getline() replacement + 861e1a222 build-sys: udevadm should have LOG_REALM=LOG_REALM_UDEV + 8ed5cf3fb meson: libudev_core and udevadm should have LOG_REALM=LOG_REALM_UDEV (#7666) + a9f93f1d0 virt: use XENFEAT_dom0 to detect the hardware domain (#6442, #6662) (#7581) (bsc#1048510) + fe56abdf9 seccomp: arm64/x32 do not have _sysctl + c9194fe37 seccomp: arm64 does not have mmap2 + 31d9b3c32 fs-util: small tweak in chase_symlinks() + 9dd0bc7a3 meson: do not include man/meson.build if xsltproc not found + 7e29e2b07 analyze: replace --no-man with --man=no in the man page (bsc#1068251) + ------------------------------------------------------------------- Mon Dec 4 07:53:34 UTC 2017 - pavlix@pavlix.net diff --git a/systemd.spec b/systemd.spec index 3edcacb1..f248d9a7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed From 7d3054477fdb121d16286dd829d7d95e2e88c1758058f4094838fb5b48df5845 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Jan 2018 20:43:54 +0000 Subject: [PATCH 010/124] Accepting request 566373 from Base:System OBS-URL: https://build.opensuse.org/request/show/566373 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=268 --- scripts-systemd-fix-machines-btrfs-subvol.sh | 12 +++++++++++ systemd-234.tar.xz | 4 ++-- systemd-mini.changes | 22 ++++++++++++++++++++ systemd.changes | 22 ++++++++++++++++++++ 4 files changed, 58 insertions(+), 2 deletions(-) diff --git a/scripts-systemd-fix-machines-btrfs-subvol.sh b/scripts-systemd-fix-machines-btrfs-subvol.sh index a1b0832e..6ff4f688 100644 --- a/scripts-systemd-fix-machines-btrfs-subvol.sh +++ b/scripts-systemd-fix-machines-btrfs-subvol.sh @@ -74,6 +74,18 @@ if mount --fake /var/lib/machines 2>/dev/null; then exit fi +# +# If there is already an entry in fstab for /var, it means that: +# +# - the system has a seperate /var subvolume (default from Feb 2018) +# - the system has a seperate /var partition +# +# In any case we should exit +# +if mount --fake /var 2>/dev/null; then + exit +fi + # # If something is already mounted don't try to fix anything, it's been # done manually by the sysadmin. diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 39b59e1a..ce8e2fb9 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3b761b2045a378ccd840e3e95257adc1de122b6864706a3a521f86ceff7782fc -size 3353740 +oid sha256:dfe3727ab7449e20a9534d6eeb531d7cf49a74c894c8bcf964df2cda034aeda8 +size 3353636 diff --git a/systemd-mini.changes b/systemd-mini.changes index e8400dc3..4bc688e0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 16 10:23:22 UTC 2018 - fbui@suse.com + +- Import commit cc94ce8513221061898c83f57862544b16021f0e + + aa3eba828 delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX + b1ea0173a delta: extend skip logic to work on full directory paths (prefix+suffix) (bsc#1070428) + 77c5065f9 delta: check if a prefix needs to be skipped only once + db32866d1 Fix parsing of features in detect_vm_xen_dom0 (#7890) (bsc#1048510) + 11d40461a sd-bus: use -- when passing arguments to ssh (#6706) + 1148d99f6 tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849) (bsc#1075179) + 3a95f69bf tmpfiles: downgrade warning about duplicate line + +------------------------------------------------------------------- +Fri Jan 12 12:27:52 UTC 2018 - rbrown@suse.com + +- Edit scripts-systemd-fix-machines-btrfs-subvol.sh + + We shouldn't be creating a /var/lib/machines subvolume if /var is + already a seperate partition or subvolume. /var/lib/machines will + already be excluded from snapper & similar tooling in this case. + ------------------------------------------------------------------- Wed Jan 10 11:04:21 UTC 2018 - fbui@suse.com diff --git a/systemd.changes b/systemd.changes index e8400dc3..4bc688e0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 16 10:23:22 UTC 2018 - fbui@suse.com + +- Import commit cc94ce8513221061898c83f57862544b16021f0e + + aa3eba828 delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX + b1ea0173a delta: extend skip logic to work on full directory paths (prefix+suffix) (bsc#1070428) + 77c5065f9 delta: check if a prefix needs to be skipped only once + db32866d1 Fix parsing of features in detect_vm_xen_dom0 (#7890) (bsc#1048510) + 11d40461a sd-bus: use -- when passing arguments to ssh (#6706) + 1148d99f6 tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849) (bsc#1075179) + 3a95f69bf tmpfiles: downgrade warning about duplicate line + +------------------------------------------------------------------- +Fri Jan 12 12:27:52 UTC 2018 - rbrown@suse.com + +- Edit scripts-systemd-fix-machines-btrfs-subvol.sh + + We shouldn't be creating a /var/lib/machines subvolume if /var is + already a seperate partition or subvolume. /var/lib/machines will + already be excluded from snapper & similar tooling in this case. + ------------------------------------------------------------------- Wed Jan 10 11:04:21 UTC 2018 - fbui@suse.com From 765c4c9e8a4986e590171d590700bcf4ba352a8de1a853419002835c4f44c431 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 30 Jan 2018 14:38:43 +0000 Subject: [PATCH 011/124] Accepting request 570497 from Base:System OBS-URL: https://build.opensuse.org/request/show/570497 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=269 --- suse-disable-tmpfs-for-tmp.service | 33 +++++++++++++ systemd-234.tar.xz | 4 +- systemd-mini.changes | 36 +++++++++++++++ systemd-mini.spec | 74 ++++++++++++++++-------------- systemd.changes | 36 +++++++++++++++ systemd.spec | 74 ++++++++++++++++-------------- 6 files changed, 185 insertions(+), 72 deletions(-) create mode 100644 suse-disable-tmpfs-for-tmp.service diff --git a/suse-disable-tmpfs-for-tmp.service b/suse-disable-tmpfs-for-tmp.service new file mode 100644 index 00000000..df598082 --- /dev/null +++ b/suse-disable-tmpfs-for-tmp.service @@ -0,0 +1,33 @@ +# +# By default, /tmp doesn't use tmpfs on SUSE distros. +# +# This service is either run automatically during the firstboot (i.e. +# only once) of the system. +# +# Or it can also be (manually) started during systemd update (%post) +# only and only if tmp.mount wasn't already installed by the admin in +# /usr/lib during %pre. In this case tmp.mount should also masked. +# +# In any cases this service will never mask tmp.mount if the service +# has been created by either the admin or fstab-generator. +# +[Unit] +Description=Mask tmp.mount by default on SUSE systems +DefaultDependencies=no +Conflicts=shutdown.target +After=systemd-remount-fs.service +Before=tmp.mount +ConditionPathIsReadWrite=/etc +ConditionPathExists=!/usr/lib/systemd/system/.disable-tmpfs-for-tmp~done + +[Service] +Type=oneshot +RemainAfterExit=yes +ExecStart=/bin/sh -c ' \ + case "$(systemctl show -pFragmentPath tmp.mount)" in \ + FragmentPath=/usr/lib/systemd/system/tmp.mount) \ + systemctl mask --now tmp.mount ;; \ + FragmentPath=/usr/share/systemd/tmp.mount) \ + ln -sf /usr/lib/systemd/system/tmp.mount /etc/systemd/system/ ;; \ + esac' +ExecStartPost=/usr/bin/touch /usr/lib/systemd/system/.disable-tmpfs-for-tmp~done diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index ce8e2fb9..6cf24ef6 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfe3727ab7449e20a9534d6eeb531d7cf49a74c894c8bcf964df2cda034aeda8 -size 3353636 +oid sha256:3092b5ba37ed35a9fc7dd0f9554a8a047d60bbff45c72fb991adabfc566efde3 +size 3353980 diff --git a/systemd-mini.changes b/systemd-mini.changes index 4bc688e0..17ec22fe 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Jan 29 09:52:50 UTC 2018 - fbui@suse.com + +- Do not optionally remove /usr/lib/systemd/system/tmp.mnt anymore (bsc#1071224) + + This was done to make sure that tmpfs wouldn't be used for /tmp by + defaut in case the dir layout created by the installer did not + create a customized tmp.mount. + + But it had the bad side effect to break "rpm -V systemd" and updates + of systemd via delta-RPMs. + + Now instead of removing tmp.mount unit file, we mask it (still only + if no other tmp.mount would override the default one). It's the + official way to disable tmpfs on /tmp after all. + + Since we cannot rely on the presence of fstab during package + installations, we introduced a service which is run once on the + first boot and which figures out if tmpfs would be used. If so it + masks the unit. + + We also handle the upgrade path and make sure to preserve admin's + settings (if any). + + Another advantage of this is that we will only need to remove the + introduced service the day when tmpfs will be the default for SUSE + distros. + +------------------------------------------------------------------- +Fri Jan 26 14:40:38 UTC 2018 - fbui@suse.com + +- Import commit 83067827cc891ddc90def200fdbe725917ec9fa3 + + 3d60486f7 core/timer: Prevent timer looping when unit cannot start (bsc#1068588) + 460bd0cd6 Revert "handle SYSTEMCTL_OPTIONS environment variable" (fate#323393) + ------------------------------------------------------------------- Tue Jan 16 10:23:22 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 3376805e..72d027ef 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -148,6 +148,7 @@ Source7: libgcrypt.m4 Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy +Source15: suse-disable-tmpfs-for-tmp.service Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh @@ -513,11 +514,10 @@ rm -f %{buildroot}/etc/systemd/system/default.target # customized for openSUSE distros. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ -# We keep a copy of tmp.mount because it may be removed if not used -# (see %post): we want to be sure tmpfs won't be used for /tmp by -# default on Suse distros. -rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount -cp %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount %{buildroot}/%{_datadir}/systemd/ +# Install the service which will disable/mask tmpfs for /tmp (if +# needed) on first boot. +install -m0644 -D %{S:15} %{buildroot}/%{_prefix}/lib/systemd/system/suse-disable-tmpfs-for-tmp.service +ln -s ../suse-disable-tmpfs-for-tmp.service %{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/ # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path @@ -648,12 +648,19 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map %find_lang systemd +# Build of installation images uses a hard coded list of packages with +# a %pre that needs to be run during the build. systemd is one of them +# so keep the section even if it's empty. %pre -# Build of installation images uses an hard coded list of some -# packages with a %pre that needs to be run during the -# build. Unfortunately, systemd in one of them. To make thing simpler -# we use a %pre section even if it is not needed. -exit 0 +if [ $1 -gt 1 ] ; then + # Check if tmp.mount has been restored by either the admin or + # was added at package installation. In both cases do nothing + # and prevent the service to be executed during %post for the + # former case. + if test -e %{_unitdir}/tmp.mount; then + touch %{_unitdir}/.disable-tmpfs-for-tmp~done + fi +fi %post # Make /etc/machine-id an empty file during package installation. On @@ -695,16 +702,6 @@ if [ $1 -eq 1 ]; then %endif fi >/dev/null -# Keep tmp.mount if it's been enabled explicitly by the user otherwise -# make sure it wont be activated since it's the default for Suse -# distros. This unit can be pulled (implicitely) in various ways -# (private /tmp, etc..) and it's required by the basic.target -# explicitly since v220. -case $(systemctl is-enabled tmp.mount 2>/dev/null) in -enabled) ;; -*) rm -f %{_prefix}/lib/systemd/system/tmp.mount -esac - # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have # been created by the affected versions of systemd (bsc#1020601). @@ -720,23 +717,30 @@ done # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -# Convert /var/lib/machines subvolume to make it suitable for -# rollbacks, if needed. See bsc#992573. The installer has been fixed -# to create it at installation time. -# -# The convertion might only be problematic for openSUSE distros -# (TW/Factory) where previous versions had already created the -# subvolume at the wrong place (via tmpfiles for example) and user -# started to populate and use it. In this case we'll let the user fix -# it manually. -# -# For SLE12 this subvolume was only introduced during the upgrade from -# v210 to v228 when we added this workaround. Note that the subvolume -# is still created at the wrong place due to the call to -# tmpfiles_create macro previously however it's empty so there -# shouldn't be any issues. if [ $1 -gt 1 ]; then + # Convert /var/lib/machines subvolume to make it suitable for + # rollbacks, if needed. See bsc#992573. The installer has been fixed + # to create it at installation time. + # + # The convertion might only be problematic for openSUSE distros + # (TW/Factory) where previous versions had already created the + # subvolume at the wrong place (via tmpfiles for example) and user + # started to populate and use it. In this case we'll let the user fix + # it manually. + # + # For SLE12 this subvolume was only introduced during the upgrade from + # v210 to v228 when we added this workaround. Note that the subvolume + # is still created at the wrong place due to the call to + # tmpfiles_create macro previously however it's empty so there + # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : + + # Should we mask tmpfs ? If tmp.mount was already installed in + # /usr/lib then this is a nop as sysadmin restored the unit + # most likely to use tmpfs (see %pre) otherwise mask the mount + # unit unless it's overriden by a tmp.mount unit installed + # either by sysadmin or fstab-generator. + systemctl start suse-disable-tmpfs-for-tmp.service || : fi %postun diff --git a/systemd.changes b/systemd.changes index 4bc688e0..17ec22fe 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Jan 29 09:52:50 UTC 2018 - fbui@suse.com + +- Do not optionally remove /usr/lib/systemd/system/tmp.mnt anymore (bsc#1071224) + + This was done to make sure that tmpfs wouldn't be used for /tmp by + defaut in case the dir layout created by the installer did not + create a customized tmp.mount. + + But it had the bad side effect to break "rpm -V systemd" and updates + of systemd via delta-RPMs. + + Now instead of removing tmp.mount unit file, we mask it (still only + if no other tmp.mount would override the default one). It's the + official way to disable tmpfs on /tmp after all. + + Since we cannot rely on the presence of fstab during package + installations, we introduced a service which is run once on the + first boot and which figures out if tmpfs would be used. If so it + masks the unit. + + We also handle the upgrade path and make sure to preserve admin's + settings (if any). + + Another advantage of this is that we will only need to remove the + introduced service the day when tmpfs will be the default for SUSE + distros. + +------------------------------------------------------------------- +Fri Jan 26 14:40:38 UTC 2018 - fbui@suse.com + +- Import commit 83067827cc891ddc90def200fdbe725917ec9fa3 + + 3d60486f7 core/timer: Prevent timer looping when unit cannot start (bsc#1068588) + 460bd0cd6 Revert "handle SYSTEMCTL_OPTIONS environment variable" (fate#323393) + ------------------------------------------------------------------- Tue Jan 16 10:23:22 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index f248d9a7..b889f423 100644 --- a/systemd.spec +++ b/systemd.spec @@ -146,6 +146,7 @@ Source7: libgcrypt.m4 Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy +Source15: suse-disable-tmpfs-for-tmp.service Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh @@ -511,11 +512,10 @@ rm -f %{buildroot}/etc/systemd/system/default.target # customized for openSUSE distros. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ -# We keep a copy of tmp.mount because it may be removed if not used -# (see %post): we want to be sure tmpfs won't be used for /tmp by -# default on Suse distros. -rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount -cp %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount %{buildroot}/%{_datadir}/systemd/ +# Install the service which will disable/mask tmpfs for /tmp (if +# needed) on first boot. +install -m0644 -D %{S:15} %{buildroot}/%{_prefix}/lib/systemd/system/suse-disable-tmpfs-for-tmp.service +ln -s ../suse-disable-tmpfs-for-tmp.service %{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/ # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path @@ -646,12 +646,19 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map %find_lang systemd +# Build of installation images uses a hard coded list of packages with +# a %pre that needs to be run during the build. systemd is one of them +# so keep the section even if it's empty. %pre -# Build of installation images uses an hard coded list of some -# packages with a %pre that needs to be run during the -# build. Unfortunately, systemd in one of them. To make thing simpler -# we use a %pre section even if it is not needed. -exit 0 +if [ $1 -gt 1 ] ; then + # Check if tmp.mount has been restored by either the admin or + # was added at package installation. In both cases do nothing + # and prevent the service to be executed during %post for the + # former case. + if test -e %{_unitdir}/tmp.mount; then + touch %{_unitdir}/.disable-tmpfs-for-tmp~done + fi +fi %post # Make /etc/machine-id an empty file during package installation. On @@ -693,16 +700,6 @@ if [ $1 -eq 1 ]; then %endif fi >/dev/null -# Keep tmp.mount if it's been enabled explicitly by the user otherwise -# make sure it wont be activated since it's the default for Suse -# distros. This unit can be pulled (implicitely) in various ways -# (private /tmp, etc..) and it's required by the basic.target -# explicitly since v220. -case $(systemctl is-enabled tmp.mount 2>/dev/null) in -enabled) ;; -*) rm -f %{_prefix}/lib/systemd/system/tmp.mount -esac - # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have # been created by the affected versions of systemd (bsc#1020601). @@ -718,23 +715,30 @@ done # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -# Convert /var/lib/machines subvolume to make it suitable for -# rollbacks, if needed. See bsc#992573. The installer has been fixed -# to create it at installation time. -# -# The convertion might only be problematic for openSUSE distros -# (TW/Factory) where previous versions had already created the -# subvolume at the wrong place (via tmpfiles for example) and user -# started to populate and use it. In this case we'll let the user fix -# it manually. -# -# For SLE12 this subvolume was only introduced during the upgrade from -# v210 to v228 when we added this workaround. Note that the subvolume -# is still created at the wrong place due to the call to -# tmpfiles_create macro previously however it's empty so there -# shouldn't be any issues. if [ $1 -gt 1 ]; then + # Convert /var/lib/machines subvolume to make it suitable for + # rollbacks, if needed. See bsc#992573. The installer has been fixed + # to create it at installation time. + # + # The convertion might only be problematic for openSUSE distros + # (TW/Factory) where previous versions had already created the + # subvolume at the wrong place (via tmpfiles for example) and user + # started to populate and use it. In this case we'll let the user fix + # it manually. + # + # For SLE12 this subvolume was only introduced during the upgrade from + # v210 to v228 when we added this workaround. Note that the subvolume + # is still created at the wrong place due to the call to + # tmpfiles_create macro previously however it's empty so there + # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : + + # Should we mask tmpfs ? If tmp.mount was already installed in + # /usr/lib then this is a nop as sysadmin restored the unit + # most likely to use tmpfs (see %pre) otherwise mask the mount + # unit unless it's overriden by a tmp.mount unit installed + # either by sysadmin or fstab-generator. + systemctl start suse-disable-tmpfs-for-tmp.service || : fi %postun From b5decf8c1333ca65ae8993fad7dbed20c8d821848bbaf49c0d5c0081cef9e26e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 5 Feb 2018 09:50:36 +0000 Subject: [PATCH 012/124] Accepting request 571964 from Base:System OBS-URL: https://build.opensuse.org/request/show/571964 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=270 --- ...-rid-of-scsi_id-when-generating-comp.patch | 77 ------------------- ...sion-keyring-per-system-sevice-entir.patch | 31 -------- systemd-234.tar.xz | 4 +- systemd-mini.changes | 39 ++++++++++ systemd-mini.spec | 6 +- systemd.changes | 39 ++++++++++ systemd.spec | 6 +- 7 files changed, 86 insertions(+), 116 deletions(-) delete mode 100644 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch delete mode 100644 0001-core-disable-session-keyring-per-system-sevice-entir.patch diff --git a/0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch b/0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch deleted file mode 100644 index 16bb923c..00000000 --- a/0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 17be35b017aa39fad8aec98c81d4fade917096ec Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Mon, 27 Nov 2017 11:46:40 +0100 -Subject: [PATCH 1/1] compat-rules: get rid of scsi_id when generating compat - symlinks for NVMe devices - -The SCSI translation layer for NVMe devices has been removed from the -kernel since 4.13 (commit 3f7f25a910ed8988b2a87c1ca2bfee6b4fb83ac7), -so drop scsi_id in favor of the sysfs interface to generate the -name of the compat symlinks. - -Unfortunately we have to retrieve manually the model attribute -because %s{} strips trailing whitespaces otherwise. Indeed scsi_id -replaced them with a single '_' char due to the use of the -'--replace-whitespace' option. - -[tblume: fixes bsc#1051465] ---- - rules/61-persistent-storage-compat.rules | 34 ++++++++++++++++++++++++++++---- - 1 file changed, 30 insertions(+), 4 deletions(-) - -diff --git a/rules/61-persistent-storage-compat.rules b/rules/61-persistent-storage-compat.rules -index 82a38fac7..639dc1ee1 100644 ---- a/rules/61-persistent-storage-compat.rules -+++ b/rules/61-persistent-storage-compat.rules -@@ -16,6 +16,10 @@ - # doesn't rely on them and they could be disabled permanently. - # - # Thanks ! -+# -+# Note: this rules file can rely on all ID_* variables (set by -+# 60-persistent-storage.rule) but should not overwrite them, see -+# bsc#1048679 for details. - - ACTION=="remove", GOTO="persistent_storage_end" - -@@ -49,11 +53,33 @@ ENV{COMPAT_SYMLINK_GENERATION}!="?*", ENV{COMPAT_SYMLINK_GENERATION}="1" - # - ENV{COMPAT_SYMLINK_GENERATION}!="1", GOTO="generation_2" - --# NVMe links were introduced first via a SUSE specific commit -+# NVMe symlinks were introduced first via a SUSE specific commit - # (bsc#944132) and upstream gained support later but of course using a --# different scheme. Also note that ID_SERIAL is already used by the --# contemporary rules, see bsc#1048679 for details. --KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", PROGRAM="scsi_id --whitelisted --replace-whitespace -d $devnode", RESULT=="?*", ENV{ID_NVME_SERIAL_COMPAT}="$result" -+# different scheme. -+ -+# The SCSI translation layer for NVMe devices has been removed from -+# the kernel since 4.13, therefore we switched from scsi_id to the -+# sysfs interface to generate the name of the compat symlinks. -+# Unfortunately we can't use %s{model} to retrieve the model string -+# because udev strips any trailing whitespaces and some plateforms -+# (QEMU does that) might append such chars. In those cases scsi_id was -+# replacing them with a single trailing '_'. Therefore the currently -+# code retrieves the model string manually making sure to preserve all -+# characters so trailing whitespaces are still converted when the -+# symlink is created. -+ -+# KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", ATTRS{model}=="?*", ATTRS{serial}=="?*" \ -+# PROGRAM=="/bin/sh -c 'MODEL=\"%s{model}\"; echo \"${MODEL:0:16}\"'", ENV{ID_NVME_SERIAL_COMPAT}="SNVMe_%c%s{serial}" -+ -+KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", ATTRS{model}=="?*", ATTRS{serial}=="?*" \ -+ PROGRAM=="/bin/sh -c ' \ -+ cd /sys/%p; \ -+ while ! [ -f model ]; do \ -+ cd ..; \ -+ [ $(pwd) = %S ] && exit 1; \ -+ done; \ -+ cut -c 1-16 model'", ENV{ID_NVME_SERIAL_COMPAT}="SNVMe_%c%s{serial}" -+ - KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}=="?*", SYMLINK+="disk/by-id/nvme-$env{ID_NVME_SERIAL_COMPAT}" - KERNEL=="nvme*", ENV{DEVTYPE}=="partition", ENV{ID_NVME_SERIAL_COMPAT}=="?*", SYMLINK+="disk/by-id/nvme-$env{ID_NVME_SERIAL_COMPAT}-part%n" - --- -2.14.2 - diff --git a/0001-core-disable-session-keyring-per-system-sevice-entir.patch b/0001-core-disable-session-keyring-per-system-sevice-entir.patch deleted file mode 100644 index 62580997..00000000 --- a/0001-core-disable-session-keyring-per-system-sevice-entir.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 30cceac444bcc67896611154b051669225abaa93 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 6 Jul 2017 15:48:10 +0200 -Subject: [PATCH] core: disable session keyring per system sevice entirely - for now - -It seems that this stuff needs more thoughts... - -See also: -https://github.com/systemd/systemd/pull/6286 - -[fbui: fixes bnc#1045886] ---- - src/core/service.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/core/service.c b/src/core/service.c -index 74054887b..874f2be93 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -1341,7 +1341,6 @@ static int service_spawn( - } else - path = UNIT(s)->cgroup_path; - -- exec_params.flags |= MANAGER_IS_SYSTEM(UNIT(s)->manager) ? EXEC_NEW_KEYRING : 0; - exec_params.argv = c->argv; - exec_params.environment = final_env; - exec_params.fds = fds; --- -2.13.1 - diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 6cf24ef6..75985aaa 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3092b5ba37ed35a9fc7dd0f9554a8a047d60bbff45c72fb991adabfc566efde3 -size 3353980 +oid sha256:99fb2aa924449a90db2431507c82cb778a7563e22de08f1ac8e9e77c30c06fc3 +size 3353804 diff --git a/systemd-mini.changes b/systemd-mini.changes index 17ec22fe..0fd8a7e7 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Fri Feb 2 08:56:04 UTC 2018 - fbui@suse.com + +- Import commit 8ec9f58d334c76e736957812d9e57151502a6f63 + + 07c6ee3eb compat-rules: get rid of scsi_id when generating compat symlinks for NVMe devices (bsc#1051465) + 261a4ef38 compat-rules: generate compat by-id symlinks with 'nvme' prefix missing (bsc#1063249) + +------------------------------------------------------------------- +Fri Feb 2 08:44:57 UTC 2018 - fbui@suse.com + +- Drop 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch + + It's been imported in branch "compats/udev-compat-symlinks" which + has been merged in branch "openSUSE-Factory" in its turn. + +------------------------------------------------------------------- +Fri Feb 2 08:17:41 UTC 2018 - fbui@suse.com + +- Import commit c516268845b0fd0683cef2e491b84077371e8f01 + + 37da1facb core: disable session keyring per system sevice entirely for now (bnc#1045886) + 8a1ae0449 strv: fix buffer size calculation in strv_join_quoted() + +------------------------------------------------------------------- +Fri Feb 2 08:14:03 UTC 2018 - fbui@suse.com + +- Drop 0001-core-disable-session-keyring-per-system-sevice-entir.patch + + It's been merged in branch "SUSE/v234". + +------------------------------------------------------------------- +Wed Jan 31 15:14:55 UTC 2018 - fbui@suse.com + +- Import commit 2087a80d56bb6f8c7fb74a19172259bc9d9af866 + + 2b8971b8a tmpfiles: refuse to chown()/chmod() files which are hardlinked, unless protected_hardlinks sysctl is on (bsc#1077925 CVE-2017-18078) + 8c2bcac25 tmpfiles: change ownership of symlinks too + ------------------------------------------------------------------- Mon Jan 29 09:52:50 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 72d027ef..7b940175 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -162,8 +162,8 @@ Source1065: udev-remount-tmpfs # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch -Patch2: 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch + +# Empty %description Systemd is a system and service manager, compatible with SysV and LSB @@ -408,7 +408,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} -%autopatch -p1 +# %autopatch -p1 # only needed for bootstrap %if 0%{?bootstrap} diff --git a/systemd.changes b/systemd.changes index 17ec22fe..0fd8a7e7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Fri Feb 2 08:56:04 UTC 2018 - fbui@suse.com + +- Import commit 8ec9f58d334c76e736957812d9e57151502a6f63 + + 07c6ee3eb compat-rules: get rid of scsi_id when generating compat symlinks for NVMe devices (bsc#1051465) + 261a4ef38 compat-rules: generate compat by-id symlinks with 'nvme' prefix missing (bsc#1063249) + +------------------------------------------------------------------- +Fri Feb 2 08:44:57 UTC 2018 - fbui@suse.com + +- Drop 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch + + It's been imported in branch "compats/udev-compat-symlinks" which + has been merged in branch "openSUSE-Factory" in its turn. + +------------------------------------------------------------------- +Fri Feb 2 08:17:41 UTC 2018 - fbui@suse.com + +- Import commit c516268845b0fd0683cef2e491b84077371e8f01 + + 37da1facb core: disable session keyring per system sevice entirely for now (bnc#1045886) + 8a1ae0449 strv: fix buffer size calculation in strv_join_quoted() + +------------------------------------------------------------------- +Fri Feb 2 08:14:03 UTC 2018 - fbui@suse.com + +- Drop 0001-core-disable-session-keyring-per-system-sevice-entir.patch + + It's been merged in branch "SUSE/v234". + +------------------------------------------------------------------- +Wed Jan 31 15:14:55 UTC 2018 - fbui@suse.com + +- Import commit 2087a80d56bb6f8c7fb74a19172259bc9d9af866 + + 2b8971b8a tmpfiles: refuse to chown()/chmod() files which are hardlinked, unless protected_hardlinks sysctl is on (bsc#1077925 CVE-2017-18078) + 8c2bcac25 tmpfiles: change ownership of symlinks too + ------------------------------------------------------------------- Mon Jan 29 09:52:50 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index b889f423..80b8c033 100644 --- a/systemd.spec +++ b/systemd.spec @@ -160,8 +160,8 @@ Source1065: udev-remount-tmpfs # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-core-disable-session-keyring-per-system-sevice-entir.patch -Patch2: 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch + +# Empty %description Systemd is a system and service manager, compatible with SysV and LSB @@ -406,7 +406,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. %prep %setup -q -n systemd-%{version} -%autopatch -p1 +# %autopatch -p1 # only needed for bootstrap %if 0%{?bootstrap} From ba49fbf7ecabd5635211fe8981542c8f57f6ca793588639b08c23a3272a914cb Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Feb 2018 09:24:49 +0000 Subject: [PATCH 013/124] Accepting request 574687 from Base:System OBS-URL: https://build.opensuse.org/request/show/574687 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=271 --- libgcrypt.m4 | 123 ----------------- suse-disable-tmpfs-for-tmp.service | 33 ----- systemd-234.tar.xz | 4 +- systemd-mini.changes | 79 +++++++++++ systemd-mini.spec | 207 ++++++++++++----------------- systemd.changes | 79 +++++++++++ systemd.spec | 207 ++++++++++++----------------- 7 files changed, 332 insertions(+), 400 deletions(-) delete mode 100644 libgcrypt.m4 delete mode 100644 suse-disable-tmpfs-for-tmp.service diff --git a/libgcrypt.m4 b/libgcrypt.m4 deleted file mode 100644 index b0aeccd2..00000000 --- a/libgcrypt.m4 +++ /dev/null @@ -1,123 +0,0 @@ -dnl Autoconf macros for libgcrypt -dnl Copyright (C) 2002, 2004 Free Software Foundation, Inc. -dnl -dnl This file is free software; as a special exception the author gives -dnl unlimited permission to copy and/or distribute it, with or without -dnl modifications, as long as this notice is preserved. -dnl -dnl This file is distributed in the hope that it will be useful, but -dnl WITHOUT ANY WARRANTY, to the extent permitted by law; without even the -dnl implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - - -dnl AM_PATH_LIBGCRYPT([MINIMUM-VERSION, -dnl [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND ]]]) -dnl Test for libgcrypt and define LIBGCRYPT_CFLAGS and LIBGCRYPT_LIBS. -dnl MINIMUN-VERSION is a string with the version number optionalliy prefixed -dnl with the API version to also check the API compatibility. Example: -dnl a MINIMUN-VERSION of 1:1.2.5 won't pass the test unless the installed -dnl version of libgcrypt is at least 1.2.5 *and* the API number is 1. Using -dnl this features allows to prevent build against newer versions of libgcrypt -dnl with a changed API. -dnl -AC_DEFUN([AM_PATH_LIBGCRYPT], -[ AC_ARG_WITH(libgcrypt-prefix, - AC_HELP_STRING([--with-libgcrypt-prefix=PFX], - [prefix where LIBGCRYPT is installed (optional)]), - libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") - if test x$libgcrypt_config_prefix != x ; then - if test x${LIBGCRYPT_CONFIG+set} != xset ; then - LIBGCRYPT_CONFIG=$libgcrypt_config_prefix/bin/libgcrypt-config - fi - fi - - AC_PATH_TOOL(LIBGCRYPT_CONFIG, libgcrypt-config, no) - tmp=ifelse([$1], ,1:1.2.0,$1) - if echo "$tmp" | grep ':' >/dev/null 2>/dev/null ; then - req_libgcrypt_api=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\1/'` - min_libgcrypt_version=`echo "$tmp" | sed 's/\(.*\):\(.*\)/\2/'` - else - req_libgcrypt_api=0 - min_libgcrypt_version="$tmp" - fi - - AC_MSG_CHECKING(for LIBGCRYPT - version >= $min_libgcrypt_version) - ok=no - if test "$LIBGCRYPT_CONFIG" != "no" ; then - req_major=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` - req_minor=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` - req_micro=`echo $min_libgcrypt_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` - libgcrypt_config_version=`$LIBGCRYPT_CONFIG --version` - major=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\1/'` - minor=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'` - micro=`echo $libgcrypt_config_version | \ - sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'` - if test "$major" -gt "$req_major"; then - ok=yes - else - if test "$major" -eq "$req_major"; then - if test "$minor" -gt "$req_minor"; then - ok=yes - else - if test "$minor" -eq "$req_minor"; then - if test "$micro" -ge "$req_micro"; then - ok=yes - fi - fi - fi - fi - fi - fi - if test $ok = yes; then - AC_MSG_RESULT([yes ($libgcrypt_config_version)]) - else - AC_MSG_RESULT(no) - fi - if test $ok = yes; then - # If we have a recent libgcrypt, we should also check that the - # API is compatible - if test "$req_libgcrypt_api" -gt 0 ; then - tmp=`$LIBGCRYPT_CONFIG --api-version 2>/dev/null || echo 0` - if test "$tmp" -gt 0 ; then - AC_MSG_CHECKING([LIBGCRYPT API version]) - if test "$req_libgcrypt_api" -eq "$tmp" ; then - AC_MSG_RESULT([okay]) - else - ok=no - AC_MSG_RESULT([does not match. want=$req_libgcrypt_api got=$tmp]) - fi - fi - fi - fi - if test $ok = yes; then - LIBGCRYPT_CFLAGS=`$LIBGCRYPT_CONFIG --cflags` - LIBGCRYPT_LIBS=`$LIBGCRYPT_CONFIG --libs` - ifelse([$2], , :, [$2]) - if test x"$host" != x ; then - libgcrypt_config_host=`$LIBGCRYPT_CONFIG --host 2>/dev/null || echo none` - if test x"$libgcrypt_config_host" != xnone ; then - if test x"$libgcrypt_config_host" != x"$host" ; then - AC_MSG_WARN([[ -*** -*** The config script $LIBGCRYPT_CONFIG was -*** built for $libgcrypt_config_host and thus may not match the -*** used host $host. -*** You may want to use the configure option --with-libgcrypt-prefix -*** to specify a matching config script. -***]]) - fi - fi - fi - else - LIBGCRYPT_CFLAGS="" - LIBGCRYPT_LIBS="" - ifelse([$3], , :, [$3]) - fi - AC_SUBST(LIBGCRYPT_CFLAGS) - AC_SUBST(LIBGCRYPT_LIBS) -]) diff --git a/suse-disable-tmpfs-for-tmp.service b/suse-disable-tmpfs-for-tmp.service deleted file mode 100644 index df598082..00000000 --- a/suse-disable-tmpfs-for-tmp.service +++ /dev/null @@ -1,33 +0,0 @@ -# -# By default, /tmp doesn't use tmpfs on SUSE distros. -# -# This service is either run automatically during the firstboot (i.e. -# only once) of the system. -# -# Or it can also be (manually) started during systemd update (%post) -# only and only if tmp.mount wasn't already installed by the admin in -# /usr/lib during %pre. In this case tmp.mount should also masked. -# -# In any cases this service will never mask tmp.mount if the service -# has been created by either the admin or fstab-generator. -# -[Unit] -Description=Mask tmp.mount by default on SUSE systems -DefaultDependencies=no -Conflicts=shutdown.target -After=systemd-remount-fs.service -Before=tmp.mount -ConditionPathIsReadWrite=/etc -ConditionPathExists=!/usr/lib/systemd/system/.disable-tmpfs-for-tmp~done - -[Service] -Type=oneshot -RemainAfterExit=yes -ExecStart=/bin/sh -c ' \ - case "$(systemctl show -pFragmentPath tmp.mount)" in \ - FragmentPath=/usr/lib/systemd/system/tmp.mount) \ - systemctl mask --now tmp.mount ;; \ - FragmentPath=/usr/share/systemd/tmp.mount) \ - ln -sf /usr/lib/systemd/system/tmp.mount /etc/systemd/system/ ;; \ - esac' -ExecStartPost=/usr/bin/touch /usr/lib/systemd/system/.disable-tmpfs-for-tmp~done diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index 75985aaa..bf54056e 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:99fb2aa924449a90db2431507c82cb778a7563e22de08f1ac8e9e77c30c06fc3 -size 3353804 +oid sha256:3ebafff50a8ea2bce9ed34712b14947d8754fbdd4a1c085aa9dd285450e8dd2d +size 3354512 diff --git a/systemd-mini.changes b/systemd-mini.changes index 0fd8a7e7..4b3c533d 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,82 @@ +------------------------------------------------------------------- +Fri Feb 9 14:01:24 UTC 2018 - fbui@suse.com + +- Import commit 4a6a1e4f0b02e6cedf7eba93b85a6dd968f875c7 + + db1d8eacd compat-rules: make path_id_compat build with meson + +- Drop 0001-compat-rules-make-path_id_compat-build-with-meson.patch + which is now part of the git repo (see above). + +------------------------------------------------------------------- +Fri Feb 9 07:59:56 UTC 2018 - fbui@suse.com + +- Don't ship /usr/lib/systemd/system/tmp.mnt at all (bsc#1071224) + + The previous fix couldn't work on platforms using a RO + rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but + we still ship a copy in /var. + + Users who want to use tmpfs on /tmp are supposed to add a symlink in + /etc/ pointing to the copy shipped in /var. + + To support the update path we automatically create the symlink if + tmp.mount in use is located in /usr. + +------------------------------------------------------------------- +Tue Feb 6 16:11:40 UTC 2018 - fbui@suse.com + +- Don't build seccomp support in the mini package + +------------------------------------------------------------------- +Tue Feb 6 15:12:42 UTC 2018 - fbui@suse.com + +- Switch to Meson build system + + Some rearrangement in the file list was also needed. That was + probably due to the upgrade of rpm. + +------------------------------------------------------------------- +Tue Feb 6 14:54:57 UTC 2018 - fbui@suse.com + +- Import commit 0a5600eb7f8263c7c79fec0d85cc159d54aba636 + + 2a181fc6f insserv-generator: make it build with meson + 7b0401da4 build-sys: don't build networkctl if networkd is disabled + +------------------------------------------------------------------- +Tue Feb 6 09:27:59 UTC 2018 - fbui@suse.com + +- Don't build-require selinux for the mini package + +------------------------------------------------------------------- +Tue Feb 6 08:56:33 UTC 2018 - fbui@suse.com + +- Drop libgcrypt.m4 + + The mini package builds fine without it so it doesn't seem necessary + anymore. + +------------------------------------------------------------------- +Mon Feb 5 20:25:31 UTC 2018 - fbui@suse.com + +- Import commit 846d838c37865da60eba48090e570e959291399f + + b1e0a348d fileio: include sys/mman.h + f1fa784cb meson: update header file to detect memfd_create() + 8838ba7ec meson: define _GNU_SOURCE to detect copy_file_range() (#7734) + 531a00c84 Restore "restore /var/run and /var/lock bind mount if they aren't symlink"" + + (the 3 first commits make systemd build against glibc 2.27) + +------------------------------------------------------------------- +Mon Feb 5 10:01:37 UTC 2018 - fbui@suse.com + +- Import commit 3f421e4fbf6fcb31d74caf729435868ba8824483 + + 7fb9ea39a Revert "restore /var/run and /var/lock bind mount if they aren't symlink" + 23ce1207a meson.build: make docdir configurable (#8068) + ------------------------------------------------------------------- Fri Feb 2 08:56:04 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 7b940175..003b565f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -69,6 +69,10 @@ BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(libselinux) >= 2.1.9 +%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x +BuildRequires: pkgconfig(libseccomp) >= 2.3.1 +%endif %endif BuildRequires: fdupes BuildRequires: gperf @@ -76,8 +80,8 @@ BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: libsepol-devel -BuildRequires: libtool +BuildRequires: m4 +BuildRequires: meson >= 0.43 BuildRequires: pam-devel # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. @@ -87,8 +91,6 @@ BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) -BuildRequires: pkgconfig(libselinux) >= 2.1.9 -BuildRequires: pkgconfig(libsepol) %if %{with importd} BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libcurl) @@ -98,9 +100,6 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif -%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) >= 2.3.1 -%endif %if %{with gnuefi} BuildRequires: gnu-efi %endif @@ -144,11 +143,9 @@ Source1: %{name}-rpmlintrc Source2: systemd-user Source3: systemd-sysv-convert Source6: baselibs.conf -Source7: libgcrypt.m4 Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy -Source15: suse-disable-tmpfs-for-tmp.service Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh @@ -163,8 +160,6 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. -# Empty - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -410,62 +405,52 @@ Some systemd commands offer bash completion, but it is an optional dependency. %setup -q -n systemd-%{version} # %autopatch -p1 -# only needed for bootstrap -%if 0%{?bootstrap} -cp %{SOURCE7} m4/ -%endif - %build -./autogen.sh - # keep split-usr until all packages have moved their systemd rules to /usr -%configure \ - --docdir=%{_docdir}/systemd \ - --with-pamlibdir=/%{_lib}/security \ - --with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \ - --with-dbussessionservicedir=%{_datadir}/dbus-1/services \ - --with-dbussystemservicedir=%{_datadir}/dbus-1/system-services \ - --with-certificate-root=%{_sysconfdir}/pki/systemd \ +%meson \ + -Ddocdir=%{_docdir}/systemd \ + -Drootprefix=/usr \ + -Dsplit-usr=true \ + -Dpamlibdir=/%{_lib}/security \ + -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ + -Dcertificate-root=%{_sysconfdir}/pki/systemd \ + -Ddefault-hierarchy=hybrid \ + -Ddefault-kill-user-processes=false \ + -Drc-local=/etc/init.d/boot.local \ + -Dhalt-local=/etc/init.d/halt.local \ + -Ddebug-shell=/bin/bash \ + -Dseccomp=auto \ + -Dselinux=auto \ + -Dapparmor=auto \ + -Dsmack=false \ + -Dima=false \ %if 0%{?bootstrap} - --disable-myhostname \ - --disable-manpages \ + -Dman=false \ + -Dhtml=false \ + -Dmyhostname=false \ %endif - --enable-selinux \ - --enable-split-usr \ - --disable-static \ - --disable-lto \ - --disable-tests \ - --without-kill-user-processes \ - --with-default-hierarchy=hybrid \ - --with-rc-local-script-path-start=/etc/init.d/boot.local \ - --with-rc-local-script-path-stop=/etc/init.d/halt.local \ - --with-debug-shell=/bin/bash \ - --disable-smack \ - --disable-ima \ - --disable-adm-group \ - --disable-wheel-group \ - --disable-ldconfig \ - --disable-gshadow \ %if %{without networkd} - --disable-networkd \ -%endif -%if %{without machined} - --disable-machined \ -%endif -%if %{without sysvcompat} - --with-sysvinit-path= \ - --with-sysvrcnd-path= \ + -Dnetworkd=false \ %endif %if %{without resolved} - --disable-resolved \ + -Dresolve=false \ %endif - --disable-kdbus +%if %{without machined} + -Dmachined=false \ +%endif +%if %{without sysvcompat} + -Dsysvinit-path= \ + -Dsysvrcnd-path= \ +%endif + -Dadm-group=false \ + -Dwheel-group=false \ + -Dgshadow=false \ + -Dldconfig=false -%make_build V=e +%meson_build %install -%make_install -find %{buildroot} -type f -name '*.la' -delete +%meson_install # move to %{_lib} %if ! 0%{?bootstrap} @@ -481,13 +466,12 @@ ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd -install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs - mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't @@ -514,10 +498,11 @@ rm -f %{buildroot}/etc/systemd/system/default.target # customized for openSUSE distros. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ -# Install the service which will disable/mask tmpfs for /tmp (if -# needed) on first boot. -install -m0644 -D %{S:15} %{buildroot}/%{_prefix}/lib/systemd/system/suse-disable-tmpfs-for-tmp.service -ln -s ../suse-disable-tmpfs-for-tmp.service %{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/ +# Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs +# by default on SUSE distros. We still keep a copy in /var for those +# who want to switch to tmpfs: it's still can be copied in /etc. +rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount +mv %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount %{buildroot}/%{_datadir}/systemd/ # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path @@ -529,10 +514,6 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf sg EOF -# Remove .so file for the shared library, it's not supposed to be -# used. -rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf @@ -653,13 +634,10 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map # so keep the section even if it's empty. %pre if [ $1 -gt 1 ] ; then - # Check if tmp.mount has been restored by either the admin or - # was added at package installation. In both cases do nothing - # and prevent the service to be executed during %post for the - # former case. - if test -e %{_unitdir}/tmp.mount; then - touch %{_unitdir}/.disable-tmpfs-for-tmp~done - fi + case "$(systemctl show -pFragmentPath tmp.mount)" in + FragmentPath=/usr/lib/systemd/system/tmp.mount) + ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || : + esac fi %post @@ -734,13 +712,6 @@ if [ $1 -gt 1 ]; then # tmpfiles_create macro previously however it's empty so there # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : - - # Should we mask tmpfs ? If tmp.mount was already installed in - # /usr/lib then this is a nop as sysadmin restored the unit - # most likely to use tmpfs (see %pre) otherwise mask the mount - # unit unless it's overriden by a tmp.mount unit installed - # either by sysadmin or fstab-generator. - systemctl start suse-disable-tmpfs-for-tmp.service || : fi %postun @@ -902,14 +873,16 @@ fi %dir %{_prefix}/lib/systemd %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system -%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd -%exclude %{_prefix}/lib/systemd/systemd-journal-remote -%exclude %{_prefix}/lib/systemd/systemd-journal-upload -%exclude %{_prefix}/lib/systemd/systemd-sysv* -%exclude %{_prefix}/lib/systemd/systemd-udevd +%if %{with journal_remote} %exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* %exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.* %exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.* +%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd +%exclude %{_prefix}/lib/systemd/systemd-journal-remote +%exclude %{_prefix}/lib/systemd/systemd-journal-upload +%endif +%exclude %{_prefix}/lib/systemd/systemd-sysv* +%exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_prefix}/lib/systemd/system/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service @@ -963,11 +936,13 @@ fi %{_libexecdir}/modules-load.d/sg.conf %{_libexecdir}/sysusers.d/ -%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf - %dir %{_sysconfdir}/tmpfiles.d %{_libexecdir}/tmpfiles.d/ + +%if %{with journal_remote} +%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf %exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%endif %{_libexecdir}/environment.d/ @@ -981,12 +956,12 @@ fi %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d -%dir %{_sysconfdir}/dbus-1 -%dir %{_sysconfdir}/dbus-1/system.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user +%if %{with networkd} %dir %{_sysconfdir}/systemd/network +%endif %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh @@ -1001,27 +976,33 @@ fi %if %{with resolved} %config(noreplace) %{_sysconfdir}/systemd/resolved.conf %endif -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf + +%dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/system.d +%dir %{_datadir}/dbus-1/services +%dir %{_datadir}/dbus-1/system-services + +%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %if %{with machined} -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %endif -# Some files created by us. +# Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1032,31 +1013,13 @@ fi %ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target %ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target -%{_prefix}/lib/systemd/system/org.freedesktop.systemd1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.locale1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.login1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.hostname1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.timedate1.busname -%if %{with networkd} -%{_prefix}/lib/systemd/system/org.freedesktop.network1.busname -%endif -%if %{with resolved} -%{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname -%endif -%if %{with machined} -%{_prefix}/lib/systemd/system/org.freedesktop.machine1.busname -%endif -%if %{with importd} -%{_prefix}/lib/systemd/system/org.freedesktop.import1.busname -%endif - %{_datadir}/systemd %{_datadir}/factory -%exclude %{_datadir}/systemd/gatewayd -%dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/services -%dir %{_datadir}/dbus-1/system-services +%if %{with journal_remote} +%exclude %{_datadir}/systemd/gatewayd +%endif + %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service @@ -1206,7 +1169,9 @@ fi %{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket %dir %{_prefix}/lib/systemd/network %{_prefix}/lib/systemd/network/*.link +%if %{with networkd} %{_prefix}/lib/systemd/network/*.network +%endif %{_datadir}/pkgconfig/udev.pc %files -n libsystemd0%{?mini} diff --git a/systemd.changes b/systemd.changes index 0fd8a7e7..4b3c533d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,82 @@ +------------------------------------------------------------------- +Fri Feb 9 14:01:24 UTC 2018 - fbui@suse.com + +- Import commit 4a6a1e4f0b02e6cedf7eba93b85a6dd968f875c7 + + db1d8eacd compat-rules: make path_id_compat build with meson + +- Drop 0001-compat-rules-make-path_id_compat-build-with-meson.patch + which is now part of the git repo (see above). + +------------------------------------------------------------------- +Fri Feb 9 07:59:56 UTC 2018 - fbui@suse.com + +- Don't ship /usr/lib/systemd/system/tmp.mnt at all (bsc#1071224) + + The previous fix couldn't work on platforms using a RO + rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but + we still ship a copy in /var. + + Users who want to use tmpfs on /tmp are supposed to add a symlink in + /etc/ pointing to the copy shipped in /var. + + To support the update path we automatically create the symlink if + tmp.mount in use is located in /usr. + +------------------------------------------------------------------- +Tue Feb 6 16:11:40 UTC 2018 - fbui@suse.com + +- Don't build seccomp support in the mini package + +------------------------------------------------------------------- +Tue Feb 6 15:12:42 UTC 2018 - fbui@suse.com + +- Switch to Meson build system + + Some rearrangement in the file list was also needed. That was + probably due to the upgrade of rpm. + +------------------------------------------------------------------- +Tue Feb 6 14:54:57 UTC 2018 - fbui@suse.com + +- Import commit 0a5600eb7f8263c7c79fec0d85cc159d54aba636 + + 2a181fc6f insserv-generator: make it build with meson + 7b0401da4 build-sys: don't build networkctl if networkd is disabled + +------------------------------------------------------------------- +Tue Feb 6 09:27:59 UTC 2018 - fbui@suse.com + +- Don't build-require selinux for the mini package + +------------------------------------------------------------------- +Tue Feb 6 08:56:33 UTC 2018 - fbui@suse.com + +- Drop libgcrypt.m4 + + The mini package builds fine without it so it doesn't seem necessary + anymore. + +------------------------------------------------------------------- +Mon Feb 5 20:25:31 UTC 2018 - fbui@suse.com + +- Import commit 846d838c37865da60eba48090e570e959291399f + + b1e0a348d fileio: include sys/mman.h + f1fa784cb meson: update header file to detect memfd_create() + 8838ba7ec meson: define _GNU_SOURCE to detect copy_file_range() (#7734) + 531a00c84 Restore "restore /var/run and /var/lock bind mount if they aren't symlink"" + + (the 3 first commits make systemd build against glibc 2.27) + +------------------------------------------------------------------- +Mon Feb 5 10:01:37 UTC 2018 - fbui@suse.com + +- Import commit 3f421e4fbf6fcb31d74caf729435868ba8824483 + + 7fb9ea39a Revert "restore /var/run and /var/lock bind mount if they aren't symlink" + 23ce1207a meson.build: make docdir configurable (#8068) + ------------------------------------------------------------------- Fri Feb 2 08:56:04 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 80b8c033..351d9636 100644 --- a/systemd.spec +++ b/systemd.spec @@ -67,6 +67,10 @@ BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(libselinux) >= 2.1.9 +%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x +BuildRequires: pkgconfig(libseccomp) >= 2.3.1 +%endif %endif BuildRequires: fdupes BuildRequires: gperf @@ -74,8 +78,8 @@ BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: libsepol-devel -BuildRequires: libtool +BuildRequires: m4 +BuildRequires: meson >= 0.43 BuildRequires: pam-devel # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. @@ -85,8 +89,6 @@ BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(libpcre) -BuildRequires: pkgconfig(libselinux) >= 2.1.9 -BuildRequires: pkgconfig(libsepol) %if %{with importd} BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libcurl) @@ -96,9 +98,6 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif -%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) >= 2.3.1 -%endif %if %{with gnuefi} BuildRequires: gnu-efi %endif @@ -142,11 +141,9 @@ Source1: %{name}-rpmlintrc Source2: systemd-user Source3: systemd-sysv-convert Source6: baselibs.conf -Source7: libgcrypt.m4 Source11: after-local.service Source12: systemd-sysv-install Source14: kbd-model-map.legacy -Source15: suse-disable-tmpfs-for-tmp.service Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh @@ -161,8 +158,6 @@ Source1065: udev-remount-tmpfs # patches are temporary and should be removed as soon as a fix is # merged by upstream. -# Empty - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -408,62 +403,52 @@ Some systemd commands offer bash completion, but it is an optional dependency. %setup -q -n systemd-%{version} # %autopatch -p1 -# only needed for bootstrap -%if 0%{?bootstrap} -cp %{SOURCE7} m4/ -%endif - %build -./autogen.sh - # keep split-usr until all packages have moved their systemd rules to /usr -%configure \ - --docdir=%{_docdir}/systemd \ - --with-pamlibdir=/%{_lib}/security \ - --with-dbuspolicydir=%{_sysconfdir}/dbus-1/system.d \ - --with-dbussessionservicedir=%{_datadir}/dbus-1/services \ - --with-dbussystemservicedir=%{_datadir}/dbus-1/system-services \ - --with-certificate-root=%{_sysconfdir}/pki/systemd \ +%meson \ + -Ddocdir=%{_docdir}/systemd \ + -Drootprefix=/usr \ + -Dsplit-usr=true \ + -Dpamlibdir=/%{_lib}/security \ + -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ + -Dcertificate-root=%{_sysconfdir}/pki/systemd \ + -Ddefault-hierarchy=hybrid \ + -Ddefault-kill-user-processes=false \ + -Drc-local=/etc/init.d/boot.local \ + -Dhalt-local=/etc/init.d/halt.local \ + -Ddebug-shell=/bin/bash \ + -Dseccomp=auto \ + -Dselinux=auto \ + -Dapparmor=auto \ + -Dsmack=false \ + -Dima=false \ %if 0%{?bootstrap} - --disable-myhostname \ - --disable-manpages \ + -Dman=false \ + -Dhtml=false \ + -Dmyhostname=false \ %endif - --enable-selinux \ - --enable-split-usr \ - --disable-static \ - --disable-lto \ - --disable-tests \ - --without-kill-user-processes \ - --with-default-hierarchy=hybrid \ - --with-rc-local-script-path-start=/etc/init.d/boot.local \ - --with-rc-local-script-path-stop=/etc/init.d/halt.local \ - --with-debug-shell=/bin/bash \ - --disable-smack \ - --disable-ima \ - --disable-adm-group \ - --disable-wheel-group \ - --disable-ldconfig \ - --disable-gshadow \ %if %{without networkd} - --disable-networkd \ -%endif -%if %{without machined} - --disable-machined \ -%endif -%if %{without sysvcompat} - --with-sysvinit-path= \ - --with-sysvrcnd-path= \ + -Dnetworkd=false \ %endif %if %{without resolved} - --disable-resolved \ + -Dresolve=false \ %endif - --disable-kdbus +%if %{without machined} + -Dmachined=false \ +%endif +%if %{without sysvcompat} + -Dsysvinit-path= \ + -Dsysvrcnd-path= \ +%endif + -Dadm-group=false \ + -Dwheel-group=false \ + -Dgshadow=false \ + -Dldconfig=false -%make_build V=e +%meson_build %install -%make_install -find %{buildroot} -type f -name '*.la' -delete +%meson_install # move to %{_lib} %if ! 0%{?bootstrap} @@ -479,13 +464,12 @@ ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd -install -m755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs - mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't @@ -512,10 +496,11 @@ rm -f %{buildroot}/etc/systemd/system/default.target # customized for openSUSE distros. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ -# Install the service which will disable/mask tmpfs for /tmp (if -# needed) on first boot. -install -m0644 -D %{S:15} %{buildroot}/%{_prefix}/lib/systemd/system/suse-disable-tmpfs-for-tmp.service -ln -s ../suse-disable-tmpfs-for-tmp.service %{buildroot}/%{_prefix}/lib/systemd/system/sysinit.target.wants/ +# Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs +# by default on SUSE distros. We still keep a copy in /var for those +# who want to switch to tmpfs: it's still can be copied in /etc. +rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount +mv %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount %{buildroot}/%{_datadir}/systemd/ # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path @@ -527,10 +512,6 @@ cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf sg EOF -# Remove .so file for the shared library, it's not supposed to be -# used. -rm %{buildroot}%{_libexecdir}/systemd/libsystemd-shared.so - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf @@ -651,13 +632,10 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map # so keep the section even if it's empty. %pre if [ $1 -gt 1 ] ; then - # Check if tmp.mount has been restored by either the admin or - # was added at package installation. In both cases do nothing - # and prevent the service to be executed during %post for the - # former case. - if test -e %{_unitdir}/tmp.mount; then - touch %{_unitdir}/.disable-tmpfs-for-tmp~done - fi + case "$(systemctl show -pFragmentPath tmp.mount)" in + FragmentPath=/usr/lib/systemd/system/tmp.mount) + ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || : + esac fi %post @@ -732,13 +710,6 @@ if [ $1 -gt 1 ]; then # tmpfiles_create macro previously however it's empty so there # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : - - # Should we mask tmpfs ? If tmp.mount was already installed in - # /usr/lib then this is a nop as sysadmin restored the unit - # most likely to use tmpfs (see %pre) otherwise mask the mount - # unit unless it's overriden by a tmp.mount unit installed - # either by sysadmin or fstab-generator. - systemctl start suse-disable-tmpfs-for-tmp.service || : fi %postun @@ -900,14 +871,16 @@ fi %dir %{_prefix}/lib/systemd %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system -%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd -%exclude %{_prefix}/lib/systemd/systemd-journal-remote -%exclude %{_prefix}/lib/systemd/systemd-journal-upload -%exclude %{_prefix}/lib/systemd/systemd-sysv* -%exclude %{_prefix}/lib/systemd/systemd-udevd +%if %{with journal_remote} %exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* %exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.* %exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.* +%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd +%exclude %{_prefix}/lib/systemd/systemd-journal-remote +%exclude %{_prefix}/lib/systemd/systemd-journal-upload +%endif +%exclude %{_prefix}/lib/systemd/systemd-sysv* +%exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_prefix}/lib/systemd/system/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* %exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service @@ -961,11 +934,13 @@ fi %{_libexecdir}/modules-load.d/sg.conf %{_libexecdir}/sysusers.d/ -%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf - %dir %{_sysconfdir}/tmpfiles.d %{_libexecdir}/tmpfiles.d/ + +%if %{with journal_remote} +%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf %exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%endif %{_libexecdir}/environment.d/ @@ -979,12 +954,12 @@ fi %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d -%dir %{_sysconfdir}/dbus-1 -%dir %{_sysconfdir}/dbus-1/system.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user +%if %{with networkd} %dir %{_sysconfdir}/systemd/network +%endif %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh @@ -999,27 +974,33 @@ fi %if %{with resolved} %config(noreplace) %{_sysconfdir}/systemd/resolved.conf %endif -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.login1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf + +%dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/system.d +%dir %{_datadir}/dbus-1/services +%dir %{_datadir}/dbus-1/system-services + +%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %if %{with machined} -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %endif %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif %if %{with importd} -%config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %endif -# Some files created by us. +# Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1030,31 +1011,13 @@ fi %ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target %ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target -%{_prefix}/lib/systemd/system/org.freedesktop.systemd1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.locale1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.login1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.hostname1.busname -%{_prefix}/lib/systemd/system/org.freedesktop.timedate1.busname -%if %{with networkd} -%{_prefix}/lib/systemd/system/org.freedesktop.network1.busname -%endif -%if %{with resolved} -%{_prefix}/lib/systemd/system/org.freedesktop.resolve1.busname -%endif -%if %{with machined} -%{_prefix}/lib/systemd/system/org.freedesktop.machine1.busname -%endif -%if %{with importd} -%{_prefix}/lib/systemd/system/org.freedesktop.import1.busname -%endif - %{_datadir}/systemd %{_datadir}/factory -%exclude %{_datadir}/systemd/gatewayd -%dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/services -%dir %{_datadir}/dbus-1/system-services +%if %{with journal_remote} +%exclude %{_datadir}/systemd/gatewayd +%endif + %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service @@ -1204,7 +1167,9 @@ fi %{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket %dir %{_prefix}/lib/systemd/network %{_prefix}/lib/systemd/network/*.link +%if %{with networkd} %{_prefix}/lib/systemd/network/*.network +%endif %{_datadir}/pkgconfig/udev.pc %files -n libsystemd0%{?mini} From 0ad8c93c3cacd4d71f9a6f09f3452a1b28065b4e77c0e50b59eda230b91e1e64 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 21 Feb 2018 13:08:53 +0000 Subject: [PATCH 014/124] Accepting request 578064 from Base:System OBS-URL: https://build.opensuse.org/request/show/578064 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=272 --- scripts-systemd-migrate-sysconfig-i18n.sh | 135 ++++++++++++++ systemd-234.tar.xz | 4 +- systemd-mini.changes | 60 ++++++ systemd-mini.spec | 217 ++++++++++++---------- systemd.changes | 60 ++++++ systemd.spec | 217 ++++++++++++---------- 6 files changed, 485 insertions(+), 208 deletions(-) create mode 100644 scripts-systemd-migrate-sysconfig-i18n.sh diff --git a/scripts-systemd-migrate-sysconfig-i18n.sh b/scripts-systemd-migrate-sysconfig-i18n.sh new file mode 100644 index 00000000..02646759 --- /dev/null +++ b/scripts-systemd-migrate-sysconfig-i18n.sh @@ -0,0 +1,135 @@ +#! /bin/bash + +# /etc/sysconfig/console | /etc/vconsole.conf +# -------------------------+--------------------- +# CONSOLE_FONT | FONT +# CONSOLE_SCREENMAP | FONT_MAP +# CONSOLE_UNICODEMAP | FONT_UNIMAP +migrate_locale () { + local migrated="" + + if ! test -f /etc/sysconfig/console; then + return + fi + source /etc/sysconfig/console || return + + if test -f /etc/vconsole.conf; then + source /etc/vconsole.conf || return + fi + + if test -n "$CONSOLE_FONT" && test -z "$FONT"; then + echo "FONT=$CONSOLE_FONT" >>/etc/vconsole.conf + migrated+="CONSOLE_FONT " + fi + if test -n "$CONSOLE_SCREENMAP" && test -z "$FONT_MAP"; then + echo "FONT_MAP=$CONSOLE_SCREENMAP" >>/etc/vconsole.conf + migrated+="CONSOLE_SCREENMAP " + fi + if test -n "$CONSOLE_UNICODEMAP" && test -z "$FONT_UNIMAP"; then + echo "FONT_UNIMAP=$CONSOLE_UNICODEMAP" >>/etc/vconsole.conf + migrated+="CONSOLE_UNICODEMAP " + fi + + if test -n "$migrated"; then + echo >&2 "The following variables from /etc/sysconfig/console have been migrated" + echo >&2 "into /etc/vconsole.conf:" + echo >&2 + for v in $migrated; do echo " - $v=${!v}"; done + echo >&2 + echo >&2 "Please edit /etc/vconsole.conf if you need to tune these settings" + echo >&2 "as /etc/sysconfig/console won't be considered anymore." + echo >&2 + fi +} + +# /etc/sysconfig/keyboard | /etc/vconsole.conf +# -------------------------+--------------------- +# KEYTABLE | KEYMAP +migrate_keyboard () { + local migrated="" + + if ! test -f /etc/sysconfig/keyboard; then + return + fi + source /etc/sysconfig/keyboard || return + + if test -f /etc/vconsole.conf; then + source /etc/vconsole.conf || return + fi + + if test -n "$KEYTABLE" && test -z "$KEYMAP"; then + echo "KEYMAP=$KEYTABLE" >>/etc/vconsole.conf + migrated+="KEYTABLE " + fi + + if test -n "$migrated"; then + echo >&2 "The following variables from /etc/sysconfig/keyboard have been migrated" + echo >&2 "into /etc/vconsole.conf:" + echo >&2 + for v in $migrated; do echo " - $v=${!v}"; done + echo >&2 + echo >&2 "Please use localectl(1) if you need to tune these settings since" + echo >&2 "/etc/sysconfig/keyboard won't be considered anymore." + echo >&2 + fi +} + +# According to +# https://www.suse.com/documentation/sles-12/book_sle_admin/data/sec_suse_l10n.html, +# variables in /etc/sysconfig/language are supposed to be passed to +# the users' shell *only*. However it seems that there has been some +# confusion and they ended up configuring the system-wide locale as +# well. The logic followed by systemd was implemented in commit +# 01c4b6f4f0d951d17f6873f68156ecd7763429c6, which was reverted. The +# code below follows the same logic to migrate content of +# /etc/sysconfig/language into locale.conf. +migrate_language () { + local lang= + local migrated=false + + if ! test -f /etc/sysconfig/language; then + return + fi + source /etc/sysconfig/language || return + + lang=$(grep ^LANG= /etc/locale.conf 2>/dev/null) + lang=${lang#LANG=} + + case "$ROOT_USES_LANG" in + yes) + if test -z "$lang" && test -n "$RC_LANG"; then + echo "LANG=$RC_LANG" >>/etc/locale.conf + migrated=true + fi + ;; + ctype) + if ! grep -q ^LC_CTYPE= /etc/locale.conf 2>/dev/null; then + + : ${lc_ctype:="$lang"} + : ${lc_ctype:="$RC_LC_CTYPE"} + : ${lc_ctype:="$RC_LANG"} + + if test -n "$lc_ctype"; then + echo "LC_CTYPE=$lc_ctype" >>/etc/locale.conf + migrated=true + fi + fi + ;; + esac + + if $migrated; then + echo >&2 "The content of /etc/sysconfig/language has been migrated into" + echo >&2 "/etc/locale.conf. The former file is now only used for setting" + echo >&2 "the locale used by user's shells. The system-wide locale is" + echo >&2 "only read from /etc/locale.conf since now." + echo >&2 + echo >&2 "Please only use localectl(1) or YaST if you need to change the" + echo >&2 "settings of the *system-wide* locale from now." + fi +} + +migrate_locale; rv1=$? +migrate_keyboard; rv2=$? +migrate_language; rv3=$? + +test $((rv1 + rv2 + rv3)) -eq 0 diff --git a/systemd-234.tar.xz b/systemd-234.tar.xz index bf54056e..c0fdec25 100644 --- a/systemd-234.tar.xz +++ b/systemd-234.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3ebafff50a8ea2bce9ed34712b14947d8754fbdd4a1c085aa9dd285450e8dd2d -size 3354512 +oid sha256:49daec1195deaa22bd490d70f78aafb7bdc0058ca236125e3c39127688c6db94 +size 3353696 diff --git a/systemd-mini.changes b/systemd-mini.changes index 4b3c533d..fa988b4c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Mon Feb 19 14:26:51 UTC 2018 - fbui@suse.com + +- Import commit 295ead0f396beb2b5199abd99a17e274c2581f95 + + f4f94ab2e meson: install rules/80-hotplug-cpu-mem.rules + 2901aa9b9 meson: install rules/60-ssd-scheduler.rules + 1293c0056 core: use id unit when retrieving unit file state (#8038) (bsc#1075801) + 596b2b241 Revert "vconsole-setup: add SUSE specific settings for font/keyboard in sysconfig" + 0b595da04 Revert "locale-setup: handle locale at boot time well" + +------------------------------------------------------------------- +Mon Feb 19 14:24:52 UTC 2018 - fbui@suse.com + +- Re-enable systemd-firstboot + + It's used by the installer and also by JeOS. + +------------------------------------------------------------------- +Mon Feb 19 09:25:30 UTC 2018 - fbui@suse.com + +- Use %systemd_post in %post + +------------------------------------------------------------------- +Mon Feb 19 09:15:04 UTC 2018 - fbui@suse.com + +- Own /usr/lib/systemd/system-environment-generators directory + +------------------------------------------------------------------- +Mon Feb 19 09:10:03 UTC 2018 - fbui@suse.com + +- More systemd rpm macro usages + +------------------------------------------------------------------- +Tue Feb 13 17:11:44 UTC 2018 - fbui@suse.com + +- Disable systemd-firstboot + + I don't think there's any use case for it currently. + +------------------------------------------------------------------- +Mon Feb 12 16:40:28 UTC 2018 - fbui@suse.com + +- Use systemd rpm macros in paths defined in the specfile + +------------------------------------------------------------------- +Mon Feb 12 15:07:29 UTC 2018 - fbui@suse.com + +- Stop importing i18n settings from /etc/sysconfig (fate#319454) + + Bits taken from SLE15. + +------------------------------------------------------------------- +Mon Feb 12 12:59:53 UTC 2018 - fbui@suse.com + +- Make systemd-timesyncd use the openSUSE NTP servers by default + + Previously systemd-timesyncd used the Google Public NTP servers + time{1..4}.google.com + ------------------------------------------------------------------- Fri Feb 9 14:01:24 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 003b565f..cea9627c 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -149,6 +149,7 @@ Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh +Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh Source1065: udev-remount-tmpfs @@ -258,7 +259,7 @@ Requires: this-is-only-for-build-envs %description -n udev%{?mini} Udev creates and removes device nodes in /dev for devices discovered or removed from the system. It receives events via kernel netlink messages -and dispatches them according to rules in /lib/udev/rules.d/. Matching +and dispatches them according to rules in %{_udevrulesdir}/. Matching rules may name a device node, create additional symlinks to the node, call tools to initialize a device, or load needed kernel modules. @@ -406,6 +407,8 @@ Some systemd commands offer bash completion, but it is an optional dependency. # %autopatch -p1 %build +opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) + # keep split-usr until all packages have moved their systemd rules to /usr %meson \ -Ddocdir=%{_docdir}/systemd \ @@ -416,6 +419,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ + -Dntp-servers="${opensuse_ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ -Dhalt-local=/etc/init.d/halt.local \ -Ddebug-shell=/bin/bash \ @@ -476,7 +480,7 @@ install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... -for s in %{S:100} %{S:101}; do +for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done for s in %{S:200}; do @@ -501,11 +505,11 @@ install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ # Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs # by default on SUSE distros. We still keep a copy in /var for those # who want to switch to tmpfs: it's still can be copied in /etc. -rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount -mv %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount %{buildroot}/%{_datadir}/systemd/ +rm %{buildroot}/%{_unitdir}/local-fs.target.wants/tmp.mount +mv %{buildroot}/%{_unitdir}/tmp.mount %{buildroot}/%{_datadir}/systemd/ # don't enable wall ask password service, it spams every console (bnc#747783) -rm %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path +rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path # create %%{_libexecdir}/modules-load.d mkdir -p %{buildroot}%{_libexecdir}/modules-load.d @@ -516,11 +520,11 @@ EOF # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) -rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf +rm -f %{buildroot}%{_sysctldir}/50-default.conf # The definition of the basic users/groups are defined by system-user # on SUSE (bsc#1006978). -rm -f %{buildroot}%{_prefix}/lib/sysusers.d/basic.conf +rm -f %{buildroot}%{_sysusersdir}/basic.conf # Remove README file in init.d as (SUSE) rpm requires executable files # in this directory... oh well. @@ -531,7 +535,7 @@ rm -f %{buildroot}/etc/init.d/README %if ! %{with journal_remote} rm -f %{buildroot}%{_sysconfdir}/systemd/journal-upload.conf rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload -rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.* +rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.* %endif # legacy link @@ -554,31 +558,33 @@ touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin # Make sure the NTP units dir exists -mkdir -p %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/ +mkdir -p %{buildroot}%{_ntpunitsdir} # Make sure the shutdown/sleep drop-in dirs exist mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/ # Make sure these directories are properly owned -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/basic.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/halt.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/kexec.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/poweroff.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/reboot.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/shutdown.target.wants +mkdir -p %{buildroot}%{_unitdir}/basic.target.wants +mkdir -p %{buildroot}%{_unitdir}/default.target.wants +mkdir -p %{buildroot}%{_unitdir}/dbus.target.wants +mkdir -p %{buildroot}%{_unitdir}/halt.target.wants +mkdir -p %{buildroot}%{_unitdir}/kexec.target.wants +mkdir -p %{buildroot}%{_unitdir}/poweroff.target.wants +mkdir -p %{buildroot}%{_unitdir}/reboot.target.wants +mkdir -p %{buildroot}%{_unitdir}/shutdown.target.wants # Make sure the generator directories are created and properly owned. -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-generators -mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-generators -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset -mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset +mkdir -p %{buildroot}%{_systemdgeneratordir} +mkdir -p %{buildroot}%{_systemdusergeneratordir} +mkdir -p %{buildroot}%{_presetdir} +mkdir -p %{buildroot}%{_userpresetdir} +mkdir -p %{buildroot}%{_systemd_system_env_generator_dir} +mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} # create drop-in to prevent tty1 to be cleared (bnc#804158) -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/ -cat << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf +mkdir -p %{buildroot}%{_unitdir}/getty@tty1.service.d/ +cat << EOF > %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf [Service] # ensure tty1 isn't cleared (bnc#804158) TTYVTDisallocate=no @@ -586,15 +592,15 @@ EOF # create drop-in to prevent delegate=yes for root user (bsc#954765, # bnc#953241, fate#320421) -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/user@0.service.d/ -cat >%{buildroot}%{_prefix}/lib/systemd/system/user@0.service.d/nodelagate.conf <%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <%{buildroot}%{_prefix}/lib/systemd/system-preset/99-default.preset +rm -f %{buildroot}%{_presetdir}/*.preset +echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored @@ -652,7 +658,7 @@ if [ $1 -eq 1 ]; then chmod 666 %{_sysconfdir}/machine-id fi -%sysusers_create /usr/lib/sysusers.d/systemd.conf +%sysusers_create %{_sysusersdir}/systemd.conf %if ! 0%{?bootstrap} pam-config -a --systemd || : %endif @@ -664,21 +670,16 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. -if [ $1 -eq 1 ]; then - # Enable systemd services according to the distro defaults. - # Note: systemctl might abort prematurely if it fails on one - # unit. - systemctl preset remote-fs.target || : - systemctl preset getty@.service || : - systemctl preset systemd-timesyncd.service || : +%systemd_post remote-fs.target +%systemd_post getty@.service +%systemd_post systemd-timesyncd.service %if %{with networkd} - systemctl preset systemd-networkd.service || : - systemctl preset systemd-networkd-wait-online.service || : +%systemd_post systemd-networkd.service +%systemd_post systemd-networkd-wait-online.service %endif %if %{with resolved} - systemctl preset systemd-resolved.service || : +%systemd_post systemd-resolved.service %endif -fi >/dev/null # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have @@ -712,6 +713,15 @@ if [ $1 -gt 1 ]; then # tmpfiles_create macro previously however it's empty so there # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : + + # Migrate i18n setting stuff thout could be previously + # configured in /etc/sysconfig but now is defined only in the + # systemd official places (/etc/locale.conf, + # /etc/vconsole.conf, etc...). This is done only once. + test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { + %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && + touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : + } fi %postun @@ -800,8 +810,8 @@ fi %service_add_pre systemd-journal-upload.service %post journal-remote -%sysusers_create %{_libexecdir}/sysusers.d/systemd-remote.conf -%tmpfiles_create %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%sysusers_create %{_sysusersdir}/systemd-remote.conf +%tmpfiles_create %{_tmpfilesdir}/systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -874,29 +884,29 @@ fi %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system %if %{with journal_remote} -%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* -%exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.* -%exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.* +%exclude %{_unitdir}/systemd-journal-gatewayd.* +%exclude %{_unitdir}/systemd-journal-remote.* +%exclude %{_unitdir}/systemd-journal-upload.* %exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif %exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd -%exclude %{_prefix}/lib/systemd/system/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service -%{_prefix}/lib/systemd/system/*.automount -%{_prefix}/lib/systemd/system/*.service -%{_prefix}/lib/systemd/system/*.slice -%{_prefix}/lib/systemd/system/*.target -%{_prefix}/lib/systemd/system/*.mount -%{_prefix}/lib/systemd/system/*.timer -%{_prefix}/lib/systemd/system/*.socket -%{_prefix}/lib/systemd/system/*.wants -%{_prefix}/lib/systemd/system/*.path -%{_prefix}/lib/systemd/user/*.target -%{_prefix}/lib/systemd/user/*.service +%exclude %{_unitdir}/systemd-udev*.* +%exclude %{_unitdir}/*.target.wants/systemd-udev*.* +%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%{_unitdir}/*.automount +%{_unitdir}/*.service +%{_unitdir}/*.slice +%{_unitdir}/*.target +%{_unitdir}/*.mount +%{_unitdir}/*.timer +%{_unitdir}/*.socket +%{_unitdir}/*.wants +%{_unitdir}/*.path +%{_userunitdir}/*.target +%{_userunitdir}/*.service %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so @@ -904,21 +914,22 @@ fi %{_prefix}/lib/systemd/resolv.conf %endif %{_prefix}/lib/systemd/scripts -%dir %{_prefix}/lib/systemd/catalog -%{_prefix}/lib/systemd/catalog/systemd.catalog -%{_prefix}/lib/systemd/catalog/systemd.*.catalog -%{_prefix}/lib/systemd/system-preset -%{_prefix}/lib/systemd/user-preset -%{_prefix}/lib/systemd/system-generators -%{_prefix}/lib/systemd/user-generators -%{_prefix}/lib/systemd/user-environment-generators -%dir %{_prefix}/lib/systemd/ntp-units.d/ +%dir %{_journalcatalogdir} +%{_journalcatalogdir}/systemd.catalog +%{_journalcatalogdir}/systemd.*.catalog +%{_presetdir} +%{_userpresetdir} +%{_systemdgeneratordir} +%{_systemdusergeneratordir} +%{_systemd_system_env_generator_dir} +%{_systemd_user_env_generator_dir} +%dir %{_ntpunitsdir} %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d -%dir %{_prefix}/lib/systemd/system/user@0.service.d -%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf -%{_prefix}/lib/systemd/system/user@0.service.d/nodelagate.conf +%dir %{_unitdir}/getty@tty1.service.d +%dir %{_unitdir}/user@0.service.d +%{_unitdir}/getty@tty1.service.d/noclear.conf +%{_unitdir}/user@0.service.d/nodelagate.conf %if %{with importd} %{_prefix}/lib/systemd/import-pubring.gpg %endif @@ -935,23 +946,23 @@ fi %dir %{_sysconfdir}/modules-load.d %{_libexecdir}/modules-load.d/sg.conf -%{_libexecdir}/sysusers.d/ +%{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d -%{_libexecdir}/tmpfiles.d/ +%{_tmpfilesdir}/ %if %{with journal_remote} -%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf -%exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%exclude %{_sysusersdir}/systemd-remote.conf +%exclude %{_tmpfilesdir}/systemd-remote.conf %endif %{_libexecdir}/environment.d/ -%dir %{_libexecdir}/binfmt.d +%dir %{_binfmtdir} %dir %{_sysconfdir}/binfmt.d -%dir %{_libexecdir}/sysctl.d +%dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d -%{_prefix}/lib/sysctl.d/50-coredump.conf +%{_sysctldir}/50-coredump.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d @@ -1073,10 +1084,10 @@ fi %endif %{_docdir}/systemd -%{_prefix}/lib/udev/rules.d/70-uaccess.rules -%{_prefix}/lib/udev/rules.d/71-seat.rules -%{_prefix}/lib/udev/rules.d/73-seat-late.rules -%{_prefix}/lib/udev/rules.d/99-systemd.rules +%{_udevrulesdir}/70-uaccess.rules +%{_udevrulesdir}/71-seat.rules +%{_udevrulesdir}/73-seat-late.rules +%{_udevrulesdir}/99-systemd.rules %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated @@ -1138,13 +1149,13 @@ fi %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/remount-tmpfs %ghost %{_prefix}/lib/udev/compat-symlink-generation -%dir %{_prefix}/lib/udev/rules.d/ -%exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules -%exclude %{_prefix}/lib/udev/rules.d/71-seat.rules -%exclude %{_prefix}/lib/udev/rules.d/73-seat-late.rules -%exclude %{_prefix}/lib/udev/rules.d/99-systemd.rules -%{_prefix}/lib/udev/rules.d/*.rules -%{_prefix}/lib/udev/hwdb.d/ +%dir %{_udevrulesdir}/ +%exclude %{_udevrulesdir}/70-uaccess.rules +%exclude %{_udevrulesdir}/71-seat.rules +%exclude %{_udevrulesdir}/73-seat-late.rules +%exclude %{_udevrulesdir}/99-systemd.rules +%{_udevrulesdir}/*.rules +%{_udevhwdbdir}/ %{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ @@ -1160,13 +1171,13 @@ fi %endif %dir %{_prefix}/lib/systemd/system %{_prefix}/lib/systemd/systemd-udevd -%{_prefix}/lib/systemd/system/systemd-udev*.service -%{_prefix}/lib/systemd/system/systemd-udevd*.socket -%{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service -%dir %{_prefix}/lib/systemd/system/sysinit.target.wants -%{_prefix}/lib/systemd/system/sysinit.target.wants/systemd-udev*.service -%dir %{_prefix}/lib/systemd/system/sockets.target.wants -%{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket +%{_unitdir}/systemd-udev*.service +%{_unitdir}/systemd-udevd*.socket +%{_unitdir}/initrd-udevadm-cleanup-db.service +%dir %{_unitdir}/sysinit.target.wants +%{_unitdir}/sysinit.target.wants/systemd-udev*.service +%dir %{_unitdir}/sockets.target.wants +%{_unitdir}/sockets.target.wants/systemd-udev*.socket %dir %{_prefix}/lib/systemd/network %{_prefix}/lib/systemd/network/*.link %if %{with networkd} @@ -1231,14 +1242,14 @@ fi %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf %config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf -%{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* -%{_prefix}/lib/systemd/system/systemd-journal-remote.* -%{_prefix}/lib/systemd/system/systemd-journal-upload.* +%{_unitdir}/systemd-journal-gatewayd.* +%{_unitdir}/systemd-journal-remote.* +%{_unitdir}/systemd-journal-upload.* %{_prefix}/lib/systemd/systemd-journal-gatewayd %{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-upload -%{_libexecdir}/sysusers.d/systemd-remote.conf -%{_libexecdir}/tmpfiles.d/systemd-remote.conf +%{_sysusersdir}/systemd-remote.conf +%{_tmpfilesdir}/systemd-remote.conf %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* diff --git a/systemd.changes b/systemd.changes index 4b3c533d..fa988b4c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,63 @@ +------------------------------------------------------------------- +Mon Feb 19 14:26:51 UTC 2018 - fbui@suse.com + +- Import commit 295ead0f396beb2b5199abd99a17e274c2581f95 + + f4f94ab2e meson: install rules/80-hotplug-cpu-mem.rules + 2901aa9b9 meson: install rules/60-ssd-scheduler.rules + 1293c0056 core: use id unit when retrieving unit file state (#8038) (bsc#1075801) + 596b2b241 Revert "vconsole-setup: add SUSE specific settings for font/keyboard in sysconfig" + 0b595da04 Revert "locale-setup: handle locale at boot time well" + +------------------------------------------------------------------- +Mon Feb 19 14:24:52 UTC 2018 - fbui@suse.com + +- Re-enable systemd-firstboot + + It's used by the installer and also by JeOS. + +------------------------------------------------------------------- +Mon Feb 19 09:25:30 UTC 2018 - fbui@suse.com + +- Use %systemd_post in %post + +------------------------------------------------------------------- +Mon Feb 19 09:15:04 UTC 2018 - fbui@suse.com + +- Own /usr/lib/systemd/system-environment-generators directory + +------------------------------------------------------------------- +Mon Feb 19 09:10:03 UTC 2018 - fbui@suse.com + +- More systemd rpm macro usages + +------------------------------------------------------------------- +Tue Feb 13 17:11:44 UTC 2018 - fbui@suse.com + +- Disable systemd-firstboot + + I don't think there's any use case for it currently. + +------------------------------------------------------------------- +Mon Feb 12 16:40:28 UTC 2018 - fbui@suse.com + +- Use systemd rpm macros in paths defined in the specfile + +------------------------------------------------------------------- +Mon Feb 12 15:07:29 UTC 2018 - fbui@suse.com + +- Stop importing i18n settings from /etc/sysconfig (fate#319454) + + Bits taken from SLE15. + +------------------------------------------------------------------- +Mon Feb 12 12:59:53 UTC 2018 - fbui@suse.com + +- Make systemd-timesyncd use the openSUSE NTP servers by default + + Previously systemd-timesyncd used the Google Public NTP servers + time{1..4}.google.com + ------------------------------------------------------------------- Fri Feb 9 14:01:24 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 351d9636..3d9cb358 100644 --- a/systemd.spec +++ b/systemd.spec @@ -147,6 +147,7 @@ Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh +Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh Source1065: udev-remount-tmpfs @@ -256,7 +257,7 @@ Requires: this-is-only-for-build-envs %description -n udev%{?mini} Udev creates and removes device nodes in /dev for devices discovered or removed from the system. It receives events via kernel netlink messages -and dispatches them according to rules in /lib/udev/rules.d/. Matching +and dispatches them according to rules in %{_udevrulesdir}/. Matching rules may name a device node, create additional symlinks to the node, call tools to initialize a device, or load needed kernel modules. @@ -404,6 +405,8 @@ Some systemd commands offer bash completion, but it is an optional dependency. # %autopatch -p1 %build +opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) + # keep split-usr until all packages have moved their systemd rules to /usr %meson \ -Ddocdir=%{_docdir}/systemd \ @@ -414,6 +417,7 @@ Some systemd commands offer bash completion, but it is an optional dependency. -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ + -Dntp-servers="${opensuse_ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ -Dhalt-local=/etc/init.d/halt.local \ -Ddebug-shell=/bin/bash \ @@ -474,7 +478,7 @@ install -m0755 -D %{S:1065} %{buildroot}/%{_prefix}/lib/udev/remount-tmpfs # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... -for s in %{S:100} %{S:101}; do +for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done for s in %{S:200}; do @@ -499,11 +503,11 @@ install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ # Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs # by default on SUSE distros. We still keep a copy in /var for those # who want to switch to tmpfs: it's still can be copied in /etc. -rm %{buildroot}/%{_prefix}/lib/systemd/system/local-fs.target.wants/tmp.mount -mv %{buildroot}/%{_prefix}/lib/systemd/system/tmp.mount %{buildroot}/%{_datadir}/systemd/ +rm %{buildroot}/%{_unitdir}/local-fs.target.wants/tmp.mount +mv %{buildroot}/%{_unitdir}/tmp.mount %{buildroot}/%{_datadir}/systemd/ # don't enable wall ask password service, it spams every console (bnc#747783) -rm %{buildroot}%{_prefix}/lib/systemd/system/multi-user.target.wants/systemd-ask-password-wall.path +rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path # create %%{_libexecdir}/modules-load.d mkdir -p %{buildroot}%{_libexecdir}/modules-load.d @@ -514,11 +518,11 @@ EOF # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) -rm -f %{buildroot}%{_prefix}/lib/sysctl.d/50-default.conf +rm -f %{buildroot}%{_sysctldir}/50-default.conf # The definition of the basic users/groups are defined by system-user # on SUSE (bsc#1006978). -rm -f %{buildroot}%{_prefix}/lib/sysusers.d/basic.conf +rm -f %{buildroot}%{_sysusersdir}/basic.conf # Remove README file in init.d as (SUSE) rpm requires executable files # in this directory... oh well. @@ -529,7 +533,7 @@ rm -f %{buildroot}/etc/init.d/README %if ! %{with journal_remote} rm -f %{buildroot}%{_sysconfdir}/systemd/journal-upload.conf rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload -rm -f %{buildroot}%{_prefix}/lib/systemd/system/systemd-journal-upload.* +rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.* %endif # legacy link @@ -552,31 +556,33 @@ touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin # Make sure the NTP units dir exists -mkdir -p %{buildroot}%{_prefix}/lib/systemd/ntp-units.d/ +mkdir -p %{buildroot}%{_ntpunitsdir} # Make sure the shutdown/sleep drop-in dirs exist mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/ # Make sure these directories are properly owned -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/basic.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/default.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/dbus.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/halt.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/kexec.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/poweroff.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/reboot.target.wants -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/shutdown.target.wants +mkdir -p %{buildroot}%{_unitdir}/basic.target.wants +mkdir -p %{buildroot}%{_unitdir}/default.target.wants +mkdir -p %{buildroot}%{_unitdir}/dbus.target.wants +mkdir -p %{buildroot}%{_unitdir}/halt.target.wants +mkdir -p %{buildroot}%{_unitdir}/kexec.target.wants +mkdir -p %{buildroot}%{_unitdir}/poweroff.target.wants +mkdir -p %{buildroot}%{_unitdir}/reboot.target.wants +mkdir -p %{buildroot}%{_unitdir}/shutdown.target.wants # Make sure the generator directories are created and properly owned. -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-generators -mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-generators -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-preset -mkdir -p %{buildroot}%{_prefix}/lib/systemd/user-preset +mkdir -p %{buildroot}%{_systemdgeneratordir} +mkdir -p %{buildroot}%{_systemdusergeneratordir} +mkdir -p %{buildroot}%{_presetdir} +mkdir -p %{buildroot}%{_userpresetdir} +mkdir -p %{buildroot}%{_systemd_system_env_generator_dir} +mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} # create drop-in to prevent tty1 to be cleared (bnc#804158) -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/ -cat << EOF > %{buildroot}%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf +mkdir -p %{buildroot}%{_unitdir}/getty@tty1.service.d/ +cat << EOF > %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf [Service] # ensure tty1 isn't cleared (bnc#804158) TTYVTDisallocate=no @@ -584,15 +590,15 @@ EOF # create drop-in to prevent delegate=yes for root user (bsc#954765, # bnc#953241, fate#320421) -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system/user@0.service.d/ -cat >%{buildroot}%{_prefix}/lib/systemd/system/user@0.service.d/nodelagate.conf <%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <%{buildroot}%{_prefix}/lib/systemd/system-preset/99-default.preset +rm -f %{buildroot}%{_presetdir}/*.preset +echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored @@ -650,7 +656,7 @@ if [ $1 -eq 1 ]; then chmod 666 %{_sysconfdir}/machine-id fi -%sysusers_create /usr/lib/sysusers.d/systemd.conf +%sysusers_create %{_sysusersdir}/systemd.conf %if ! 0%{?bootstrap} pam-config -a --systemd || : %endif @@ -662,21 +668,16 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. -if [ $1 -eq 1 ]; then - # Enable systemd services according to the distro defaults. - # Note: systemctl might abort prematurely if it fails on one - # unit. - systemctl preset remote-fs.target || : - systemctl preset getty@.service || : - systemctl preset systemd-timesyncd.service || : +%systemd_post remote-fs.target +%systemd_post getty@.service +%systemd_post systemd-timesyncd.service %if %{with networkd} - systemctl preset systemd-networkd.service || : - systemctl preset systemd-networkd-wait-online.service || : +%systemd_post systemd-networkd.service +%systemd_post systemd-networkd-wait-online.service %endif %if %{with resolved} - systemctl preset systemd-resolved.service || : +%systemd_post systemd-resolved.service %endif -fi >/dev/null # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have @@ -710,6 +711,15 @@ if [ $1 -gt 1 ]; then # tmpfiles_create macro previously however it's empty so there # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : + + # Migrate i18n setting stuff thout could be previously + # configured in /etc/sysconfig but now is defined only in the + # systemd official places (/etc/locale.conf, + # /etc/vconsole.conf, etc...). This is done only once. + test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { + %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && + touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : + } fi %postun @@ -798,8 +808,8 @@ fi %service_add_pre systemd-journal-upload.service %post journal-remote -%sysusers_create %{_libexecdir}/sysusers.d/systemd-remote.conf -%tmpfiles_create %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%sysusers_create %{_sysusersdir}/systemd-remote.conf +%tmpfiles_create %{_tmpfilesdir}/systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -872,29 +882,29 @@ fi %dir %{_prefix}/lib/systemd/user %dir %{_prefix}/lib/systemd/system %if %{with journal_remote} -%exclude %{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* -%exclude %{_prefix}/lib/systemd/system/systemd-journal-remote.* -%exclude %{_prefix}/lib/systemd/system/systemd-journal-upload.* +%exclude %{_unitdir}/systemd-journal-gatewayd.* +%exclude %{_unitdir}/systemd-journal-remote.* +%exclude %{_unitdir}/systemd-journal-upload.* %exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif %exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd -%exclude %{_prefix}/lib/systemd/system/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/*.target.wants/systemd-udev*.* -%exclude %{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service -%{_prefix}/lib/systemd/system/*.automount -%{_prefix}/lib/systemd/system/*.service -%{_prefix}/lib/systemd/system/*.slice -%{_prefix}/lib/systemd/system/*.target -%{_prefix}/lib/systemd/system/*.mount -%{_prefix}/lib/systemd/system/*.timer -%{_prefix}/lib/systemd/system/*.socket -%{_prefix}/lib/systemd/system/*.wants -%{_prefix}/lib/systemd/system/*.path -%{_prefix}/lib/systemd/user/*.target -%{_prefix}/lib/systemd/user/*.service +%exclude %{_unitdir}/systemd-udev*.* +%exclude %{_unitdir}/*.target.wants/systemd-udev*.* +%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%{_unitdir}/*.automount +%{_unitdir}/*.service +%{_unitdir}/*.slice +%{_unitdir}/*.target +%{_unitdir}/*.mount +%{_unitdir}/*.timer +%{_unitdir}/*.socket +%{_unitdir}/*.wants +%{_unitdir}/*.path +%{_userunitdir}/*.target +%{_userunitdir}/*.service %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so @@ -902,21 +912,22 @@ fi %{_prefix}/lib/systemd/resolv.conf %endif %{_prefix}/lib/systemd/scripts -%dir %{_prefix}/lib/systemd/catalog -%{_prefix}/lib/systemd/catalog/systemd.catalog -%{_prefix}/lib/systemd/catalog/systemd.*.catalog -%{_prefix}/lib/systemd/system-preset -%{_prefix}/lib/systemd/user-preset -%{_prefix}/lib/systemd/system-generators -%{_prefix}/lib/systemd/user-generators -%{_prefix}/lib/systemd/user-environment-generators -%dir %{_prefix}/lib/systemd/ntp-units.d/ +%dir %{_journalcatalogdir} +%{_journalcatalogdir}/systemd.catalog +%{_journalcatalogdir}/systemd.*.catalog +%{_presetdir} +%{_userpresetdir} +%{_systemdgeneratordir} +%{_systemdusergeneratordir} +%{_systemd_system_env_generator_dir} +%{_systemd_user_env_generator_dir} +%dir %{_ntpunitsdir} %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -%dir %{_prefix}/lib/systemd/system/getty@tty1.service.d -%dir %{_prefix}/lib/systemd/system/user@0.service.d -%{_prefix}/lib/systemd/system/getty@tty1.service.d/noclear.conf -%{_prefix}/lib/systemd/system/user@0.service.d/nodelagate.conf +%dir %{_unitdir}/getty@tty1.service.d +%dir %{_unitdir}/user@0.service.d +%{_unitdir}/getty@tty1.service.d/noclear.conf +%{_unitdir}/user@0.service.d/nodelagate.conf %if %{with importd} %{_prefix}/lib/systemd/import-pubring.gpg %endif @@ -933,23 +944,23 @@ fi %dir %{_sysconfdir}/modules-load.d %{_libexecdir}/modules-load.d/sg.conf -%{_libexecdir}/sysusers.d/ +%{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d -%{_libexecdir}/tmpfiles.d/ +%{_tmpfilesdir}/ %if %{with journal_remote} -%exclude %{_libexecdir}/sysusers.d/systemd-remote.conf -%exclude %{_libexecdir}/tmpfiles.d/systemd-remote.conf +%exclude %{_sysusersdir}/systemd-remote.conf +%exclude %{_tmpfilesdir}/systemd-remote.conf %endif %{_libexecdir}/environment.d/ -%dir %{_libexecdir}/binfmt.d +%dir %{_binfmtdir} %dir %{_sysconfdir}/binfmt.d -%dir %{_libexecdir}/sysctl.d +%dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d -%{_prefix}/lib/sysctl.d/50-coredump.conf +%{_sysctldir}/50-coredump.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d @@ -1071,10 +1082,10 @@ fi %endif %{_docdir}/systemd -%{_prefix}/lib/udev/rules.d/70-uaccess.rules -%{_prefix}/lib/udev/rules.d/71-seat.rules -%{_prefix}/lib/udev/rules.d/73-seat-late.rules -%{_prefix}/lib/udev/rules.d/99-systemd.rules +%{_udevrulesdir}/70-uaccess.rules +%{_udevrulesdir}/71-seat.rules +%{_udevrulesdir}/73-seat-late.rules +%{_udevrulesdir}/99-systemd.rules %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated @@ -1136,13 +1147,13 @@ fi %{_prefix}/lib/udev/v4l_id %{_prefix}/lib/udev/remount-tmpfs %ghost %{_prefix}/lib/udev/compat-symlink-generation -%dir %{_prefix}/lib/udev/rules.d/ -%exclude %{_prefix}/lib/udev/rules.d/70-uaccess.rules -%exclude %{_prefix}/lib/udev/rules.d/71-seat.rules -%exclude %{_prefix}/lib/udev/rules.d/73-seat-late.rules -%exclude %{_prefix}/lib/udev/rules.d/99-systemd.rules -%{_prefix}/lib/udev/rules.d/*.rules -%{_prefix}/lib/udev/hwdb.d/ +%dir %{_udevrulesdir}/ +%exclude %{_udevrulesdir}/70-uaccess.rules +%exclude %{_udevrulesdir}/71-seat.rules +%exclude %{_udevrulesdir}/73-seat-late.rules +%exclude %{_udevrulesdir}/99-systemd.rules +%{_udevrulesdir}/*.rules +%{_udevhwdbdir}/ %{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ @@ -1158,13 +1169,13 @@ fi %endif %dir %{_prefix}/lib/systemd/system %{_prefix}/lib/systemd/systemd-udevd -%{_prefix}/lib/systemd/system/systemd-udev*.service -%{_prefix}/lib/systemd/system/systemd-udevd*.socket -%{_prefix}/lib/systemd/system/initrd-udevadm-cleanup-db.service -%dir %{_prefix}/lib/systemd/system/sysinit.target.wants -%{_prefix}/lib/systemd/system/sysinit.target.wants/systemd-udev*.service -%dir %{_prefix}/lib/systemd/system/sockets.target.wants -%{_prefix}/lib/systemd/system/sockets.target.wants/systemd-udev*.socket +%{_unitdir}/systemd-udev*.service +%{_unitdir}/systemd-udevd*.socket +%{_unitdir}/initrd-udevadm-cleanup-db.service +%dir %{_unitdir}/sysinit.target.wants +%{_unitdir}/sysinit.target.wants/systemd-udev*.service +%dir %{_unitdir}/sockets.target.wants +%{_unitdir}/sockets.target.wants/systemd-udev*.socket %dir %{_prefix}/lib/systemd/network %{_prefix}/lib/systemd/network/*.link %if %{with networkd} @@ -1229,14 +1240,14 @@ fi %defattr(-, root, root) %config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf %config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf -%{_prefix}/lib/systemd/system/systemd-journal-gatewayd.* -%{_prefix}/lib/systemd/system/systemd-journal-remote.* -%{_prefix}/lib/systemd/system/systemd-journal-upload.* +%{_unitdir}/systemd-journal-gatewayd.* +%{_unitdir}/systemd-journal-remote.* +%{_unitdir}/systemd-journal-upload.* %{_prefix}/lib/systemd/systemd-journal-gatewayd %{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-upload -%{_libexecdir}/sysusers.d/systemd-remote.conf -%{_libexecdir}/tmpfiles.d/systemd-remote.conf +%{_sysusersdir}/systemd-remote.conf +%{_tmpfilesdir}/systemd-remote.conf %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* From 7525bb9ab96aba80899c99f37c96d4540699f29229ecb1a9b9547ba26f43c9b8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 28 Feb 2018 18:56:02 +0000 Subject: [PATCH 015/124] Accepting request 580183 from Base:System OBS-URL: https://build.opensuse.org/request/show/580183 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=273 --- systemd-mini.changes | 34 +++++++++- systemd-mini.spec | 146 ++++++++++++++++++++++++++++++------------- systemd.changes | 34 +++++++++- systemd.spec | 146 ++++++++++++++++++++++++++++++------------- 4 files changed, 270 insertions(+), 90 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index fa988b4c..b10856aa 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com + +- Fix build errors due to the split-off of systemd-containe: + + found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64: + - /usr/share/man/man5/systemd.nspawn.5.gz + - /usr/share/man/man1/systemd-nspawn.1.gz + found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64: + - /usr/bin/systemd-nspawn + - /usr/lib/systemd/system/systemd-nspawn@.service + - /usr/lib/tmpfiles.d/systemd-nspawn.conf + +------------------------------------------------------------------- +Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com + +- Use %license (boo#1082318) + +------------------------------------------------------------------- +Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com + +- Split systemd-container sub-package off + + Other distros already do it and it seems a good idea to not install + this stuff on new installations by default. At least + /var/lib/machines subvol is not created anymore at boot even if it + wasn't used at all. + ------------------------------------------------------------------- Mon Feb 19 14:26:51 UTC 2018 - fbui@suse.com @@ -75,13 +103,13 @@ Fri Feb 9 07:59:56 UTC 2018 - fbui@suse.com The previous fix couldn't work on platforms using a RO rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but - we still ship a copy in /var. + we still ship a copy in /usr/share/systemd. Users who want to use tmpfs on /tmp are supposed to add a symlink in - /etc/ pointing to the copy shipped in /var. + /etc/ pointing to the copy shipped in /usr/share/systemd. To support the update path we automatically create the symlink if - tmp.mount in use is located in /usr. + tmp.mount in use is located in /usr/lib/systemd. ------------------------------------------------------------------- Tue Feb 6 16:11:40 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index cea9627c..c627c00b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -293,6 +293,20 @@ Conflicts: libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. +%package container +Summary: Systemd tools for container management +License: LGPL-2.1+ +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires +Provides: systemd:%{_bindir}/systemd-nspawn + +%description container +Systemd tools to spawn and manage containers and virtual machines. + +This package contains systemd-nspawn, machinectl, systemd-machined, +and systemd-importd. + %if ! 0%{?bootstrap} %package logger Summary: Journal only logging @@ -461,6 +475,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm %{buildroot}%{_bindir}/systemd-nspawn +rm %{buildroot}%{_unitdir}/systemd-nspawn@.service +rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -697,23 +714,6 @@ done %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : if [ $1 -gt 1 ]; then - # Convert /var/lib/machines subvolume to make it suitable for - # rollbacks, if needed. See bsc#992573. The installer has been fixed - # to create it at installation time. - # - # The convertion might only be problematic for openSUSE distros - # (TW/Factory) where previous versions had already created the - # subvolume at the wrong place (via tmpfiles for example) and user - # started to populate and use it. In this case we'll let the user fix - # it manually. - # - # For SLE12 this subvolume was only introduced during the upgrade from - # v210 to v228 when we added this workaround. Note that the subvolume - # is still created at the wrong place due to the call to - # tmpfiles_create macro previously however it's empty so there - # shouldn't be any issues. - %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : - # Migrate i18n setting stuff thout could be previously # configured in /etc/sysconfig but now is defined only in the # systemd official places (/etc/locale.conf, @@ -779,6 +779,26 @@ systemctl daemon-reload || : %postun -n libsystemd0%{?mini} -p /sbin/ldconfig %if ! 0%{?bootstrap} +%post container +if [ $1 -gt 1 ]; then + # Convert /var/lib/machines subvolume to make it suitable for + # rollbacks, if needed. See bsc#992573. The installer has been fixed + # to create it at installation time. + # + # The convertion might only be problematic for openSUSE distros + # (TW/Factory) where previous versions had already created the + # subvolume at the wrong place (via tmpfiles for example) and user + # started to populate and use it. In this case we'll let the user fix + # it manually. + # + # For SLE12 this subvolume was only introduced during the upgrade from + # v210 to v228 when we added this workaround. Note that the subvolume + # is still created at the wrong place due to the call to + # tmpfiles_create macro previously however it's empty so there + # shouldn't be any issues. + %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : +fi + %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -831,6 +851,7 @@ fi %files -f systemd.lang %defattr(-,root,root) +%license LICENSE* /bin/systemd /bin/systemd-ask-password /bin/systemctl @@ -842,9 +863,6 @@ fi %{_bindir}/kernel-install %{_bindir}/hostnamectl %{_bindir}/localectl -%if %{with machined} -%{_bindir}/machinectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/coredumpctl @@ -864,7 +882,6 @@ fi %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%{_bindir}/systemd-nspawn %if %{with resolved} %{_bindir}/systemd-resolve %endif @@ -896,6 +913,24 @@ fi %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/systemd-nspawn@.service +%if %{with machined} +%exclude %{_prefix}/lib/systemd/systemd-machined +%exclude %{_unitdir}/systemd-machined.service +%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service +%exclude %{_unitdir}/var-lib-machines.mount +%exclude %{_unitdir}/machine.slice +%exclude %{_unitdir}/machines.target* +%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount +%endif +%if %{with importd} +%exclude %{_prefix}/lib/systemd/systemd-import* +%exclude %{_prefix}/lib/systemd/systemd-pull +%exclude %{_prefix}/lib/systemd/import-pubring.gpg +%exclude %{_unitdir}/systemd-importd.service +%exclude %{_unitdir}/dbus-org.freedesktop.import1.service +%endif + %{_unitdir}/*.automount %{_unitdir}/*.service %{_unitdir}/*.slice @@ -914,6 +949,7 @@ fi %{_prefix}/lib/systemd/resolv.conf %endif %{_prefix}/lib/systemd/scripts +%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} %{_journalcatalogdir}/systemd.catalog %{_journalcatalogdir}/systemd.*.catalog @@ -930,9 +966,6 @@ fi %dir %{_unitdir}/user@0.service.d %{_unitdir}/getty@tty1.service.d/noclear.conf %{_unitdir}/user@0.service.d/nodelagate.conf -%if %{with importd} -%{_prefix}/lib/systemd/import-pubring.gpg -%endif /%{_lib}/security/pam_systemd.so %if %{with gnuefi} @@ -949,6 +982,7 @@ fi %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d %{_tmpfilesdir}/ +%exclude %{_tmpfilesdir}/systemd-nspawn.conf %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf @@ -998,9 +1032,6 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf -%if %{with machined} -%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf -%endif %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf @@ -1009,9 +1040,6 @@ fi %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif -%if %{with importd} -%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf -%endif # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf @@ -1043,12 +1071,6 @@ fi %if %{with resolved} %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %endif -%if %{with machined} -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service -%endif -%if %{with importd} -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1057,12 +1079,6 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with machined} -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy -%endif -%if %{with importd} -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif @@ -1081,6 +1097,14 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man*/*nspawn* +%if %{with machined} +%exclude %{_mandir}/man*/machinectl* +%exclude %{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%exclude %{_mandir}/man*/systemd-importd* +%endif %endif %{_docdir}/systemd @@ -1203,6 +1227,44 @@ fi %endif %if ! 0%{?bootstrap} +%files container +%defattr(-,root,root) +%{_bindir}/systemd-nspawn +%{_unitdir}/systemd-nspawn@.service +%{_tmpfilesdir}/systemd-nspawn.conf +%if %{with machined} +%{_bindir}/machinectl +%{_prefix}/lib/systemd/systemd-machined +%{_unitdir}/systemd-machined.service +%{_unitdir}/dbus-org.freedesktop.machine1.service +%{_unitdir}/var-lib-machines.mount +%{_unitdir}/machine.slice +%{_unitdir}/machines.target* +%{_unitdir}/*.target.wants/var-lib-machines.mount +%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service +%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%endif +%if %{with importd} +%{_prefix}/lib/systemd/systemd-import* +%{_prefix}/lib/systemd/systemd-pull +%{_prefix}/lib/systemd/import-pubring.gpg +%{_unitdir}/systemd-importd.service +%{_unitdir}/dbus-org.freedesktop.import1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service +%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy +%endif +%{_mandir}/man*/*nspawn* +%if %{with machined} +%{_mandir}/man*/machinectl* +%{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%{_mandir}/man*/systemd-importd* +%endif + %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ diff --git a/systemd.changes b/systemd.changes index fa988b4c..b10856aa 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,31 @@ +------------------------------------------------------------------- +Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com + +- Fix build errors due to the split-off of systemd-containe: + + found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64: + - /usr/share/man/man5/systemd.nspawn.5.gz + - /usr/share/man/man1/systemd-nspawn.1.gz + found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64: + - /usr/bin/systemd-nspawn + - /usr/lib/systemd/system/systemd-nspawn@.service + - /usr/lib/tmpfiles.d/systemd-nspawn.conf + +------------------------------------------------------------------- +Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com + +- Use %license (boo#1082318) + +------------------------------------------------------------------- +Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com + +- Split systemd-container sub-package off + + Other distros already do it and it seems a good idea to not install + this stuff on new installations by default. At least + /var/lib/machines subvol is not created anymore at boot even if it + wasn't used at all. + ------------------------------------------------------------------- Mon Feb 19 14:26:51 UTC 2018 - fbui@suse.com @@ -75,13 +103,13 @@ Fri Feb 9 07:59:56 UTC 2018 - fbui@suse.com The previous fix couldn't work on platforms using a RO rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but - we still ship a copy in /var. + we still ship a copy in /usr/share/systemd. Users who want to use tmpfs on /tmp are supposed to add a symlink in - /etc/ pointing to the copy shipped in /var. + /etc/ pointing to the copy shipped in /usr/share/systemd. To support the update path we automatically create the symlink if - tmp.mount in use is located in /usr. + tmp.mount in use is located in /usr/lib/systemd. ------------------------------------------------------------------- Tue Feb 6 16:11:40 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 3d9cb358..95da200d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -291,6 +291,20 @@ Conflicts: libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. +%package container +Summary: Systemd tools for container management +License: LGPL-2.1+ +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires +Provides: systemd:%{_bindir}/systemd-nspawn + +%description container +Systemd tools to spawn and manage containers and virtual machines. + +This package contains systemd-nspawn, machinectl, systemd-machined, +and systemd-importd. + %if ! 0%{?bootstrap} %package logger Summary: Journal only logging @@ -459,6 +473,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm %{buildroot}%{_bindir}/systemd-nspawn +rm %{buildroot}%{_unitdir}/systemd-nspawn@.service +rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -695,23 +712,6 @@ done %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : if [ $1 -gt 1 ]; then - # Convert /var/lib/machines subvolume to make it suitable for - # rollbacks, if needed. See bsc#992573. The installer has been fixed - # to create it at installation time. - # - # The convertion might only be problematic for openSUSE distros - # (TW/Factory) where previous versions had already created the - # subvolume at the wrong place (via tmpfiles for example) and user - # started to populate and use it. In this case we'll let the user fix - # it manually. - # - # For SLE12 this subvolume was only introduced during the upgrade from - # v210 to v228 when we added this workaround. Note that the subvolume - # is still created at the wrong place due to the call to - # tmpfiles_create macro previously however it's empty so there - # shouldn't be any issues. - %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : - # Migrate i18n setting stuff thout could be previously # configured in /etc/sysconfig but now is defined only in the # systemd official places (/etc/locale.conf, @@ -777,6 +777,26 @@ systemctl daemon-reload || : %postun -n libsystemd0%{?mini} -p /sbin/ldconfig %if ! 0%{?bootstrap} +%post container +if [ $1 -gt 1 ]; then + # Convert /var/lib/machines subvolume to make it suitable for + # rollbacks, if needed. See bsc#992573. The installer has been fixed + # to create it at installation time. + # + # The convertion might only be problematic for openSUSE distros + # (TW/Factory) where previous versions had already created the + # subvolume at the wrong place (via tmpfiles for example) and user + # started to populate and use it. In this case we'll let the user fix + # it manually. + # + # For SLE12 this subvolume was only introduced during the upgrade from + # v210 to v228 when we added this workaround. Note that the subvolume + # is still created at the wrong place due to the call to + # tmpfiles_create macro previously however it's empty so there + # shouldn't be any issues. + %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : +fi + %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -829,6 +849,7 @@ fi %files -f systemd.lang %defattr(-,root,root) +%license LICENSE* /bin/systemd /bin/systemd-ask-password /bin/systemctl @@ -840,9 +861,6 @@ fi %{_bindir}/kernel-install %{_bindir}/hostnamectl %{_bindir}/localectl -%if %{with machined} -%{_bindir}/machinectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/coredumpctl @@ -862,7 +880,6 @@ fi %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%{_bindir}/systemd-nspawn %if %{with resolved} %{_bindir}/systemd-resolve %endif @@ -894,6 +911,24 @@ fi %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/systemd-nspawn@.service +%if %{with machined} +%exclude %{_prefix}/lib/systemd/systemd-machined +%exclude %{_unitdir}/systemd-machined.service +%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service +%exclude %{_unitdir}/var-lib-machines.mount +%exclude %{_unitdir}/machine.slice +%exclude %{_unitdir}/machines.target* +%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount +%endif +%if %{with importd} +%exclude %{_prefix}/lib/systemd/systemd-import* +%exclude %{_prefix}/lib/systemd/systemd-pull +%exclude %{_prefix}/lib/systemd/import-pubring.gpg +%exclude %{_unitdir}/systemd-importd.service +%exclude %{_unitdir}/dbus-org.freedesktop.import1.service +%endif + %{_unitdir}/*.automount %{_unitdir}/*.service %{_unitdir}/*.slice @@ -912,6 +947,7 @@ fi %{_prefix}/lib/systemd/resolv.conf %endif %{_prefix}/lib/systemd/scripts +%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} %{_journalcatalogdir}/systemd.catalog %{_journalcatalogdir}/systemd.*.catalog @@ -928,9 +964,6 @@ fi %dir %{_unitdir}/user@0.service.d %{_unitdir}/getty@tty1.service.d/noclear.conf %{_unitdir}/user@0.service.d/nodelagate.conf -%if %{with importd} -%{_prefix}/lib/systemd/import-pubring.gpg -%endif /%{_lib}/security/pam_systemd.so %if %{with gnuefi} @@ -947,6 +980,7 @@ fi %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d %{_tmpfilesdir}/ +%exclude %{_tmpfilesdir}/systemd-nspawn.conf %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf @@ -996,9 +1030,6 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf -%if %{with machined} -%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf -%endif %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf @@ -1007,9 +1038,6 @@ fi %{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif -%if %{with importd} -%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf -%endif # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf @@ -1041,12 +1069,6 @@ fi %if %{with resolved} %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %endif -%if %{with machined} -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service -%endif -%if %{with importd} -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1055,12 +1077,6 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with machined} -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy -%endif -%if %{with importd} -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif @@ -1079,6 +1095,14 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man*/*nspawn* +%if %{with machined} +%exclude %{_mandir}/man*/machinectl* +%exclude %{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%exclude %{_mandir}/man*/systemd-importd* +%endif %endif %{_docdir}/systemd @@ -1201,6 +1225,44 @@ fi %endif %if ! 0%{?bootstrap} +%files container +%defattr(-,root,root) +%{_bindir}/systemd-nspawn +%{_unitdir}/systemd-nspawn@.service +%{_tmpfilesdir}/systemd-nspawn.conf +%if %{with machined} +%{_bindir}/machinectl +%{_prefix}/lib/systemd/systemd-machined +%{_unitdir}/systemd-machined.service +%{_unitdir}/dbus-org.freedesktop.machine1.service +%{_unitdir}/var-lib-machines.mount +%{_unitdir}/machine.slice +%{_unitdir}/machines.target* +%{_unitdir}/*.target.wants/var-lib-machines.mount +%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service +%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%endif +%if %{with importd} +%{_prefix}/lib/systemd/systemd-import* +%{_prefix}/lib/systemd/systemd-pull +%{_prefix}/lib/systemd/import-pubring.gpg +%{_unitdir}/systemd-importd.service +%{_unitdir}/dbus-org.freedesktop.import1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service +%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy +%endif +%{_mandir}/man*/*nspawn* +%if %{with machined} +%{_mandir}/man*/machinectl* +%{_mandir}/man*/systemd-machined* +%endif +%if %{with importd} +%{_mandir}/man*/systemd-importd* +%endif + %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ From 231747a8d44d91946d97d33719d0a768347d775ce3765d6ccdf8873ee1f05780 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 16 Mar 2018 09:38:08 +0000 Subject: [PATCH 016/124] Accepting request 587019 from Base:System OBS-URL: https://build.opensuse.org/request/show/587019 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=274 --- ...cros-rename-noreturn-into-_noreturn_.patch | 201 ++++++++++++++++++ 60-ssd-scheduler.rules | 11 + 80-hotplug-cpu-mem.rules | 24 +++ 99-wakeup-from-idle.rules | 3 + systemd-234.tar.xz | 3 - systemd-237.tar.xz | 3 + systemd-mini.changes | 103 +++++++++ systemd-mini.spec | 90 ++++---- systemd.changes | 103 +++++++++ systemd.spec | 90 ++++---- udev-remount-tmpfs | 15 -- 11 files changed, 550 insertions(+), 96 deletions(-) create mode 100644 0001-basic-macros-rename-noreturn-into-_noreturn_.patch create mode 100644 60-ssd-scheduler.rules create mode 100644 80-hotplug-cpu-mem.rules create mode 100644 99-wakeup-from-idle.rules delete mode 100644 systemd-234.tar.xz create mode 100644 systemd-237.tar.xz delete mode 100644 udev-remount-tmpfs diff --git a/0001-basic-macros-rename-noreturn-into-_noreturn_.patch b/0001-basic-macros-rename-noreturn-into-_noreturn_.patch new file mode 100644 index 00000000..0aaaf258 --- /dev/null +++ b/0001-basic-macros-rename-noreturn-into-_noreturn_.patch @@ -0,0 +1,201 @@ +From 24051a17e8df0976b41180a6d50275e7edf3e461 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Wed, 14 Mar 2018 18:00:24 +0100 +Subject: [PATCH 1/1] basic/macros: rename noreturn into _noreturn_ +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +"noreturn" is reserved and can be used in other header files we include: + + [ 16s] In file included from /usr/include/gcrypt.h:30:0, + [ 16s] from ../src/journal/journal-file.h:26, + [ 16s] from ../src/journal/journal-vacuum.c:31: + [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token + [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2); + +Here we include grcrypt.h (which in turns include gpg-error.h) *after* we +"noreturn" was defined in macro.h. +--- + src/basic/log.c | 4 ++-- + src/basic/log.h | 4 ++-- + src/basic/macro.h | 19 +++++++++---------- + src/basic/process-util.c | 2 +- + src/basic/process-util.h | 2 +- + src/core/main.c | 4 ++-- + src/journal/test-journal-interleaving.c | 2 +- + src/shared/pager.c | 2 +- + src/udev/collect/collect.c | 2 +- + 9 files changed, 20 insertions(+), 21 deletions(-) + +diff --git a/src/basic/log.c b/src/basic/log.c +index 7a7f2cbec..16a2431c5 100644 +--- a/src/basic/log.c ++++ b/src/basic/log.c +@@ -814,7 +814,7 @@ static void log_assert( + log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer); + } + +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -826,7 +826,7 @@ noreturn void log_assert_failed_realm( + abort(); + } + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/log.h b/src/basic/log.h +index efcf0f1bf..314be128a 100644 +--- a/src/basic/log.h ++++ b/src/basic/log.h +@@ -186,7 +186,7 @@ int log_dump_internal( + char *buffer); + + /* Logging for various assertions */ +-noreturn void log_assert_failed_realm( ++_noreturn_ void log_assert_failed_realm( + LogRealm realm, + const char *text, + const char *file, +@@ -195,7 +195,7 @@ noreturn void log_assert_failed_realm( + #define log_assert_failed(text, ...) \ + log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__) + +-noreturn void log_assert_failed_unreachable_realm( ++_noreturn_ void log_assert_failed_unreachable_realm( + LogRealm realm, + const char *text, + const char *file, +diff --git a/src/basic/macro.h b/src/basic/macro.h +index 95be63a20..d8a6432f6 100644 +--- a/src/basic/macro.h ++++ b/src/basic/macro.h +@@ -53,6 +53,15 @@ + #else + #define _fallthrough_ + #endif ++/* Define C11 noreturn without and even on older gcc ++ * compiler versions */ ++#ifndef noreturn ++#if __STDC_VERSION__ >= 201112L ++#define _noreturn_ _Noreturn ++#else ++#define _noreturn_ __attribute__((noreturn)) ++#endif ++#endif + + /* Temporarily disable some warnings */ + #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ +@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { + #endif + #endif + +-/* Define C11 noreturn without and even on older gcc +- * compiler versions */ +-#ifndef noreturn +-#if __STDC_VERSION__ >= 201112L +-#define noreturn _Noreturn +-#else +-#define noreturn __attribute__((noreturn)) +-#endif +-#endif +- + #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \ + static inline void func##p(type *p) { \ + if (*p) \ +diff --git a/src/basic/process-util.c b/src/basic/process-util.c +index aa9846db5..e6120af5b 100644 +--- a/src/basic/process-util.c ++++ b/src/basic/process-util.c +@@ -987,7 +987,7 @@ bool is_main_thread(void) { + return cached > 0; + } + +-noreturn void freeze(void) { ++_noreturn_ void freeze(void) { + + log_close(); + +diff --git a/src/basic/process-util.h b/src/basic/process-util.h +index 93029e36e..5170adec7 100644 +--- a/src/basic/process-util.h ++++ b/src/basic/process-util.h +@@ -91,7 +91,7 @@ int pid_from_same_root_fs(pid_t pid); + + bool is_main_thread(void); + +-noreturn void freeze(void); ++_noreturn_ void freeze(void); + + bool oom_score_adjust_is_valid(int oa); + +diff --git a/src/core/main.c b/src/core/main.c +index 076846a41..4b2d14923 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX; + static sd_id128_t arg_machine_id = {}; + static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE; + +-noreturn static void freeze_or_reboot(void) { ++_noreturn_ static void freeze_or_reboot(void) { + + if (arg_crash_reboot) { + log_notice("Rebooting in 10s..."); +@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) { + freeze(); + } + +-noreturn static void crash(int sig) { ++_noreturn_ static void crash(int sig) { + struct sigaction sa; + pid_t pid; + +diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c +index 5a88b2774..d87bdbdd3 100644 +--- a/src/journal/test-journal-interleaving.c ++++ b/src/journal/test-journal-interleaving.c +@@ -37,7 +37,7 @@ + + static bool arg_keep = false; + +-noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { ++_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { + log_internal(LOG_CRIT, error, file, line, func, + "'%s' failed at %s:%u (%s): %m", text, file, line, func); + abort(); +diff --git a/src/shared/pager.c b/src/shared/pager.c +index 75db3c985..681af9c40 100644 +--- a/src/shared/pager.c ++++ b/src/shared/pager.c +@@ -47,7 +47,7 @@ static int stored_stderr = -1; + static bool stdout_redirected = false; + static bool stderr_redirected = false; + +-noreturn static void pager_fallback(void) { ++_noreturn_ static void pager_fallback(void) { + int r; + + r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0); +diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c +index 2821640e9..c8fa47b3d 100644 +--- a/src/udev/collect/collect.c ++++ b/src/udev/collect/collect.c +@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) + return container_of(node, struct _mate, node); + } + +-noreturn static void sig_alrm(int signo) ++_noreturn_ static void sig_alrm(int signo) + { + exit(4); + } +-- +2.16.2 + diff --git a/60-ssd-scheduler.rules b/60-ssd-scheduler.rules new file mode 100644 index 00000000..43aa8ea7 --- /dev/null +++ b/60-ssd-scheduler.rules @@ -0,0 +1,11 @@ +# do not edit this file, it will be overwritten on update + +ACTION!="add", GOTO="ssd_scheduler_end" +SUBSYSTEM!="block", GOTO="ssd_scheduler_end" + +IMPORT{cmdline}="elevator" +ENV{elevator}=="*?", GOTO="ssd_scheduler_end" + +KERNEL=="sd*[!0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" + +LABEL="ssd_scheduler_end" diff --git a/80-hotplug-cpu-mem.rules b/80-hotplug-cpu-mem.rules new file mode 100644 index 00000000..86a6c272 --- /dev/null +++ b/80-hotplug-cpu-mem.rules @@ -0,0 +1,24 @@ +# do not edit this file, it will be overwritten on update + +# +# Hotplug physical CPU +# +SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" + +# +# Hotplug physical memory. Instances of tmpfs are remounted so their +# size are recalculated. This might be needed if some sizes were +# specified relative to the total amount of memory (boo#869603). For +# now make it simple and remount all tmpfs regardless of how their +# size are specified. It should be handled by the kernel as it has a +# lot of shortcomings anyways (tmpfs mounted by other processes, mount +# namespaces, ...) +# +SUBSYSTEM=="memory", ACTION=="add", PROGRAM=="/usr/bin/systemd-detect-virt", RESULT!="zvm", ATTR{state}=="offline", \ + ATTR{state}="online", \ + RUN+="/bin/sh -c ' \ + while read src dst fs opts unused; do \ + case $fs in \ + tmpfs) mount -o remount \"$dst\" ;; \ + esac \ + done %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf +mkdir %{buildroot}%{_unitdir}/getty@tty1.service.d/ +cat >%{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf <%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <%{buildroot}%{_unitdir}/systemd-logind.service.d/nosandbox.conf < %{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf +mkdir %{buildroot}%{_unitdir}/getty@tty1.service.d/ +cat >%{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf <%{buildroot}%{_unitdir}/user@0.service.d/nodelagate.conf <%{buildroot}%{_unitdir}/systemd-logind.service.d/nosandbox.conf </dev/null 2>&1 - STATE=$? - if [ "$STATE" -gt 0 ]; then - logger "Remount of $i failed with state $STATE" - fi - done -fi From 76e2fc12c5480efbb8594c66148a7fde6820815fa5af52b67bafadcd3d395da2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 30 Mar 2018 10:02:25 +0000 Subject: [PATCH 017/124] Accepting request 592081 from Base:System OBS-URL: https://build.opensuse.org/request/show/592081 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=275 --- ...cros-rename-noreturn-into-_noreturn_.patch | 201 ------------------ _service | 16 ++ systemd-237.tar.xz | 3 - systemd-mini.changes | 83 ++++++++ systemd-mini.spec | 126 ++++++----- systemd-v237+suse.52.g14b3e00c3.tar.xz | 3 + systemd.changes | 83 ++++++++ systemd.spec | 126 ++++++----- 8 files changed, 327 insertions(+), 314 deletions(-) delete mode 100644 0001-basic-macros-rename-noreturn-into-_noreturn_.patch create mode 100644 _service delete mode 100644 systemd-237.tar.xz create mode 100644 systemd-v237+suse.52.g14b3e00c3.tar.xz diff --git a/0001-basic-macros-rename-noreturn-into-_noreturn_.patch b/0001-basic-macros-rename-noreturn-into-_noreturn_.patch deleted file mode 100644 index 0aaaf258..00000000 --- a/0001-basic-macros-rename-noreturn-into-_noreturn_.patch +++ /dev/null @@ -1,201 +0,0 @@ -From 24051a17e8df0976b41180a6d50275e7edf3e461 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Wed, 14 Mar 2018 18:00:24 +0100 -Subject: [PATCH 1/1] basic/macros: rename noreturn into _noreturn_ -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -"noreturn" is reserved and can be used in other header files we include: - - [ 16s] In file included from /usr/include/gcrypt.h:30:0, - [ 16s] from ../src/journal/journal-file.h:26, - [ 16s] from ../src/journal/journal-vacuum.c:31: - [ 16s] /usr/include/gpg-error.h:1544:46: error: expected ‘,’ or ‘;’ before ‘)’ token - [ 16s] void gpgrt_log_bug (const char *fmt, ...) GPGRT_ATTR_NR_PRINTF(1,2); - -Here we include grcrypt.h (which in turns include gpg-error.h) *after* we -"noreturn" was defined in macro.h. ---- - src/basic/log.c | 4 ++-- - src/basic/log.h | 4 ++-- - src/basic/macro.h | 19 +++++++++---------- - src/basic/process-util.c | 2 +- - src/basic/process-util.h | 2 +- - src/core/main.c | 4 ++-- - src/journal/test-journal-interleaving.c | 2 +- - src/shared/pager.c | 2 +- - src/udev/collect/collect.c | 2 +- - 9 files changed, 20 insertions(+), 21 deletions(-) - -diff --git a/src/basic/log.c b/src/basic/log.c -index 7a7f2cbec..16a2431c5 100644 ---- a/src/basic/log.c -+++ b/src/basic/log.c -@@ -814,7 +814,7 @@ static void log_assert( - log_dispatch_internal(level, 0, file, line, func, NULL, NULL, NULL, NULL, buffer); - } - --noreturn void log_assert_failed_realm( -+_noreturn_ void log_assert_failed_realm( - LogRealm realm, - const char *text, - const char *file, -@@ -826,7 +826,7 @@ noreturn void log_assert_failed_realm( - abort(); - } - --noreturn void log_assert_failed_unreachable_realm( -+_noreturn_ void log_assert_failed_unreachable_realm( - LogRealm realm, - const char *text, - const char *file, -diff --git a/src/basic/log.h b/src/basic/log.h -index efcf0f1bf..314be128a 100644 ---- a/src/basic/log.h -+++ b/src/basic/log.h -@@ -186,7 +186,7 @@ int log_dump_internal( - char *buffer); - - /* Logging for various assertions */ --noreturn void log_assert_failed_realm( -+_noreturn_ void log_assert_failed_realm( - LogRealm realm, - const char *text, - const char *file, -@@ -195,7 +195,7 @@ noreturn void log_assert_failed_realm( - #define log_assert_failed(text, ...) \ - log_assert_failed_realm(LOG_REALM, (text), __VA_ARGS__) - --noreturn void log_assert_failed_unreachable_realm( -+_noreturn_ void log_assert_failed_unreachable_realm( - LogRealm realm, - const char *text, - const char *file, -diff --git a/src/basic/macro.h b/src/basic/macro.h -index 95be63a20..d8a6432f6 100644 ---- a/src/basic/macro.h -+++ b/src/basic/macro.h -@@ -53,6 +53,15 @@ - #else - #define _fallthrough_ - #endif -+/* Define C11 noreturn without and even on older gcc -+ * compiler versions */ -+#ifndef noreturn -+#if __STDC_VERSION__ >= 201112L -+#define _noreturn_ _Noreturn -+#else -+#define _noreturn_ __attribute__((noreturn)) -+#endif -+#endif - - /* Temporarily disable some warnings */ - #define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ -@@ -414,16 +423,6 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) { - #endif - #endif - --/* Define C11 noreturn without and even on older gcc -- * compiler versions */ --#ifndef noreturn --#if __STDC_VERSION__ >= 201112L --#define noreturn _Noreturn --#else --#define noreturn __attribute__((noreturn)) --#endif --#endif -- - #define DEFINE_TRIVIAL_CLEANUP_FUNC(type, func) \ - static inline void func##p(type *p) { \ - if (*p) \ -diff --git a/src/basic/process-util.c b/src/basic/process-util.c -index aa9846db5..e6120af5b 100644 ---- a/src/basic/process-util.c -+++ b/src/basic/process-util.c -@@ -987,7 +987,7 @@ bool is_main_thread(void) { - return cached > 0; - } - --noreturn void freeze(void) { -+_noreturn_ void freeze(void) { - - log_close(); - -diff --git a/src/basic/process-util.h b/src/basic/process-util.h -index 93029e36e..5170adec7 100644 ---- a/src/basic/process-util.h -+++ b/src/basic/process-util.h -@@ -91,7 +91,7 @@ int pid_from_same_root_fs(pid_t pid); - - bool is_main_thread(void); - --noreturn void freeze(void); -+_noreturn_ void freeze(void); - - bool oom_score_adjust_is_valid(int oa); - -diff --git a/src/core/main.c b/src/core/main.c -index 076846a41..4b2d14923 100644 ---- a/src/core/main.c -+++ b/src/core/main.c -@@ -141,7 +141,7 @@ static uint64_t arg_default_tasks_max = UINT64_MAX; - static sd_id128_t arg_machine_id = {}; - static EmergencyAction arg_cad_burst_action = EMERGENCY_ACTION_REBOOT_FORCE; - --noreturn static void freeze_or_reboot(void) { -+_noreturn_ static void freeze_or_reboot(void) { - - if (arg_crash_reboot) { - log_notice("Rebooting in 10s..."); -@@ -156,7 +156,7 @@ noreturn static void freeze_or_reboot(void) { - freeze(); - } - --noreturn static void crash(int sig) { -+_noreturn_ static void crash(int sig) { - struct sigaction sa; - pid_t pid; - -diff --git a/src/journal/test-journal-interleaving.c b/src/journal/test-journal-interleaving.c -index 5a88b2774..d87bdbdd3 100644 ---- a/src/journal/test-journal-interleaving.c -+++ b/src/journal/test-journal-interleaving.c -@@ -37,7 +37,7 @@ - - static bool arg_keep = false; - --noreturn static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { -+_noreturn_ static void log_assert_errno(const char *text, int error, const char *file, int line, const char *func) { - log_internal(LOG_CRIT, error, file, line, func, - "'%s' failed at %s:%u (%s): %m", text, file, line, func); - abort(); -diff --git a/src/shared/pager.c b/src/shared/pager.c -index 75db3c985..681af9c40 100644 ---- a/src/shared/pager.c -+++ b/src/shared/pager.c -@@ -47,7 +47,7 @@ static int stored_stderr = -1; - static bool stdout_redirected = false; - static bool stderr_redirected = false; - --noreturn static void pager_fallback(void) { -+_noreturn_ static void pager_fallback(void) { - int r; - - r = copy_bytes(STDIN_FILENO, STDOUT_FILENO, (uint64_t) -1, 0); -diff --git a/src/udev/collect/collect.c b/src/udev/collect/collect.c -index 2821640e9..c8fa47b3d 100644 ---- a/src/udev/collect/collect.c -+++ b/src/udev/collect/collect.c -@@ -58,7 +58,7 @@ static inline struct _mate *node_to_mate(struct udev_list_node *node) - return container_of(node, struct _mate, node); - } - --noreturn static void sig_alrm(int signo) -+_noreturn_ static void sig_alrm(int signo) - { - exit(4); - } --- -2.16.2 - diff --git a/_service b/_service new file mode 100644 index 00000000..43a94db3 --- /dev/null +++ b/_service @@ -0,0 +1,16 @@ + + + + + + git + https://github.com/openSUSE/systemd.git + systemd + @PARENT_TAG@+suse.@TAG_OFFSET@.g%h + openSUSE-Factory + + + *systemd-v237+suse.*.tar + xz + + diff --git a/systemd-237.tar.xz b/systemd-237.tar.xz deleted file mode 100644 index 23ed3778..00000000 --- a/systemd-237.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b420f2ff5841266d03c6691bd8adb705b2c46c391c33610923a23444232633f4 -size 4630076 diff --git a/systemd-mini.changes b/systemd-mini.changes index 72f79cb8..aecf2d57 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,86 @@ +------------------------------------------------------------------- +Wed Mar 28 15:19:45 UTC 2018 - fbui@suse.com + +- Drop systemd-bash-completion sub-package + + Now we directly ship the completion scripts from the main package as + we already do for zsh. I couldn't see any advantages in this split. + +------------------------------------------------------------------- +Wed Mar 28 15:12:26 UTC 2018 - fbui@suse.com + +- Be more accurate when specifiying the tools version we provide + +------------------------------------------------------------------- +Wed Mar 28 15:00:24 UTC 2018 - fbui@suse.com + +- Make sure rpm won't expand %autopatch even if it's commented + +------------------------------------------------------------------- +Wed Mar 28 14:55:36 UTC 2018 - fbui@suse.com + +- stat(1) as well as systemctl are not use in %post section of udev + + So remove stat(1) from the list of dep and move systemctl to the + requirements of %postun since it's called from there. + +------------------------------------------------------------------- +Wed Mar 28 12:30:31 UTC 2018 - fbui@suse.com + +- Import commit 14b3e00c3ccb8c1c82c8a2e99a9534750880a09e + + e0a8285e2 pid1: when creating service directories, don't chown existing files (#8181) (boo#1085971) + fb25886b1 Fix format-truncation compile failure by typecasting USB IDs (#8250) (bsc#1084638) + 5a6e9c92e sysusers: make sure to reset errno before calling fget*ent() + c2e1ee488 sysusers: also add support for NIS entries in /etc/shadow + 51cb94fa1 sysusers: do not append entries after the NIS ones (bsc#1085062 bsc#1045092) + 783f3d368 basic/macros: rename noreturn into _noreturn_ (#8456) + +- Drop 0001-basic-macros-rename-noreturn-into-_noreturn_.patch + + It's been merged in the git repo. + +------------------------------------------------------------------- +Wed Mar 28 12:13:03 UTC 2018 - fbui@suse.com + +- Rename the tarball + + So it's clear that it contains some additional patches on top of the + upstream version. Use the commit hash in the name so the exact + version can easily be identified. + + Provide _service file which can be used to retrieve the tarball from + the git repo (with "osc service disabledrun"). + +------------------------------------------------------------------- +Wed Mar 28 11:58:10 UTC 2018 - fbui@suse.com + +- Split systemd-coredump sub-package off (bsc#1083849) + +------------------------------------------------------------------- +Tue Mar 27 15:58:34 UTC 2018 - fbui@suse.com + +- Don't ship machines.target in systemd-container but in systemd main package + + machines.target is supposed to be a standard target for + starting/stopping all containers. systemd-nspawn is the main user of + it but other container managers could also make use of it. + +------------------------------------------------------------------- +Sun Mar 25 11:04:04 UTC 2018 - fbui@suse.com + +- Build a mini variant of systemd-container + + So we don't have to manually track and remove all files that should + be shipped by systemd-container in the case of a bootstrap build. + +------------------------------------------------------------------- +Thu Mar 22 17:09:36 UTC 2018 - fbui@suse.com + +- Run migrate-sysconfig-i18n.sh also during package installation (bsc#1086164) + + This is needed when we upgrade from SLE11. + ------------------------------------------------------------------- Wed Mar 14 17:22:53 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index f25ca2ef..4389ae03 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,6 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 +%define suse_version +suse.52.g14b3e00c3 %bcond_with gnuefi %if 0%{?bootstrap} @@ -120,7 +121,6 @@ Requires: sysvinit-tools Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) -Recommends: %{name}-bash-completion Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -135,10 +135,10 @@ Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Obsoletes: systemd-analyze < 201 -Provides: systemd-analyze = %{version} +Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 -Source0: systemd-%{version}.tar.xz +Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user Source3: systemd-sysv-convert @@ -162,7 +162,6 @@ Source1002: 99-wakeup-from-idle.rules # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-basic-macros-rename-noreturn-into-_noreturn_.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -235,12 +234,10 @@ License: GPL-2.0-only Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware -Requires(pre): /usr/bin/stat Requires(post): sed -Requires(post): /usr/bin/systemctl - Requires(post): coreutils Requires(postun): coreutils +Requires(postun): /usr/bin/systemctl Requires(posttrans): suse-module-tools >= 12.4 Conflicts: systemd < 39 @@ -252,7 +249,7 @@ Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} -Provides: udev = %{version} +Provides: udev = %{version}-%{release} Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap @@ -287,8 +284,8 @@ License: LGPL-2.1-or-later Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} -Provides: libudev-devel = %{version} -Conflicts: libudev1 = %{version} +Provides: libudev-devel = %{version}-%{release} +Conflicts: libudev1 = %{version}-%{release} Conflicts: libudev-devel %endif @@ -296,15 +293,34 @@ Conflicts: libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. -%package container +%package coredump%{mini} +Summary: Systemd tools for coredump management +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires +Provides: systemd:%{_bindir}/coredumpctl +%if 0%{?bootstrap} +Conflicts: systemd-coredump +%endif + +%description coredump%{mini} +Systemd tools to store and manage coredumps. + +This package contains systemd-coredump, coredumpctl. + +%package container%{?mini} Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn +%if 0%{?bootstrap} +Conflicts: systemd-container +%endif -%description container +%description container%{?mini} Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, @@ -406,22 +422,9 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif -%package bash-completion -Summary: Bash completion support for systemd -License: LGPL-2.1-or-later -Group: System/Base -Requires: bash-completion -BuildArch: noarch -%if 0%{?bootstrap} -Conflicts: systemd-bash-completion -%endif - -%description bash-completion -Some systemd commands offer bash completion, but it is an optional dependency. - %prep -%setup -q -n systemd-%{version} -%autopatch -p1 +%setup -q -n systemd-v%{version}%{suse_version} +# %%autopatch -p1 %build opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) @@ -478,9 +481,6 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* -rm %{buildroot}%{_bindir}/systemd-nspawn -rm %{buildroot}%{_unitdir}/systemd-nspawn@.service -rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -724,16 +724,15 @@ done # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -if [ $1 -gt 1 ]; then - # Migrate i18n setting stuff thout could be previously - # configured in /etc/sysconfig but now is defined only in the - # systemd official places (/etc/locale.conf, - # /etc/vconsole.conf, etc...). This is done only once. - test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { - %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && - touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : - } -fi +# Migrate i18n settings that could be previously configured in +# /etc/sysconfig but now is defined only in the systemd official +# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done +# only once usually during package updates but might be also needed +# during installations when we upgrade from a distro using SysV init. +test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { + %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && + touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : +} %postun %systemd_postun @@ -789,8 +788,7 @@ systemctl daemon-reload || : %postun -n libudev%{?mini}1 -p /sbin/ldconfig %postun -n libsystemd0%{?mini} -p /sbin/ldconfig -%if ! 0%{?bootstrap} -%post container +%post container%{?mini} %tmpfiles_create systemd-nspawn.conf if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for @@ -811,6 +809,7 @@ if [ $1 -gt 1 ]; then %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%if ! 0%{?bootstrap} %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -876,7 +875,6 @@ fi %{_bindir}/localectl %{_bindir}/systemctl %{_bindir}/systemd-analyze -%{_bindir}/coredumpctl %{_bindir}/systemd-delta %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot @@ -919,19 +917,22 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif +%exclude %{_prefix}/lib/systemd/systemd-coredump %exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service %exclude %{_unitdir}/systemd-nspawn@.service +%exclude %{_unitdir}/systemd-coredump* +%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined %exclude %{_unitdir}/systemd-machined.service %exclude %{_unitdir}/dbus-org.freedesktop.machine1.service %exclude %{_unitdir}/var-lib-machines.mount %exclude %{_unitdir}/machine.slice -%exclude %{_unitdir}/machines.target* +%exclude %{_unitdir}/machines.target.wants %exclude %{_unitdir}/*.target.wants/var-lib-machines.mount %endif %if %{with importd} @@ -1006,7 +1007,6 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d -%{_sysctldir}/50-coredump.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d @@ -1022,7 +1022,6 @@ fi %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/coredump.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1111,6 +1110,9 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man1/coredumpctl* +%exclude %{_mandir}/man5/coredump.conf* +%exclude %{_mandir}/man8/systemd-coredump* %exclude %{_mandir}/man*/*nspawn* %if %{with machined} %exclude %{_mandir}/man*/machinectl* @@ -1129,11 +1131,15 @@ fi %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated -%dir %{_localstatedir}/lib/systemd/coredump %dir %{_localstatedir}/lib/systemd/catalog %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed + +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/* + %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/* @@ -1239,8 +1245,21 @@ fi %{_mandir}/man3/*udev*.3* %endif +%files coredump%{?mini} +%defattr(-,root,root) +%{_bindir}/coredumpctl +%{_unitdir}/systemd-coredump* +%{_unitdir}/sockets.target.wants/systemd-coredump.socket +%{_sysctldir}/50-coredump.conf +%config(noreplace) %{_sysconfdir}/systemd/coredump.conf +%dir %{_localstatedir}/lib/systemd/coredump %if ! 0%{?bootstrap} -%files container +%{_mandir}/man1/coredumpctl* +%{_mandir}/man5/coredump.conf* +%{_mandir}/man8/systemd-coredump* +%endif + +%files container%{?mini} %defattr(-,root,root) %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service @@ -1252,7 +1271,7 @@ fi %{_unitdir}/dbus-org.freedesktop.machine1.service %{_unitdir}/var-lib-machines.mount %{_unitdir}/machine.slice -%{_unitdir}/machines.target* +%{_unitdir}/machines.target.wants %{_unitdir}/*.target.wants/var-lib-machines.mount %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf @@ -1269,6 +1288,7 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %endif +%if ! 0%{?bootstrap} %{_mandir}/man*/*nspawn* %if %{with machined} %{_mandir}/man*/machinectl* @@ -1277,7 +1297,9 @@ fi %if %{with importd} %{_mandir}/man*/systemd-importd* %endif +%endif +%if ! 0%{?bootstrap} %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ @@ -1330,10 +1352,4 @@ fi %{_datadir}/systemd/gatewayd %endif -%files bash-completion -%defattr(-,root,root,-) -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/* - %changelog diff --git a/systemd-v237+suse.52.g14b3e00c3.tar.xz b/systemd-v237+suse.52.g14b3e00c3.tar.xz new file mode 100644 index 00000000..d03f0d39 --- /dev/null +++ b/systemd-v237+suse.52.g14b3e00c3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cbca10a39e2efa0479fe5d81fb983e08ac4e9655b85e382d8247683a3151834f +size 4627336 diff --git a/systemd.changes b/systemd.changes index 72f79cb8..aecf2d57 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,86 @@ +------------------------------------------------------------------- +Wed Mar 28 15:19:45 UTC 2018 - fbui@suse.com + +- Drop systemd-bash-completion sub-package + + Now we directly ship the completion scripts from the main package as + we already do for zsh. I couldn't see any advantages in this split. + +------------------------------------------------------------------- +Wed Mar 28 15:12:26 UTC 2018 - fbui@suse.com + +- Be more accurate when specifiying the tools version we provide + +------------------------------------------------------------------- +Wed Mar 28 15:00:24 UTC 2018 - fbui@suse.com + +- Make sure rpm won't expand %autopatch even if it's commented + +------------------------------------------------------------------- +Wed Mar 28 14:55:36 UTC 2018 - fbui@suse.com + +- stat(1) as well as systemctl are not use in %post section of udev + + So remove stat(1) from the list of dep and move systemctl to the + requirements of %postun since it's called from there. + +------------------------------------------------------------------- +Wed Mar 28 12:30:31 UTC 2018 - fbui@suse.com + +- Import commit 14b3e00c3ccb8c1c82c8a2e99a9534750880a09e + + e0a8285e2 pid1: when creating service directories, don't chown existing files (#8181) (boo#1085971) + fb25886b1 Fix format-truncation compile failure by typecasting USB IDs (#8250) (bsc#1084638) + 5a6e9c92e sysusers: make sure to reset errno before calling fget*ent() + c2e1ee488 sysusers: also add support for NIS entries in /etc/shadow + 51cb94fa1 sysusers: do not append entries after the NIS ones (bsc#1085062 bsc#1045092) + 783f3d368 basic/macros: rename noreturn into _noreturn_ (#8456) + +- Drop 0001-basic-macros-rename-noreturn-into-_noreturn_.patch + + It's been merged in the git repo. + +------------------------------------------------------------------- +Wed Mar 28 12:13:03 UTC 2018 - fbui@suse.com + +- Rename the tarball + + So it's clear that it contains some additional patches on top of the + upstream version. Use the commit hash in the name so the exact + version can easily be identified. + + Provide _service file which can be used to retrieve the tarball from + the git repo (with "osc service disabledrun"). + +------------------------------------------------------------------- +Wed Mar 28 11:58:10 UTC 2018 - fbui@suse.com + +- Split systemd-coredump sub-package off (bsc#1083849) + +------------------------------------------------------------------- +Tue Mar 27 15:58:34 UTC 2018 - fbui@suse.com + +- Don't ship machines.target in systemd-container but in systemd main package + + machines.target is supposed to be a standard target for + starting/stopping all containers. systemd-nspawn is the main user of + it but other container managers could also make use of it. + +------------------------------------------------------------------- +Sun Mar 25 11:04:04 UTC 2018 - fbui@suse.com + +- Build a mini variant of systemd-container + + So we don't have to manually track and remove all files that should + be shipped by systemd-container in the case of a bootstrap build. + +------------------------------------------------------------------- +Thu Mar 22 17:09:36 UTC 2018 - fbui@suse.com + +- Run migrate-sysconfig-i18n.sh also during package installation (bsc#1086164) + + This is needed when we upgrade from SLE11. + ------------------------------------------------------------------- Wed Mar 14 17:22:53 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index ad57f81d..d5f1d1c7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,6 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 +%define suse_version +suse.52.g14b3e00c3 %bcond_with gnuefi %if 0%{?bootstrap} @@ -118,7 +119,6 @@ Requires: sysvinit-tools Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) -Recommends: %{name}-bash-completion Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -133,10 +133,10 @@ Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Obsoletes: systemd-analyze < 201 -Provides: systemd-analyze = %{version} +Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 -Source0: systemd-%{version}.tar.xz +Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user Source3: systemd-sysv-convert @@ -160,7 +160,6 @@ Source1002: 99-wakeup-from-idle.rules # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-basic-macros-rename-noreturn-into-_noreturn_.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -233,12 +232,10 @@ License: GPL-2.0-only Group: System/Kernel Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware -Requires(pre): /usr/bin/stat Requires(post): sed -Requires(post): /usr/bin/systemctl - Requires(post): coreutils Requires(postun): coreutils +Requires(postun): /usr/bin/systemctl Requires(posttrans): suse-module-tools >= 12.4 Conflicts: systemd < 39 @@ -250,7 +247,7 @@ Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} -Provides: udev = %{version} +Provides: udev = %{version}-%{release} Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap @@ -285,8 +282,8 @@ License: LGPL-2.1-or-later Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} -Provides: libudev-devel = %{version} -Conflicts: libudev1 = %{version} +Provides: libudev-devel = %{version}-%{release} +Conflicts: libudev1 = %{version}-%{release} Conflicts: libudev-devel %endif @@ -294,15 +291,34 @@ Conflicts: libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. -%package container +%package coredump%{mini} +Summary: Systemd tools for coredump management +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires +Provides: systemd:%{_bindir}/coredumpctl +%if 0%{?bootstrap} +Conflicts: systemd-coredump +%endif + +%description coredump%{mini} +Systemd tools to store and manage coredumps. + +This package contains systemd-coredump, coredumpctl. + +%package container%{?mini} Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn +%if 0%{?bootstrap} +Conflicts: systemd-container +%endif -%description container +%description container%{?mini} Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, @@ -404,22 +420,9 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif -%package bash-completion -Summary: Bash completion support for systemd -License: LGPL-2.1-or-later -Group: System/Base -Requires: bash-completion -BuildArch: noarch -%if 0%{?bootstrap} -Conflicts: systemd-bash-completion -%endif - -%description bash-completion -Some systemd commands offer bash completion, but it is an optional dependency. - %prep -%setup -q -n systemd-%{version} -%autopatch -p1 +%setup -q -n systemd-v%{version}%{suse_version} +# %%autopatch -p1 %build opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) @@ -476,9 +479,6 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* -rm %{buildroot}%{_bindir}/systemd-nspawn -rm %{buildroot}%{_unitdir}/systemd-nspawn@.service -rm %{buildroot}%{_tmpfilesdir}/systemd-nspawn.conf %endif # FIXME: these symlinks should die. @@ -722,16 +722,15 @@ done # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -if [ $1 -gt 1 ]; then - # Migrate i18n setting stuff thout could be previously - # configured in /etc/sysconfig but now is defined only in the - # systemd official places (/etc/locale.conf, - # /etc/vconsole.conf, etc...). This is done only once. - test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { - %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && - touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : - } -fi +# Migrate i18n settings that could be previously configured in +# /etc/sysconfig but now is defined only in the systemd official +# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done +# only once usually during package updates but might be also needed +# during installations when we upgrade from a distro using SysV init. +test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { + %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && + touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : +} %postun %systemd_postun @@ -787,8 +786,7 @@ systemctl daemon-reload || : %postun -n libudev%{?mini}1 -p /sbin/ldconfig %postun -n libsystemd0%{?mini} -p /sbin/ldconfig -%if ! 0%{?bootstrap} -%post container +%post container%{?mini} %tmpfiles_create systemd-nspawn.conf if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for @@ -809,6 +807,7 @@ if [ $1 -gt 1 ]; then %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%if ! 0%{?bootstrap} %post logger %tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ if [ "$1" -eq 1 ]; then @@ -874,7 +873,6 @@ fi %{_bindir}/localectl %{_bindir}/systemctl %{_bindir}/systemd-analyze -%{_bindir}/coredumpctl %{_bindir}/systemd-delta %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot @@ -917,19 +915,22 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif +%exclude %{_prefix}/lib/systemd/systemd-coredump %exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service %exclude %{_unitdir}/systemd-nspawn@.service +%exclude %{_unitdir}/systemd-coredump* +%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined %exclude %{_unitdir}/systemd-machined.service %exclude %{_unitdir}/dbus-org.freedesktop.machine1.service %exclude %{_unitdir}/var-lib-machines.mount %exclude %{_unitdir}/machine.slice -%exclude %{_unitdir}/machines.target* +%exclude %{_unitdir}/machines.target.wants %exclude %{_unitdir}/*.target.wants/var-lib-machines.mount %endif %if %{with importd} @@ -1004,7 +1005,6 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d -%{_sysctldir}/50-coredump.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d @@ -1020,7 +1020,6 @@ fi %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/coredump.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1109,6 +1108,9 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man1/coredumpctl* +%exclude %{_mandir}/man5/coredump.conf* +%exclude %{_mandir}/man8/systemd-coredump* %exclude %{_mandir}/man*/*nspawn* %if %{with machined} %exclude %{_mandir}/man*/machinectl* @@ -1127,11 +1129,15 @@ fi %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated -%dir %{_localstatedir}/lib/systemd/coredump %dir %{_localstatedir}/lib/systemd/catalog %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed + +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%{_datadir}/bash-completion/completions/* + %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %{_datadir}/zsh/site-functions/* @@ -1237,8 +1243,21 @@ fi %{_mandir}/man3/*udev*.3* %endif +%files coredump%{?mini} +%defattr(-,root,root) +%{_bindir}/coredumpctl +%{_unitdir}/systemd-coredump* +%{_unitdir}/sockets.target.wants/systemd-coredump.socket +%{_sysctldir}/50-coredump.conf +%config(noreplace) %{_sysconfdir}/systemd/coredump.conf +%dir %{_localstatedir}/lib/systemd/coredump %if ! 0%{?bootstrap} -%files container +%{_mandir}/man1/coredumpctl* +%{_mandir}/man5/coredump.conf* +%{_mandir}/man8/systemd-coredump* +%endif + +%files container%{?mini} %defattr(-,root,root) %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service @@ -1250,7 +1269,7 @@ fi %{_unitdir}/dbus-org.freedesktop.machine1.service %{_unitdir}/var-lib-machines.mount %{_unitdir}/machine.slice -%{_unitdir}/machines.target* +%{_unitdir}/machines.target.wants %{_unitdir}/*.target.wants/var-lib-machines.mount %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf @@ -1267,6 +1286,7 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy %endif +%if ! 0%{?bootstrap} %{_mandir}/man*/*nspawn* %if %{with machined} %{_mandir}/man*/machinectl* @@ -1275,7 +1295,9 @@ fi %if %{with importd} %{_mandir}/man*/systemd-importd* %endif +%endif +%if ! 0%{?bootstrap} %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ @@ -1328,10 +1350,4 @@ fi %{_datadir}/systemd/gatewayd %endif -%files bash-completion -%defattr(-,root,root,-) -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/* - %changelog From ffcb89d13472d867f2167719ea74ffb181a0de2ebdd6af1641d59b6af1d87656 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Apr 2018 18:47:01 +0000 Subject: [PATCH 018/124] Accepting request 593709 from Base:System - /usr/lib/systemd/systemd-coredump was missing from systemd-coredump sub-package (boo#1088057) OBS-URL: https://build.opensuse.org/request/show/593709 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=276 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 1 + systemd.changes | 5 +++++ systemd.spec | 1 + 4 files changed, 12 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index aecf2d57..05c02977 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com + +- /usr/lib/systemd/systemd-coredump was missing from systemd-coredump sub-package (boo#1088057) + ------------------------------------------------------------------- Wed Mar 28 15:19:45 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 4389ae03..c403fbd4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1248,6 +1248,7 @@ fi %files coredump%{?mini} %defattr(-,root,root) %{_bindir}/coredumpctl +%{_prefix}/lib/systemd/systemd-coredump %{_unitdir}/systemd-coredump* %{_unitdir}/sockets.target.wants/systemd-coredump.socket %{_sysctldir}/50-coredump.conf diff --git a/systemd.changes b/systemd.changes index aecf2d57..05c02977 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com + +- /usr/lib/systemd/systemd-coredump was missing from systemd-coredump sub-package (boo#1088057) + ------------------------------------------------------------------- Wed Mar 28 15:19:45 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index d5f1d1c7..6a62e0c1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1246,6 +1246,7 @@ fi %files coredump%{?mini} %defattr(-,root,root) %{_bindir}/coredumpctl +%{_prefix}/lib/systemd/systemd-coredump %{_unitdir}/systemd-coredump* %{_unitdir}/sockets.target.wants/systemd-coredump.socket %{_sysctldir}/50-coredump.conf From 315840b02835499d2cd12560c088259a7179bb55581f0f52aa9b2271620d2000 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Apr 2018 07:58:40 +0000 Subject: [PATCH 019/124] Accepting request 599906 from Base:System OBS-URL: https://build.opensuse.org/request/show/599906 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=277 --- 60-io-scheduler.rules | 24 ++++++++++++++ 60-ssd-scheduler.rules | 11 ------- scripts-systemd-upgrade-from-pre-210.sh | 6 ---- systemd-mini.changes | 43 +++++++++++++++++++++++++ systemd-mini.spec | 12 +++++-- systemd-v237+suse.52.g14b3e00c3.tar.xz | 3 -- systemd-v237+suse.57.gd81968050.tar.xz | 3 ++ systemd.changes | 43 +++++++++++++++++++++++++ systemd.spec | 12 +++++-- 9 files changed, 131 insertions(+), 26 deletions(-) create mode 100644 60-io-scheduler.rules delete mode 100644 60-ssd-scheduler.rules delete mode 100644 systemd-v237+suse.52.g14b3e00c3.tar.xz create mode 100644 systemd-v237+suse.57.gd81968050.tar.xz diff --git a/60-io-scheduler.rules b/60-io-scheduler.rules new file mode 100644 index 00000000..7c285aef --- /dev/null +++ b/60-io-scheduler.rules @@ -0,0 +1,24 @@ +# Set optimal IO schedulers for HDD and SSD + +ACTION!="add", GOTO="scheduler_end" +SUBSYSTEM!="block", GOTO="scheduler_end" + +# Do not change scheduler if `elevator` cmdline parameter is set +IMPORT{cmdline}="elevator" +ENV{elevator}=="?*", GOTO="scheduler_end" + +# Determine if BLK-MQ is enabled +TEST=="%S%p/mq", ENV{.IS_MQ}="1" + +# MQ: BFQ scheduler for HDD +ENV{.IS_MQ}=="1", ATTR{queue/rotational}!="0", ATTR{queue/scheduler}="bfq" +# MQ: deadline scheduler for SSD +ENV{.IS_MQ}=="1", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline" + +# Non-MQ: CFQ scheduler for HDD +ENV{.IS_MQ}!="1", ATTR{queue/rotational}!="0", ATTR{queue/scheduler}="cfq" +# Non-MQ: deadline scheduler for SSD +ENV{.IS_MQ}!="1", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" + +LABEL="scheduler_end" + diff --git a/60-ssd-scheduler.rules b/60-ssd-scheduler.rules deleted file mode 100644 index 43aa8ea7..00000000 --- a/60-ssd-scheduler.rules +++ /dev/null @@ -1,11 +0,0 @@ -# do not edit this file, it will be overwritten on update - -ACTION!="add", GOTO="ssd_scheduler_end" -SUBSYSTEM!="block", GOTO="ssd_scheduler_end" - -IMPORT{cmdline}="elevator" -ENV{elevator}=="*?", GOTO="ssd_scheduler_end" - -KERNEL=="sd*[!0-9]", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" - -LABEL="ssd_scheduler_end" diff --git a/scripts-systemd-upgrade-from-pre-210.sh b/scripts-systemd-upgrade-from-pre-210.sh index 24738567..8a168915 100644 --- a/scripts-systemd-upgrade-from-pre-210.sh +++ b/scripts-systemd-upgrade-from-pre-210.sh @@ -22,12 +22,6 @@ if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then ln -s /usr/lib/systemd/system/runlevel${runlevel}.target /etc/systemd/system/default.target fi -# since v207 /etc/sysctl.conf is no longer parsed, however -# backward compatibility is provided by /etc/sysctl.d/99-sysctl.conf -if [ ! -L /etc/sysctl.d/99-sysctl.conf -a -e /etc/sysctl.conf ]; then - ln -sf /etc/sysctl.conf /etc/sysctl.d/99-sysctl.conf -fi - # migrate any symlink which may refer to the old path for f in $(find /etc/systemd/system -type l -xtype l); do new_target="/usr$(readlink $f)" diff --git a/systemd-mini.changes b/systemd-mini.changes index 05c02977..82bd34cc 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com + +- Import commit d8196805089566ecd846b7c627ff2f3c42588c50 + + 621b247f3 device: skip deserialization of device units when udevd is not running + a7da5bdbc device: make sure to always retroactively start device dependencies (bsc#1088052) + 303624f6f systemd-udevd: limit children-max by available memory (#8668) (bsc#1086785 bsc#1066422) + 76acf3ae9 tmpfiles: fix directory removal with force symlink (#8619) + +------------------------------------------------------------------- +Fri Apr 20 08:27:41 UTC 2018 - fbui@suse.com + +- Ship 99-sysctl.conf instead of creating it during package installation/update (bsc#1088769) + + Previously this symlink was created in /etc/sysctl.d during %post + which made the symlink not owned and more importantly it was created + only if /etc/sysctl.conf is already installed which is not always + the case during the installation process it seems. + + So ship the symlink unconditionally and put it in /usr/lib/sysctl.d + instead since it's a distro default behavior that might be overriden + by sysadmin later. + +------------------------------------------------------------------- +Mon Apr 9 09:42:16 UTC 2018 - fbui@suse.com + +- Be consistent in 60-io-scheduler.rules + + And use "?*" when checking for the non empty string (instead of "*?"). + ------------------------------------------------------------------- Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com @@ -62,6 +93,18 @@ Wed Mar 28 11:58:10 UTC 2018 - fbui@suse.com - Split systemd-coredump sub-package off (bsc#1083849) +------------------------------------------------------------------- +Tue Mar 27 20:14:41 UTC 2018 - develop7@develop7.info + +- Enhance IO scheduler tweaking rules to support blk-mq as well + + * Set optimal blk-mq schedulers (bfq and mq-deadline for HDD and + SSD respectively) + * Explicitly set CFQ for rotational disks when no `elevator` + is specified + * Verbose comments explaining what is going on + * Rename the rules file since it is not ssd-only anymore + ------------------------------------------------------------------- Tue Mar 27 15:58:34 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index c403fbd4..7c164b7b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.52.g14b3e00c3 +%define suse_version +suse.57.gd81968050 %bcond_with gnuefi %if 0%{?bootstrap} @@ -152,7 +152,7 @@ Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh -Source1000: 60-ssd-scheduler.rules +Source1000: 60-io-scheduler.rules Source1001: 80-hotplug-cpu-mem.rules Source1002: 99-wakeup-from-idle.rules @@ -497,7 +497,7 @@ install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install # The rules that we shouldn't maintain -install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-ssd-scheduler.rules +install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules install -m0644 -D %{S:1002} %{buildroot}%{_udevrulesdir}/99-wakeup-from-idle.rules @@ -546,6 +546,11 @@ EOF # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# since v207 /etc/sysctl.conf is no longer parsed (commit +# 04bf3c1a60d82791), however backward compatibility is provided by +# /usr/lib/sysctl.d/99-sysctl.conf. +ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf + # The definition of the basic users/groups are defined by system-user # on SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf @@ -1007,6 +1012,7 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d diff --git a/systemd-v237+suse.52.g14b3e00c3.tar.xz b/systemd-v237+suse.52.g14b3e00c3.tar.xz deleted file mode 100644 index d03f0d39..00000000 --- a/systemd-v237+suse.52.g14b3e00c3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cbca10a39e2efa0479fe5d81fb983e08ac4e9655b85e382d8247683a3151834f -size 4627336 diff --git a/systemd-v237+suse.57.gd81968050.tar.xz b/systemd-v237+suse.57.gd81968050.tar.xz new file mode 100644 index 00000000..963d977f --- /dev/null +++ b/systemd-v237+suse.57.gd81968050.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8c92c0a8012c1b5b7a2866854ecdbcffca697d5cb65df43ad6a7a2859c95915e +size 4627256 diff --git a/systemd.changes b/systemd.changes index 05c02977..82bd34cc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com + +- Import commit d8196805089566ecd846b7c627ff2f3c42588c50 + + 621b247f3 device: skip deserialization of device units when udevd is not running + a7da5bdbc device: make sure to always retroactively start device dependencies (bsc#1088052) + 303624f6f systemd-udevd: limit children-max by available memory (#8668) (bsc#1086785 bsc#1066422) + 76acf3ae9 tmpfiles: fix directory removal with force symlink (#8619) + +------------------------------------------------------------------- +Fri Apr 20 08:27:41 UTC 2018 - fbui@suse.com + +- Ship 99-sysctl.conf instead of creating it during package installation/update (bsc#1088769) + + Previously this symlink was created in /etc/sysctl.d during %post + which made the symlink not owned and more importantly it was created + only if /etc/sysctl.conf is already installed which is not always + the case during the installation process it seems. + + So ship the symlink unconditionally and put it in /usr/lib/sysctl.d + instead since it's a distro default behavior that might be overriden + by sysadmin later. + +------------------------------------------------------------------- +Mon Apr 9 09:42:16 UTC 2018 - fbui@suse.com + +- Be consistent in 60-io-scheduler.rules + + And use "?*" when checking for the non empty string (instead of "*?"). + ------------------------------------------------------------------- Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com @@ -62,6 +93,18 @@ Wed Mar 28 11:58:10 UTC 2018 - fbui@suse.com - Split systemd-coredump sub-package off (bsc#1083849) +------------------------------------------------------------------- +Tue Mar 27 20:14:41 UTC 2018 - develop7@develop7.info + +- Enhance IO scheduler tweaking rules to support blk-mq as well + + * Set optimal blk-mq schedulers (bfq and mq-deadline for HDD and + SSD respectively) + * Explicitly set CFQ for rotational disks when no `elevator` + is specified + * Verbose comments explaining what is going on + * Rename the rules file since it is not ssd-only anymore + ------------------------------------------------------------------- Tue Mar 27 15:58:34 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 6a62e0c1..8e20f9a1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.52.g14b3e00c3 +%define suse_version +suse.57.gd81968050 %bcond_with gnuefi %if 0%{?bootstrap} @@ -150,7 +150,7 @@ Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh -Source1000: 60-ssd-scheduler.rules +Source1000: 60-io-scheduler.rules Source1001: 80-hotplug-cpu-mem.rules Source1002: 99-wakeup-from-idle.rules @@ -495,7 +495,7 @@ install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install # The rules that we shouldn't maintain -install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-ssd-scheduler.rules +install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules install -m0644 -D %{S:1002} %{buildroot}%{_udevrulesdir}/99-wakeup-from-idle.rules @@ -544,6 +544,11 @@ EOF # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# since v207 /etc/sysctl.conf is no longer parsed (commit +# 04bf3c1a60d82791), however backward compatibility is provided by +# /usr/lib/sysctl.d/99-sysctl.conf. +ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf + # The definition of the basic users/groups are defined by system-user # on SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf @@ -1005,6 +1010,7 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d From 9bca36b45b44069f6ebf565d7d43946f7de961aa66c9714a3dbfbd7894fbe4e3 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 11 May 2018 09:28:32 +0000 Subject: [PATCH 020/124] Accepting request 605360 from Base:System OBS-URL: https://build.opensuse.org/request/show/605360 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=278 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 4 +++- systemd.changes | 6 ++++++ systemd.spec | 4 +++- 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 82bd34cc..ddffeda8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 8 10:33:10 UTC 2018 - Thomas.Blume@suse.com + +- align permissions of /etc/machine-id to upstream code (bsc#1092269) + world writeable machine-id is a security issue + ------------------------------------------------------------------- Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 7c164b7b..87aa79ec 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -687,9 +687,11 @@ fi # machine ID in all images. if [ $1 -eq 1 ]; then touch %{_sysconfdir}/machine-id - chmod 666 %{_sysconfdir}/machine-id fi +# check if /etc/machine-id is writeable and change it to readonly +[ ! -w %{_sysconfdir}/machine-id ] || chmod 444 %{_sysconfdir}/machine-id + %if ! 0%{?bootstrap} pam-config --add --systemd || : %endif diff --git a/systemd.changes b/systemd.changes index 82bd34cc..ddffeda8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue May 8 10:33:10 UTC 2018 - Thomas.Blume@suse.com + +- align permissions of /etc/machine-id to upstream code (bsc#1092269) + world writeable machine-id is a security issue + ------------------------------------------------------------------- Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 8e20f9a1..23af17e2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -685,9 +685,11 @@ fi # machine ID in all images. if [ $1 -eq 1 ]; then touch %{_sysconfdir}/machine-id - chmod 666 %{_sysconfdir}/machine-id fi +# check if /etc/machine-id is writeable and change it to readonly +[ ! -w %{_sysconfdir}/machine-id ] || chmod 444 %{_sysconfdir}/machine-id + %if ! 0%{?bootstrap} pam-config --add --systemd || : %endif From 37270484426db9f5c4545aefe6905ec47773d3712dbef72e79d06c125eee560c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 May 2018 09:24:44 +0000 Subject: [PATCH 021/124] Accepting request 606982 from Base:System OBS-URL: https://build.opensuse.org/request/show/606982 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=279 --- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 26 +++++++++++++++++--------- systemd.changes | 12 ++++++++++++ systemd.spec | 26 +++++++++++++++++--------- 4 files changed, 58 insertions(+), 18 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index ddffeda8..927448b9 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,9 +1,21 @@ +------------------------------------------------------------------- +Mon May 14 08:57:44 UTC 2018 - fbui@suse.com + +- Slight rewrite of the previous fix + ------------------------------------------------------------------- Tue May 8 10:33:10 UTC 2018 - Thomas.Blume@suse.com - align permissions of /etc/machine-id to upstream code (bsc#1092269) world writeable machine-id is a security issue +------------------------------------------------------------------- +Mon Apr 23 14:05:37 UTC 2018 - fbui@suse.com + +- Move 80-container-v[ez].network in systemd-container sub-package + +- Move 80-container-host0.network from udev to systemd + ------------------------------------------------------------------- Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 87aa79ec..ce81abb0 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -687,10 +687,15 @@ fi # machine ID in all images. if [ $1 -eq 1 ]; then touch %{_sysconfdir}/machine-id + chmod 444 %{_sysconfdir}/machine-id fi -# check if /etc/machine-id is writeable and change it to readonly -[ ! -w %{_sysconfdir}/machine-id ] || chmod 444 %{_sysconfdir}/machine-id +# /etc/machine-id might have been created writeable incorrectly +# (boo#1092269). +if [ -w %{_sysconfdir}/machine-id ]; then + echo "/etc/machine-id shouldn't be writable, fixing..." + chmod 444 %{_sysconfdir}/machine-id || : +fi %if ! 0%{?bootstrap} pam-config --add --systemd || : @@ -1016,15 +1021,17 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf +%if %{with networkd} +%dir %{_sysconfdir}/systemd/network +%{_prefix}/lib/systemd/network/80-container-host0.network +%endif + %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user -%if %{with networkd} -%dir %{_sysconfdir}/systemd/network -%endif %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh @@ -1230,10 +1237,7 @@ fi %dir %{_unitdir}/sockets.target.wants %{_unitdir}/sockets.target.wants/systemd-udev*.socket %dir %{_prefix}/lib/systemd/network -%{_prefix}/lib/systemd/network/*.link -%if %{with networkd} -%{_prefix}/lib/systemd/network/*.network -%endif +%{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc %files -n libsystemd0%{?mini} @@ -1273,6 +1277,10 @@ fi %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service %{_tmpfilesdir}/systemd-nspawn.conf +%if %{with networkd} +%{_prefix}/lib/systemd/network/80-container-ve.network +%{_prefix}/lib/systemd/network/80-container-vz.network +%endif %if %{with machined} %{_bindir}/machinectl %{_prefix}/lib/systemd/systemd-machined diff --git a/systemd.changes b/systemd.changes index ddffeda8..927448b9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,9 +1,21 @@ +------------------------------------------------------------------- +Mon May 14 08:57:44 UTC 2018 - fbui@suse.com + +- Slight rewrite of the previous fix + ------------------------------------------------------------------- Tue May 8 10:33:10 UTC 2018 - Thomas.Blume@suse.com - align permissions of /etc/machine-id to upstream code (bsc#1092269) world writeable machine-id is a security issue +------------------------------------------------------------------- +Mon Apr 23 14:05:37 UTC 2018 - fbui@suse.com + +- Move 80-container-v[ez].network in systemd-container sub-package + +- Move 80-container-host0.network from udev to systemd + ------------------------------------------------------------------- Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 23af17e2..1961bfe8 100644 --- a/systemd.spec +++ b/systemd.spec @@ -685,10 +685,15 @@ fi # machine ID in all images. if [ $1 -eq 1 ]; then touch %{_sysconfdir}/machine-id + chmod 444 %{_sysconfdir}/machine-id fi -# check if /etc/machine-id is writeable and change it to readonly -[ ! -w %{_sysconfdir}/machine-id ] || chmod 444 %{_sysconfdir}/machine-id +# /etc/machine-id might have been created writeable incorrectly +# (boo#1092269). +if [ -w %{_sysconfdir}/machine-id ]; then + echo "/etc/machine-id shouldn't be writable, fixing..." + chmod 444 %{_sysconfdir}/machine-id || : +fi %if ! 0%{?bootstrap} pam-config --add --systemd || : @@ -1014,15 +1019,17 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf +%if %{with networkd} +%dir %{_sysconfdir}/systemd/network +%{_prefix}/lib/systemd/network/80-container-host0.network +%endif + %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user -%if %{with networkd} -%dir %{_sysconfdir}/systemd/network -%endif %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh @@ -1228,10 +1235,7 @@ fi %dir %{_unitdir}/sockets.target.wants %{_unitdir}/sockets.target.wants/systemd-udev*.socket %dir %{_prefix}/lib/systemd/network -%{_prefix}/lib/systemd/network/*.link -%if %{with networkd} -%{_prefix}/lib/systemd/network/*.network -%endif +%{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc %files -n libsystemd0%{?mini} @@ -1271,6 +1275,10 @@ fi %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service %{_tmpfilesdir}/systemd-nspawn.conf +%if %{with networkd} +%{_prefix}/lib/systemd/network/80-container-ve.network +%{_prefix}/lib/systemd/network/80-container-vz.network +%endif %if %{with machined} %{_bindir}/machinectl %{_prefix}/lib/systemd/systemd-machined From cb6c33dc9ed1813cafa981f1b27474ffd45db6007c19484316a3dae9832f7490 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 May 2018 14:58:06 +0000 Subject: [PATCH 022/124] Accepting request 610242 from Base:System OBS-URL: https://build.opensuse.org/request/show/610242 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=280 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 1 + systemd.changes | 5 +++++ systemd.spec | 1 + 4 files changed, 12 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 927448b9..872d187a 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 18 08:39:41 UTC 2018 - fbui@suse.com + +- Disable user units by default (bsc#1090785) + ------------------------------------------------------------------- Mon May 14 08:57:44 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index ce81abb0..5bfad6f2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -646,6 +646,7 @@ rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd # presets package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset +echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored diff --git a/systemd.changes b/systemd.changes index 927448b9..872d187a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 18 08:39:41 UTC 2018 - fbui@suse.com + +- Disable user units by default (bsc#1090785) + ------------------------------------------------------------------- Mon May 14 08:57:44 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 1961bfe8..c356ee33 100644 --- a/systemd.spec +++ b/systemd.spec @@ -644,6 +644,7 @@ rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd # presets package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset +echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored From 942c9accc4497d079c2ef62ee657f655b91b9c9c8407f1aefd85f7a5136a5920 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Tue, 19 Jun 2018 09:53:47 +0000 Subject: [PATCH 023/124] Accepting request 616862 from Base:System OBS-URL: https://build.opensuse.org/request/show/616862 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=281 --- ...e-etc-resolv.conf-symlink-at-runtime.patch | 53 +++++++++++++++++++ systemd-mini.changes | 18 +++++++ systemd-mini.spec | 12 +++-- systemd-v237+suse.57.gd81968050.tar.xz | 3 -- systemd-v237+suse.64.gf63623c1f.tar.xz | 3 ++ systemd.changes | 18 +++++++ systemd.spec | 12 +++-- 7 files changed, 108 insertions(+), 11 deletions(-) create mode 100644 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch delete mode 100644 systemd-v237+suse.57.gd81968050.tar.xz create mode 100644 systemd-v237+suse.64.gf63623c1f.tar.xz diff --git a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch new file mode 100644 index 00000000..09c040f2 --- /dev/null +++ b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -0,0 +1,53 @@ +From a482b51673d4344faf76a0460a69d7f273b36e47 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 11 Mar 2016 17:06:17 -0500 +Subject: [PATCH 1/1] resolved: create /etc/resolv.conf symlink at runtime + +If the symlink doesn't exists, and we are being started, let's +create it to provie name resolution. + +If it exists, do nothing. In particular, if it is a broken symlink, +we cannot really know if the administator configured it to point to +a location used by some service that hasn't started yet, so we +don't touch it in that case either. + +https://bugzilla.redhat.com/show_bug.cgi?id=1313085 + +[fbui: fixes boo#1024897] +--- + src/resolve/resolved.c | 4 ++++ + tmpfiles.d/etc.conf.m4 | 3 --- + 2 files changed, 4 insertions(+), 3 deletions(-) + +diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c +index a4cda0b5e..68bca8077 100644 +--- a/src/resolve/resolved.c ++++ b/src/resolve/resolved.c +@@ -71,6 +71,10 @@ int main(int argc, char *argv[]) { + /* Drop privileges, but only if we have been started as root. If we are not running as root we assume all + * privileges are already dropped. */ + if (getuid() == 0) { ++ r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); ++ if (r < 0 && errno != EEXIST) ++ log_warning_errno(errno, ++ "Could not create /etc/resolv.conf symlink: %m"); + + /* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */ + r = drop_privileges(uid, gid, +diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 +index df8d42101..928105ea8 100644 +--- a/tmpfiles.d/etc.conf.m4 ++++ b/tmpfiles.d/etc.conf.m4 +@@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts + m4_ifdef(`HAVE_SMACK_RUN_LABEL', + t /etc/mtab - - - - security.SMACK64=_ + )m4_dnl +-m4_ifdef(`ENABLE_RESOLVE', +-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf +-)m4_dnl + C /etc/nsswitch.conf - - - - + m4_ifdef(`HAVE_PAM', + C /etc/pam.d - - - - +-- +2.16.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 872d187a..57ee268c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 13 13:29:59 UTC 2018 - fbui@suse.com + +- Import commit f63623c1fc0eb01b8efc2037d004f42ed8328356 + + 6a161916f device: make sure to always retroactively start device dependencies (take #2) (bsc#1088052) + e4402648c Fix pattern to detect distribution + ad59c7970 install: "user" and "global" scopes are equivalent for user presets (boo#1093851) + b1876c81a rpm: remove confusing --user before --global + 00ea8a214 man: updated systemd-analyze blame description for service-units with Type=simple (#8834) (bsc#1091265) + a9b587e2f fileio.c: fix incorrect mtime + +------------------------------------------------------------------- +Tue Jun 12 13:38:23 UTC 2018 - fbui@suse.com + +- Add 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (boo#1024897) +- Ship systemd-resolved (but disabled by default) (bsc#1018387) + ------------------------------------------------------------------- Fri May 18 08:39:41 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 5bfad6f2..294b59e4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.57.gd81968050 +%define suse_version +suse.64.gf63623c1f %bcond_with gnuefi %if 0%{?bootstrap} @@ -34,18 +34,19 @@ %bcond_with machined %bcond_with importd %bcond_with networkd +%bcond_with resolved %bcond_with journal_remote %else %bcond_without sysvcompat %bcond_without machined %bcond_without importd %bcond_without networkd +%bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif %endif -%bcond_with resolved %bcond_with parentpathid Name: systemd-mini @@ -162,6 +163,7 @@ Source1002: 99-wakeup-from-idle.rules # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. +Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -424,7 +426,7 @@ systemd-journal-remote, and systemd-journal-upload. %prep %setup -q -n systemd-v%{version}%{suse_version} -# %%autopatch -p1 +%autopatch -p1 %build opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) @@ -1010,7 +1012,6 @@ fi %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf -%exclude %{_tmpfilesdir}/systemd-remote.conf %endif %{_libexecdir}/environment.d/ @@ -1111,6 +1112,9 @@ fi %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif +%if %{with resolved} +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* diff --git a/systemd-v237+suse.57.gd81968050.tar.xz b/systemd-v237+suse.57.gd81968050.tar.xz deleted file mode 100644 index 963d977f..00000000 --- a/systemd-v237+suse.57.gd81968050.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8c92c0a8012c1b5b7a2866854ecdbcffca697d5cb65df43ad6a7a2859c95915e -size 4627256 diff --git a/systemd-v237+suse.64.gf63623c1f.tar.xz b/systemd-v237+suse.64.gf63623c1f.tar.xz new file mode 100644 index 00000000..f9cd526d --- /dev/null +++ b/systemd-v237+suse.64.gf63623c1f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b8e33fbc2e480712d72fbb01548c9f3a4f6f9257b55772a58398ec3d0c63b47f +size 4627420 diff --git a/systemd.changes b/systemd.changes index 872d187a..57ee268c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,21 @@ +------------------------------------------------------------------- +Wed Jun 13 13:29:59 UTC 2018 - fbui@suse.com + +- Import commit f63623c1fc0eb01b8efc2037d004f42ed8328356 + + 6a161916f device: make sure to always retroactively start device dependencies (take #2) (bsc#1088052) + e4402648c Fix pattern to detect distribution + ad59c7970 install: "user" and "global" scopes are equivalent for user presets (boo#1093851) + b1876c81a rpm: remove confusing --user before --global + 00ea8a214 man: updated systemd-analyze blame description for service-units with Type=simple (#8834) (bsc#1091265) + a9b587e2f fileio.c: fix incorrect mtime + +------------------------------------------------------------------- +Tue Jun 12 13:38:23 UTC 2018 - fbui@suse.com + +- Add 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (boo#1024897) +- Ship systemd-resolved (but disabled by default) (bsc#1018387) + ------------------------------------------------------------------- Fri May 18 08:39:41 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index c356ee33..b5889757 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.57.gd81968050 +%define suse_version +suse.64.gf63623c1f %bcond_with gnuefi %if 0%{?bootstrap} @@ -32,18 +32,19 @@ %bcond_with machined %bcond_with importd %bcond_with networkd +%bcond_with resolved %bcond_with journal_remote %else %bcond_without sysvcompat %bcond_without machined %bcond_without importd %bcond_without networkd +%bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif %endif -%bcond_with resolved %bcond_with parentpathid Name: systemd @@ -160,6 +161,7 @@ Source1002: 99-wakeup-from-idle.rules # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. +Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -422,7 +424,7 @@ systemd-journal-remote, and systemd-journal-upload. %prep %setup -q -n systemd-v%{version}%{suse_version} -# %%autopatch -p1 +%autopatch -p1 %build opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) @@ -1008,7 +1010,6 @@ fi %if %{with journal_remote} %exclude %{_sysusersdir}/systemd-remote.conf -%exclude %{_tmpfilesdir}/systemd-remote.conf %endif %{_libexecdir}/environment.d/ @@ -1109,6 +1110,9 @@ fi %if %{with networkd} %{_datadir}/polkit-1/rules.d/systemd-networkd.rules %endif +%if %{with resolved} +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* From f6c40c04dc952703d256e1c19c7b2a677c673ada53779d609e56e8790f467b6f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 13 Jul 2018 08:11:26 +0000 Subject: [PATCH 024/124] Accepting request 620729 from Base:System Automatic submission by obs-autosubmit OBS-URL: https://build.opensuse.org/request/show/620729 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=282 --- systemd-mini.changes | 11 +++++++++++ systemd-mini.spec | 1 - systemd.changes | 11 +++++++++++ systemd.spec | 1 - 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 57ee268c..87a8c4a4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 25 09:16:19 UTC 2018 - fbui@suse.com + +- Drop runtime dependency on dracut (bsc#1098569) + + Otherwise systemd pulls in tools to generate the initrd even in + container/chroot installations that don't have a kernel anyways. + + For environments where initrd matters, dracut should be pulled via a + pattern. + ------------------------------------------------------------------- Wed Jun 13 13:29:59 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 294b59e4..26cc8806 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -240,7 +240,6 @@ Requires(post): sed Requires(post): coreutils Requires(postun): coreutils Requires(postun): /usr/bin/systemctl -Requires(posttrans): suse-module-tools >= 12.4 Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 diff --git a/systemd.changes b/systemd.changes index 57ee268c..87a8c4a4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Jun 25 09:16:19 UTC 2018 - fbui@suse.com + +- Drop runtime dependency on dracut (bsc#1098569) + + Otherwise systemd pulls in tools to generate the initrd even in + container/chroot installations that don't have a kernel anyways. + + For environments where initrd matters, dracut should be pulled via a + pattern. + ------------------------------------------------------------------- Wed Jun 13 13:29:59 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index b5889757..f2b0215c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -238,7 +238,6 @@ Requires(post): sed Requires(post): coreutils Requires(postun): coreutils Requires(postun): /usr/bin/systemctl -Requires(posttrans): suse-module-tools >= 12.4 Conflicts: systemd < 39 Conflicts: aaa_base < 11.5 From 11f17dd035a28219fce976a25e9038cc4c398161d5ad6e3188dfabd974718632 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 2 Aug 2018 12:50:30 +0000 Subject: [PATCH 025/124] Accepting request 625755 from Base:System OBS-URL: https://build.opensuse.org/request/show/625755 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=283 --- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 2 +- systemd-v237+suse.64.gf63623c1f.tar.xz | 3 --- systemd-v237+suse.71.g0350f62a8.tar.xz | 3 +++ systemd.changes | 12 ++++++++++++ systemd.spec | 2 +- 6 files changed, 29 insertions(+), 5 deletions(-) delete mode 100644 systemd-v237+suse.64.gf63623c1f.tar.xz create mode 100644 systemd-v237+suse.71.g0350f62a8.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 87a8c4a4..1b0d8985 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 27 10:23:29 UTC 2018 - fbui@suse.com + +- Import commit 0350f62a8cf7f151951b6b78337fe3c198b8bf6a + + fbf43a697 core: don't freeze OnCalendar= timer units when the clock goes back a lot (bsc#1090944) + 4134ba8b6 man: SystemMaxUse= clarification in journald.conf(5) (bnc#1101040) + 78bb2a0c4 socket-util: fix getpeergroups() assert(fd) (#8080) (bsc#1096516) + 1753d0420 systemctl: mask always reports the same unit names when different unknown units are passed (bsc#1095973) + 50ebf79d7 scsi_id: Fixup prefix for pre-SPC inquiry reply (bsc#1039099) + 570f7655b locale-util: on overlayfs FTW_MOUNT causes nftw(3) to not list *any* files + ------------------------------------------------------------------- Mon Jun 25 09:16:19 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 26cc8806..9f9aa45e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.64.gf63623c1f +%define suse_version +suse.71.g0350f62a8 %bcond_with gnuefi %if 0%{?bootstrap} diff --git a/systemd-v237+suse.64.gf63623c1f.tar.xz b/systemd-v237+suse.64.gf63623c1f.tar.xz deleted file mode 100644 index f9cd526d..00000000 --- a/systemd-v237+suse.64.gf63623c1f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b8e33fbc2e480712d72fbb01548c9f3a4f6f9257b55772a58398ec3d0c63b47f -size 4627420 diff --git a/systemd-v237+suse.71.g0350f62a8.tar.xz b/systemd-v237+suse.71.g0350f62a8.tar.xz new file mode 100644 index 00000000..f8e4dc5a --- /dev/null +++ b/systemd-v237+suse.71.g0350f62a8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6ecff52170239199d824770b49be4923bceba2544371b266f9f2d695702a44f0 +size 4627884 diff --git a/systemd.changes b/systemd.changes index 87a8c4a4..1b0d8985 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Fri Jul 27 10:23:29 UTC 2018 - fbui@suse.com + +- Import commit 0350f62a8cf7f151951b6b78337fe3c198b8bf6a + + fbf43a697 core: don't freeze OnCalendar= timer units when the clock goes back a lot (bsc#1090944) + 4134ba8b6 man: SystemMaxUse= clarification in journald.conf(5) (bnc#1101040) + 78bb2a0c4 socket-util: fix getpeergroups() assert(fd) (#8080) (bsc#1096516) + 1753d0420 systemctl: mask always reports the same unit names when different unknown units are passed (bsc#1095973) + 50ebf79d7 scsi_id: Fixup prefix for pre-SPC inquiry reply (bsc#1039099) + 570f7655b locale-util: on overlayfs FTW_MOUNT causes nftw(3) to not list *any* files + ------------------------------------------------------------------- Mon Jun 25 09:16:19 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index f2b0215c..3c26cd4a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.64.gf63623c1f +%define suse_version +suse.71.g0350f62a8 %bcond_with gnuefi %if 0%{?bootstrap} From 8c2f3919c10d2df919a5f2e1612a6ca138b3f1e5463c3b020a0ec7e6caec7c63 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Aug 2018 21:56:48 +0000 Subject: [PATCH 026/124] Accepting request 628336 from Base:System OBS-URL: https://build.opensuse.org/request/show/628336 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=284 --- systemd-mini.changes | 16 ++++++++++++++++ systemd-mini.spec | 3 ++- systemd-v237+suse.71.g0350f62a8.tar.xz | 3 --- systemd-v237+suse.76.gbb5a925bc.tar.xz | 3 +++ systemd.changes | 16 ++++++++++++++++ systemd.spec | 3 ++- 6 files changed, 39 insertions(+), 5 deletions(-) delete mode 100644 systemd-v237+suse.71.g0350f62a8.tar.xz create mode 100644 systemd-v237+suse.76.gbb5a925bc.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 1b0d8985..9154009b 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com + +- Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 + + 8983bd246 core: don't include libmount.h in a header file (#8580) + 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) + 42edc93ac core/service: rework the hold-off time over message + +------------------------------------------------------------------- +Wed Aug 1 12:19:40 UTC 2018 - fbui@suse.com + +- Enable regexp matching support + + Currently only used by "journalctl --grep=xxx". + ------------------------------------------------------------------- Fri Jul 27 10:23:29 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 9f9aa45e..5701729a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.71.g0350f62a8 +%define suse_version +suse.76.gbb5a925bc %bcond_with gnuefi %if 0%{?bootstrap} @@ -70,6 +70,7 @@ BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x diff --git a/systemd-v237+suse.71.g0350f62a8.tar.xz b/systemd-v237+suse.71.g0350f62a8.tar.xz deleted file mode 100644 index f8e4dc5a..00000000 --- a/systemd-v237+suse.71.g0350f62a8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6ecff52170239199d824770b49be4923bceba2544371b266f9f2d695702a44f0 -size 4627884 diff --git a/systemd-v237+suse.76.gbb5a925bc.tar.xz b/systemd-v237+suse.76.gbb5a925bc.tar.xz new file mode 100644 index 00000000..227460b4 --- /dev/null +++ b/systemd-v237+suse.76.gbb5a925bc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3e53944f87bf7603766cdd7230a2898c2948ede4c1f5a7e0e1fac3810f93fd57 +size 4627756 diff --git a/systemd.changes b/systemd.changes index 1b0d8985..9154009b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com + +- Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 + + 8983bd246 core: don't include libmount.h in a header file (#8580) + 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) + 42edc93ac core/service: rework the hold-off time over message + +------------------------------------------------------------------- +Wed Aug 1 12:19:40 UTC 2018 - fbui@suse.com + +- Enable regexp matching support + + Currently only used by "journalctl --grep=xxx". + ------------------------------------------------------------------- Fri Jul 27 10:23:29 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 3c26cd4a..80630a40 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.71.g0350f62a8 +%define suse_version +suse.76.gbb5a925bc %bcond_with gnuefi %if 0%{?bootstrap} @@ -68,6 +68,7 @@ BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) +BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x From 789ca66d38e4c7d561874f6a997e5af64ce57092d1f66c2763e260b564ed2dd8 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Tue, 18 Sep 2018 09:39:40 +0000 Subject: [PATCH 027/124] Accepting request 635765 from Base:System OBS-URL: https://build.opensuse.org/request/show/635765 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=285 --- systemd-mini.changes | 24 ++++++++++++++++++++++++ systemd-mini.spec | 5 +++-- systemd-v237+suse.76.gbb5a925bc.tar.xz | 3 --- systemd-v237+suse.85.gcc55f1ea9.tar.xz | 3 +++ systemd.changes | 24 ++++++++++++++++++++++++ systemd.spec | 5 +++-- 6 files changed, 57 insertions(+), 7 deletions(-) delete mode 100644 systemd-v237+suse.76.gbb5a925bc.tar.xz create mode 100644 systemd-v237+suse.85.gcc55f1ea9.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 9154009b..65c80bf9 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com + +- Enable or disable machines.target according to the presets (bsc#1107941) + +------------------------------------------------------------------- +Fri Sep 14 07:11:17 UTC 2018 - fbui@suse.com + +- Import commit cc55f1ea9e1c1ccab5b9fb97e10e08830d02b282 + + 962b38aaf user@.service: don't kill user manager at runlevel switch (bsc#1091677) + 3986c4d82 units: make sure user@.service runs with dbus still up + 5e68aa0f2 Revert "udevd: increase maximum number of children" (bsc#1107617) + 099138fd9 fix race between daemon-reload and other commands (v237) (bsc#1105031) + +------------------------------------------------------------------- +Tue Sep 11 07:30:24 UTC 2018 - fbui@suse.com + +- Import commit 6ac2232d88f4b64428511a4692a51bd00d610b32 + + 6247696db nspawn: always use mode 555 for /sys (bsc#1107640) + 72f558b57 cryptsetup: do not define arg_sector_size if libgcrypt is v1.x (#9990) + cfcd97cf2 cryptsetup: add support for sector-size= option (#9936) (fate#325634) + ------------------------------------------------------------------- Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 5701729a..80b80f08 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.76.gbb5a925bc +%define suse_version +suse.85.gcc55f1ea9 %bcond_with gnuefi %if 0%{?bootstrap} @@ -713,8 +713,9 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. -%systemd_post remote-fs.target %systemd_post getty@.service +%systemd_post machines.target +%systemd_post remote-fs.target %systemd_post systemd-timesyncd.service %if %{with networkd} %systemd_post systemd-networkd.service diff --git a/systemd-v237+suse.76.gbb5a925bc.tar.xz b/systemd-v237+suse.76.gbb5a925bc.tar.xz deleted file mode 100644 index 227460b4..00000000 --- a/systemd-v237+suse.76.gbb5a925bc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3e53944f87bf7603766cdd7230a2898c2948ede4c1f5a7e0e1fac3810f93fd57 -size 4627756 diff --git a/systemd-v237+suse.85.gcc55f1ea9.tar.xz b/systemd-v237+suse.85.gcc55f1ea9.tar.xz new file mode 100644 index 00000000..88eb8a47 --- /dev/null +++ b/systemd-v237+suse.85.gcc55f1ea9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c4a8bdcffdc06109d59f07af97bed75af8a49df2b2c6ad41a13e5fe82971b350 +size 4627976 diff --git a/systemd.changes b/systemd.changes index 9154009b..65c80bf9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com + +- Enable or disable machines.target according to the presets (bsc#1107941) + +------------------------------------------------------------------- +Fri Sep 14 07:11:17 UTC 2018 - fbui@suse.com + +- Import commit cc55f1ea9e1c1ccab5b9fb97e10e08830d02b282 + + 962b38aaf user@.service: don't kill user manager at runlevel switch (bsc#1091677) + 3986c4d82 units: make sure user@.service runs with dbus still up + 5e68aa0f2 Revert "udevd: increase maximum number of children" (bsc#1107617) + 099138fd9 fix race between daemon-reload and other commands (v237) (bsc#1105031) + +------------------------------------------------------------------- +Tue Sep 11 07:30:24 UTC 2018 - fbui@suse.com + +- Import commit 6ac2232d88f4b64428511a4692a51bd00d610b32 + + 6247696db nspawn: always use mode 555 for /sys (bsc#1107640) + 72f558b57 cryptsetup: do not define arg_sector_size if libgcrypt is v1.x (#9990) + cfcd97cf2 cryptsetup: add support for sector-size= option (#9936) (fate#325634) + ------------------------------------------------------------------- Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 80630a40..b291dcf2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.76.gbb5a925bc +%define suse_version +suse.85.gcc55f1ea9 %bcond_with gnuefi %if 0%{?bootstrap} @@ -711,8 +711,9 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. -%systemd_post remote-fs.target %systemd_post getty@.service +%systemd_post machines.target +%systemd_post remote-fs.target %systemd_post systemd-timesyncd.service %if %{with networkd} %systemd_post systemd-networkd.service From 1484572235dcda13b469b254528effa45266c0914bb7c9273741e49326215760 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 2 Oct 2018 17:42:38 +0000 Subject: [PATCH 028/124] Accepting request 638971 from Base:System OBS-URL: https://build.opensuse.org/request/show/638971 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=286 --- systemd-mini.changes | 13 +++++++++++++ systemd-mini.spec | 2 +- systemd-v237+suse.85.gcc55f1ea9.tar.xz | 3 --- systemd-v237+suse.93.ga67b516d4.tar.xz | 3 +++ systemd.changes | 13 +++++++++++++ systemd.spec | 2 +- 6 files changed, 31 insertions(+), 5 deletions(-) delete mode 100644 systemd-v237+suse.85.gcc55f1ea9.tar.xz create mode 100644 systemd-v237+suse.93.ga67b516d4.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 65c80bf9..14ec559e 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com + +- Import commit a67b516d49115a5be0f2ac27a2874cee6c59a7ae + + f8457adf9d emergency: make sure console password agents don't interfere with the emergency shell + b8bbb50634 man: document that 'nofail' also has an effect on ordering + a5410b2229 journald: take leading spaces into account in syslog_parse_identifier + b793c312c7 journal: do not remove multiple spaces after identifier in syslog message + f9595f0481 syslog: fix segfault in syslog_parse_priority() + d464f06934 journal: fix syslog_parse_identifier() + e70422883a socket-util: attempt SO_RCVBUFFORCE/SO_SNDBUFFORCE only if SO_RCVBUF/SO_SNDBUF fails (bsc#991901) + ------------------------------------------------------------------- Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 80b80f08..758d4d87 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.85.gcc55f1ea9 +%define suse_version +suse.93.ga67b516d4 %bcond_with gnuefi %if 0%{?bootstrap} diff --git a/systemd-v237+suse.85.gcc55f1ea9.tar.xz b/systemd-v237+suse.85.gcc55f1ea9.tar.xz deleted file mode 100644 index 88eb8a47..00000000 --- a/systemd-v237+suse.85.gcc55f1ea9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c4a8bdcffdc06109d59f07af97bed75af8a49df2b2c6ad41a13e5fe82971b350 -size 4627976 diff --git a/systemd-v237+suse.93.ga67b516d4.tar.xz b/systemd-v237+suse.93.ga67b516d4.tar.xz new file mode 100644 index 00000000..f9e9ce79 --- /dev/null +++ b/systemd-v237+suse.93.ga67b516d4.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:197b53c8d49a912f600a234884ea7000b34147bc13068fe71946550cfc090552 +size 4628352 diff --git a/systemd.changes b/systemd.changes index 65c80bf9..14ec559e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com + +- Import commit a67b516d49115a5be0f2ac27a2874cee6c59a7ae + + f8457adf9d emergency: make sure console password agents don't interfere with the emergency shell + b8bbb50634 man: document that 'nofail' also has an effect on ordering + a5410b2229 journald: take leading spaces into account in syslog_parse_identifier + b793c312c7 journal: do not remove multiple spaces after identifier in syslog message + f9595f0481 syslog: fix segfault in syslog_parse_priority() + d464f06934 journal: fix syslog_parse_identifier() + e70422883a socket-util: attempt SO_RCVBUFFORCE/SO_SNDBUFFORCE only if SO_RCVBUF/SO_SNDBUF fails (bsc#991901) + ------------------------------------------------------------------- Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index b291dcf2..0bf5d959 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.85.gcc55f1ea9 +%define suse_version +suse.93.ga67b516d4 %bcond_with gnuefi %if 0%{?bootstrap} From d40672a9948ef3887173a9aa564892dcd82dc50ecf3c336d65f728b15521aa4e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 25 Oct 2018 06:11:24 +0000 Subject: [PATCH 029/124] Accepting request 642104 from Base:System OBS-URL: https://build.opensuse.org/request/show/642104 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=287 --- systemd-mini.changes | 24 ++++++++++++++++++++++++ systemd-mini.spec | 20 +++++++++++++------- systemd-v237+suse.100.g19b3868d3.tar.xz | 3 +++ systemd-v237+suse.93.ga67b516d4.tar.xz | 3 --- systemd.changes | 24 ++++++++++++++++++++++++ systemd.spec | 20 +++++++++++++------- 6 files changed, 77 insertions(+), 17 deletions(-) create mode 100644 systemd-v237+suse.100.g19b3868d3.tar.xz delete mode 100644 systemd-v237+suse.93.ga67b516d4.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 14ec559e..64a87a55 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Oct 15 16:23:05 UTC 2018 - Franck Bui + +- Ship systemd-sysv-install helper via the main package + + This script was part of systemd-sysvinit sub-package but it was + wrong since systemd-sysv-install is a script used to redirect + enable/disable operations to chkconfig when the unit targets are + sysv init scripts. Therefore it's never been a SySV init tool. + + While at it, don't ship this script (as well as + systemd-sysv-convert) when sysvcompat is not defined. + +------------------------------------------------------------------- +Mon Oct 15 15:01:48 UTC 2018 - Franck Bui + +- Import commit 19b3868d32af20f1ecc86fe3c997144ff456fd65 + + 06c2284d64 core: introduce systemd.early_core_pattern= kernel cmdline option + 479b002083 core: add missing 'continue' statement + c7fbccc62e journald: don't ship systemd-journald-audit.socket (bsc#1109252) + f17a6c790c detect-virt: do not try to read all of /proc/cpuinfo (bsc#1109197) + 5a1aa84544 compat-rules: generate more compat by-id symlinks for NVMe devices (bsc#1095096) + ------------------------------------------------------------------- Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 758d4d87..55537c48 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.93.ga67b516d4 +%define suse_version +suse.100.g19b3868d3 %bcond_with gnuefi %if 0%{?bootstrap} @@ -143,10 +143,12 @@ Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user +%if %{with sysvcompat} Source3: systemd-sysv-convert +Source4: systemd-sysv-install +%endif Source6: baselibs.conf Source11: after-local.service -Source12: systemd-sysv-install Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh @@ -492,11 +494,13 @@ ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd +%if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert -install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +%endif # The rules that we shouldn't maintain install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules @@ -914,7 +918,9 @@ fi %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl +%if %{with sysvcompat} %{_sbindir}/systemd-sysv-convert +%endif %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat @@ -934,7 +940,6 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif %exclude %{_prefix}/lib/systemd/systemd-coredump -%exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* @@ -1150,9 +1155,11 @@ fi %{_udevrulesdir}/73-seat-late.rules %{_udevrulesdir}/99-systemd.rules %dir %{_localstatedir}/lib/systemd +%dir %{_localstatedir}/lib/systemd/catalog +%if %{with sysvcompat} %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated -%dir %{_localstatedir}/lib/systemd/catalog +%endif %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed @@ -1194,7 +1201,6 @@ fi %{_mandir}/man8/telinit.8* %{_mandir}/man8/runlevel.8* %endif -%{_prefix}/lib/systemd/systemd-sysv-install %files -n udev%{?mini} %defattr(-,root,root) diff --git a/systemd-v237+suse.100.g19b3868d3.tar.xz b/systemd-v237+suse.100.g19b3868d3.tar.xz new file mode 100644 index 00000000..5e7c3bb1 --- /dev/null +++ b/systemd-v237+suse.100.g19b3868d3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1a821019ddd446a6a4d25c5152b0cdd42b197c8657c69dadc393dd36b189784f +size 4629044 diff --git a/systemd-v237+suse.93.ga67b516d4.tar.xz b/systemd-v237+suse.93.ga67b516d4.tar.xz deleted file mode 100644 index f9e9ce79..00000000 --- a/systemd-v237+suse.93.ga67b516d4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:197b53c8d49a912f600a234884ea7000b34147bc13068fe71946550cfc090552 -size 4628352 diff --git a/systemd.changes b/systemd.changes index 14ec559e..64a87a55 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Oct 15 16:23:05 UTC 2018 - Franck Bui + +- Ship systemd-sysv-install helper via the main package + + This script was part of systemd-sysvinit sub-package but it was + wrong since systemd-sysv-install is a script used to redirect + enable/disable operations to chkconfig when the unit targets are + sysv init scripts. Therefore it's never been a SySV init tool. + + While at it, don't ship this script (as well as + systemd-sysv-convert) when sysvcompat is not defined. + +------------------------------------------------------------------- +Mon Oct 15 15:01:48 UTC 2018 - Franck Bui + +- Import commit 19b3868d32af20f1ecc86fe3c997144ff456fd65 + + 06c2284d64 core: introduce systemd.early_core_pattern= kernel cmdline option + 479b002083 core: add missing 'continue' statement + c7fbccc62e journald: don't ship systemd-journald-audit.socket (bsc#1109252) + f17a6c790c detect-virt: do not try to read all of /proc/cpuinfo (bsc#1109197) + 5a1aa84544 compat-rules: generate more compat by-id symlinks for NVMe devices (bsc#1095096) + ------------------------------------------------------------------- Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 0bf5d959..15a79547 100644 --- a/systemd.spec +++ b/systemd.spec @@ -12,7 +12,7 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.93.ga67b516d4 +%define suse_version +suse.100.g19b3868d3 %bcond_with gnuefi %if 0%{?bootstrap} @@ -141,10 +141,12 @@ Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user +%if %{with sysvcompat} Source3: systemd-sysv-convert +Source4: systemd-sysv-install +%endif Source6: baselibs.conf Source11: after-local.service -Source12: systemd-sysv-install Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh @@ -490,11 +492,13 @@ ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd +%if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert -install -m0755 -D %{S:12} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +%endif # The rules that we shouldn't maintain install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules @@ -912,7 +916,9 @@ fi %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl +%if %{with sysvcompat} %{_sbindir}/systemd-sysv-convert +%endif %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat @@ -932,7 +938,6 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif %exclude %{_prefix}/lib/systemd/systemd-coredump -%exclude %{_prefix}/lib/systemd/systemd-sysv* %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* @@ -1148,9 +1153,11 @@ fi %{_udevrulesdir}/73-seat-late.rules %{_udevrulesdir}/99-systemd.rules %dir %{_localstatedir}/lib/systemd +%dir %{_localstatedir}/lib/systemd/catalog +%if %{with sysvcompat} %dir %{_localstatedir}/lib/systemd/sysv-convert %dir %{_localstatedir}/lib/systemd/migrated -%dir %{_localstatedir}/lib/systemd/catalog +%endif %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/random-seed @@ -1192,7 +1199,6 @@ fi %{_mandir}/man8/telinit.8* %{_mandir}/man8/runlevel.8* %endif -%{_prefix}/lib/systemd/systemd-sysv-install %files -n udev%{?mini} %defattr(-,root,root) From 7756ea9467f2443cf9833a5497b589dc9f140d98b86605c34322cf9ffc134a9b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Nov 2018 15:34:40 +0000 Subject: [PATCH 030/124] Accepting request 647604 from Base:System OBS-URL: https://build.opensuse.org/request/show/647604 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=288 --- ...ward-compatibility-with-UserTasksMax.patch | 185 ++++++++++++++++++ 60-io-scheduler.rules | 24 --- 80-hotplug-cpu-mem.rules | 24 --- 99-wakeup-from-idle.rules | 3 - systemd-mini.changes | 100 ++++++++++ systemd-mini.spec | 105 ++++++---- systemd-v237+suse.100.g19b3868d3.tar.xz | 3 - systemd-v239+suse.87.gf39674d6d.tar.xz | 3 + systemd.changes | 100 ++++++++++ systemd.spec | 105 ++++++---- 10 files changed, 512 insertions(+), 140 deletions(-) create mode 100644 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch delete mode 100644 60-io-scheduler.rules delete mode 100644 80-hotplug-cpu-mem.rules delete mode 100644 99-wakeup-from-idle.rules delete mode 100644 systemd-v237+suse.100.g19b3868d3.tar.xz create mode 100644 systemd-v239+suse.87.gf39674d6d.tar.xz diff --git a/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch b/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch new file mode 100644 index 00000000..a8e39cfd --- /dev/null +++ b/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch @@ -0,0 +1,185 @@ +From d3acd5b49a6a321dc3b1512416132b8724b2fd20 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Tue, 6 Nov 2018 11:51:26 +0100 +Subject: [PATCH] logind: keep backward compatibility with UserTasksMax= in + logind.conf + +Since commit 284149392755f086d0a71, UserTasksMax= support has been simply +dropped. + +A generator is used to automatically create an appropriate dropin that has the +same effect. However since the snippet is generated in /run, sysadmin is +encouraged to copy it in /etc to make it persistent. + +The main advantages to use a generator are: + + - sysadmin is aware of this backward incompatible change + + - he will be the one who will fix logind.conf manually (to remove the use of + UserTasksMax=) + + - he will decide how to name the snippet and possibly merge it with an + existing one + +Expect this generator to be dropped in the future. +--- + meson.build | 8 ++++ + src/login/compat-tasks-max-generator.c | 66 ++++++++++++++++++++++++++ + src/login/logind-user.c | 43 +++++++++++++++-- + 3 files changed, 112 insertions(+), 5 deletions(-) + create mode 100644 src/login/compat-tasks-max-generator.c + +diff --git a/meson.build b/meson.build +index 5c7c165ba..7e3e8ca16 100644 +--- a/meson.build ++++ b/meson.build +@@ -1701,6 +1701,14 @@ if conf.get('ENABLE_LOGIND') == 1 + endif + endif + ++executable('logind-compat-tasks-max-generator', ++ 'src/login/compat-tasks-max-generator.c', ++ include_directories : includes, ++ link_with : [libshared, liblogind_core], ++ install_rpath : rootlibexecdir, ++ install : true, ++ install_dir : systemgeneratordir) ++ + executable('systemd-user-runtime-dir', + user_runtime_dir_sources, + include_directories : includes, +diff --git a/src/login/compat-tasks-max-generator.c b/src/login/compat-tasks-max-generator.c +new file mode 100644 +index 000000000..404ca5f23 +--- /dev/null ++++ b/src/login/compat-tasks-max-generator.c +@@ -0,0 +1,66 @@ ++#include ++ ++#include "alloc-util.h" ++#include "dropin.h" ++#include "logind.h" ++#include "path-util.h" ++ ++static const char *arg_dest = "/tmp"; ++ ++static int read_manager_configuration(uint64_t *user_tasks_max) { ++ Manager m = {}; ++ int r; ++ ++ manager_reset_config(&m); ++ m.user_tasks_max = 0; ++ ++ r = manager_parse_config_file(&m); ++ if (r < 0) ++ return log_warning_errno(r, "Failed to parse logind.conf: %m"); ++ ++ if (m.user_tasks_max == 0) ++ return 0; ++ ++ *user_tasks_max = m.user_tasks_max; ++ return 1; ++} ++ ++int main(int argc, char *argv[]) { ++ _cleanup_free_ char *p = NULL; ++ uint64_t user_tasks_max; ++ int r = 0; ++ ++ if (argc > 1 && argc != 4) { ++ log_error("This program takes three or no arguments."); ++ return EXIT_FAILURE; ++ } ++ ++ if (argc > 1) ++ arg_dest = argv[1]; ++ ++ log_set_prohibit_ipc(true); ++ log_set_target(LOG_TARGET_AUTO); ++ log_parse_environment(); ++ log_open(); ++ ++ umask(0022); ++ ++ r = read_manager_configuration(&user_tasks_max); ++ if (r == 0) ++ return EXIT_SUCCESS; ++ if (r < 0) ++ return EXIT_FAILURE; ++ ++ p = path_join(arg_dest, "user-.slice.d", "50-limits.conf"); ++ if (!p) ++ return EXIT_FAILURE; ++ ++ log_warning("Creating %s to keep compability\n" ++ "Consider copying the snippet in /etc/systemd/system/user-.slice.d/\n", p); ++ ++ r = write_drop_in_format(arg_dest, "user-.slice", 50, "limits", ++ "# Automatically generated by logind-compat-tasks-max-generator\n\n" ++ "[Slice]\nTasksMax=%" PRIu64, user_tasks_max); ++ ++ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; ++} +diff --git a/src/login/logind-user.c b/src/login/logind-user.c +index 66f5c896d..fe58b0398 100644 +--- a/src/login/logind-user.c ++++ b/src/login/logind-user.c +@@ -743,17 +743,50 @@ int config_parse_compat_user_tasks_max( + void *data, + void *userdata) { + ++ uint64_t *m = data; ++ uint64_t k; ++ int r; ++ + assert(filename); + assert(lvalue); + assert(rvalue); + assert(data); + +- log_syntax(unit, LOG_NOTICE, filename, line, 0, ++ log_syntax(unit, LOG_WARNING, filename, line, 0, + "Support for option %s= has been removed.", + lvalue); +- log_info("Hint: try creating /etc/systemd/system/user-.slice.d/50-limits.conf with:\n" +- " [Slice]\n" +- " TasksMax=%s", +- rvalue); ++ ++ if (isempty(rvalue)) { ++ *m = system_tasks_max_scale(DEFAULT_USER_TASKS_MAX_PERCENTAGE, 100U); ++ return 0; ++ } ++ ++ if (streq(rvalue, "infinity")) { ++ *m = CGROUP_LIMIT_MAX; ++ return 0; ++ } ++ ++ /* Try to parse as percentage */ ++ r = parse_percent(rvalue); ++ if (r >= 0) ++ k = system_tasks_max_scale(r, 100U); ++ else { ++ ++ /* If the passed argument was not a percentage, or out of range, parse as byte size */ ++ ++ r = safe_atou64(rvalue, &k); ++ if (r < 0) { ++ log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse tasks maximum, ignoring: %s", rvalue); ++ return 0; ++ } ++ } ++ ++ if (k <= 0 || k >= UINT64_MAX) { ++ log_syntax(unit, LOG_ERR, filename, line, 0, "Tasks maximum out of range, ignoring: %s", rvalue); ++ return 0; ++ } ++ ++ *m = k; ++ + return 0; + } +-- +2.19.0 + diff --git a/60-io-scheduler.rules b/60-io-scheduler.rules deleted file mode 100644 index 7c285aef..00000000 --- a/60-io-scheduler.rules +++ /dev/null @@ -1,24 +0,0 @@ -# Set optimal IO schedulers for HDD and SSD - -ACTION!="add", GOTO="scheduler_end" -SUBSYSTEM!="block", GOTO="scheduler_end" - -# Do not change scheduler if `elevator` cmdline parameter is set -IMPORT{cmdline}="elevator" -ENV{elevator}=="?*", GOTO="scheduler_end" - -# Determine if BLK-MQ is enabled -TEST=="%S%p/mq", ENV{.IS_MQ}="1" - -# MQ: BFQ scheduler for HDD -ENV{.IS_MQ}=="1", ATTR{queue/rotational}!="0", ATTR{queue/scheduler}="bfq" -# MQ: deadline scheduler for SSD -ENV{.IS_MQ}=="1", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="mq-deadline" - -# Non-MQ: CFQ scheduler for HDD -ENV{.IS_MQ}!="1", ATTR{queue/rotational}!="0", ATTR{queue/scheduler}="cfq" -# Non-MQ: deadline scheduler for SSD -ENV{.IS_MQ}!="1", ATTR{queue/rotational}=="0", ATTR{queue/scheduler}="deadline" - -LABEL="scheduler_end" - diff --git a/80-hotplug-cpu-mem.rules b/80-hotplug-cpu-mem.rules deleted file mode 100644 index 86a6c272..00000000 --- a/80-hotplug-cpu-mem.rules +++ /dev/null @@ -1,24 +0,0 @@ -# do not edit this file, it will be overwritten on update - -# -# Hotplug physical CPU -# -SUBSYSTEM=="cpu", ACTION=="add", TEST=="online", ATTR{online}=="0", ATTR{online}="1" - -# -# Hotplug physical memory. Instances of tmpfs are remounted so their -# size are recalculated. This might be needed if some sizes were -# specified relative to the total amount of memory (boo#869603). For -# now make it simple and remount all tmpfs regardless of how their -# size are specified. It should be handled by the kernel as it has a -# lot of shortcomings anyways (tmpfs mounted by other processes, mount -# namespaces, ...) -# -SUBSYSTEM=="memory", ACTION=="add", PROGRAM=="/usr/bin/systemd-detect-virt", RESULT!="zvm", ATTR{state}=="offline", \ - ATTR{state}="online", \ - RUN+="/bin/sh -c ' \ - while read src dst fs opts unused; do \ - case $fs in \ - tmpfs) mount -o remount \"$dst\" ;; \ - esac \ - done + +- Make systemd-mini-sysvinit provides systemd-sysvinit + + Some packages (such as shepherd-bins) want to conflicts with + systemd-sysvinit: they should also conflict with + systemd-mini-sysvinit. + +------------------------------------------------------------------- +Wed Nov 7 08:45:08 UTC 2018 - Franck Bui + +- Add 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch + + We have to keep support for UserTasksMax= for a while before + dropping it. This patch is supposed to do that and also to make + users aware of this change. It also hints how to configure that + differently. + +------------------------------------------------------------------- +Wed Nov 7 07:05:31 UTC 2018 - Franck Bui + +- Import commit f39674d6d114d999c50672c7bea8cad21e1eaed9 + + 7d1e04e85 units: use =yes rather than =true everywhere + 185ce0d34 units: assign user-runtime-dir@.service to user-%i.slice + a051f5e41 units: make sure user-runtime-dir@.service is Type=oneshot + 30c6842c3 units: set StopWhenUnneeded= for the user slice units too + e74de046e login: fix typo in log message + +------------------------------------------------------------------- +Mon Nov 5 13:10:54 UTC 2018 - Franck Bui + +- Own %{_libexecdir}/modules-load.d (again) + + This was incorrectly dropped during the split of the SUSE specific + configurations. + +------------------------------------------------------------------- +Fri Nov 2 14:17:34 UTC 2018 - Franck Bui + +- Drop a Conflicts: in systemd-coredump + + It not needed anymore since the mini variant of systemd-coredump is + not built anymore. + +------------------------------------------------------------------- +Fri Nov 2 13:54:36 UTC 2018 - Franck Bui + +- Import commit b54f5d7a8b41898ce98f43cd1a6cc92c0071806d + + 5def29d24 coredump: only install coredump.conf when ENABLED_COREDUMP=true + 9133e2d6e dhcp6: make sure we have enough space for the DHCP6 option header (bsc#1113632 CVE-2018-15688) + ebc3fa418 dhcp6: split assert_return() to be more debuggable when hit + 51eefb6ac chown-recursive: let's rework the recursive logic to use O_PATH (bsc#1113666 CVE-2018-15687) + e1e1aa237 core: skip unit deserialization and move to the next one when unit_deserialize() fails + 1c726c87d core: when deserializing state always use read_line(…, LONG_LINE_MAX, …) (bsc#1113665 CVE-2018-15686) + 4cd7d11ac core: don't create Requires for workdir if "missing ok" (bsc#1113083) + +------------------------------------------------------------------- +Fri Nov 2 13:51:46 UTC 2018 - Franck Bui + +- Make systemd-coredump sub-package optional + + and don't build the mini variant. + +------------------------------------------------------------------- +Fri Nov 2 12:02:18 UTC 2018 - Franck Bui + +- Drop duplicated %{?mini} suffix for systemd-{container,coredump} subpackages + + "-mini" is already part of the name of the main package so there's + no need to append it again for those sub packages. It's only needed + when the name of a subpackage is completely redefined, IOW when '-n' + option is used with the %package directive. + +------------------------------------------------------------------- +Fri Nov 2 11:08:27 UTC 2018 - Franck Bui + +- Dont ship /usr/sbin/resolvconf symlink for now + + It conflicts with the bin shipped by openresolv and provides + limited compat only. + +------------------------------------------------------------------- +Wed Oct 24 10:07:36 UTC 2018 - Franck Bui + +- Upgrade to v239 (commit 6d8584e7e8e5d13d2bab49b9e6f6d2ec39759978) + ------------------------------------------------------------------- Mon Oct 15 16:23:05 UTC 2018 - Franck Bui @@ -35,6 +124,17 @@ Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com d464f06934 journal: fix syslog_parse_identifier() e70422883a socket-util: attempt SO_RCVBUFFORCE/SO_SNDBUFFORCE only if SO_RCVBUF/SO_SNDBUF fails (bsc#991901) +------------------------------------------------------------------- +Fri Sep 28 06:05:03 UTC 2018 - Thomas.Blume@suse.com + +- split off SUSE specific configuration from systemd package (fate#325478) + * remove 60-io-scheduler.rules + * remove 80-hotplug-cpu-mem.rules + * remove 99-wakeup-from-idle.rules + * remove /usr/lib/modules-load.d/sg.conf + + these are now maintained in the new package system-tuning-common-SUSE + ------------------------------------------------------------------- Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index 55537c48..3d23ede6 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,10 +26,11 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.100.g19b3868d3 +%define suse_version +suse.87.gf39674d6d %bcond_with gnuefi %if 0%{?bootstrap} +%bcond_with coredump %bcond_with sysvcompat %bcond_with machined %bcond_with importd @@ -37,6 +38,7 @@ %bcond_with resolved %bcond_with journal_remote %else +%bcond_without coredump %bcond_without sysvcompat %bcond_without machined %bcond_without importd @@ -51,7 +53,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 237 +Version: 239 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -156,10 +158,6 @@ Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh -Source1000: 60-io-scheduler.rules -Source1001: 80-hotplug-cpu-mem.rules -Source1002: 99-wakeup-from-idle.rules - # Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the # SUSE git repository. But in very few cases, some stuff might be @@ -167,6 +165,7 @@ Source1002: 99-wakeup-from-idle.rules # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -198,6 +197,7 @@ Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) +Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init %description sysvinit @@ -297,23 +297,22 @@ Conflicts: libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. -%package coredump%{mini} +%if %{with coredump} +%package coredump Summary: Systemd tools for coredump management License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl -%if 0%{?bootstrap} -Conflicts: systemd-coredump -%endif -%description coredump%{mini} +%description coredump Systemd tools to store and manage coredumps. This package contains systemd-coredump, coredumpctl. +%endif -%package container%{?mini} +%package container Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base @@ -324,7 +323,7 @@ Provides: systemd:%{_bindir}/systemd-nspawn Conflicts: systemd-container %endif -%description container%{?mini} +%description container Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, @@ -438,6 +437,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ + -Dsplit-bin=true \ -Dpamlibdir=/%{_lib}/security \ -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ @@ -447,6 +447,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Drc-local=/etc/init.d/boot.local \ -Dhalt-local=/etc/init.d/halt.local \ -Ddebug-shell=/bin/bash \ + -Dportabled=false \ -Dseccomp=auto \ -Dselinux=auto \ -Dapparmor=auto \ @@ -457,6 +458,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Dhtml=false \ -Dmyhostname=false \ %endif +%if %{without coredump} + -Dcoredump=false \ +%endif %if %{without networkd} -Dnetworkd=false \ %endif @@ -487,6 +491,14 @@ mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} rm %{buildroot}%{_libdir}/libnss_systemd.so* %endif +# Don't ship resolvconf symlink for now as it conflicts with the +# binary shipped by openresolv and provides limited compatibility +# only +%if %{with resolved} +rm %{buildroot}%{_sbindir}/resolvconf +rm %{buildroot}%{_mandir}/man1/resolvconf.1* +%endif + # FIXME: these symlinks should die. mkdir -p %{buildroot}/{sbin,lib,bin} ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm @@ -502,11 +514,6 @@ install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif -# The rules that we shouldn't maintain -install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules -install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules -install -m0644 -D %{S:1002} %{buildroot}%{_udevrulesdir}/99-wakeup-from-idle.rules - # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... @@ -541,13 +548,6 @@ mv %{buildroot}/%{_unitdir}/tmp.mount %{buildroot}/%{_datadir}/systemd/ # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path -# create %%{_libexecdir}/modules-load.d -mkdir -p %{buildroot}%{_libexecdir}/modules-load.d -cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf -# load sg module at boot time -sg -EOF - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf @@ -808,7 +808,7 @@ systemctl daemon-reload || : %postun -n libudev%{?mini}1 -p /sbin/ldconfig %postun -n libsystemd0%{?mini} -p /sbin/ldconfig -%post container%{?mini} +%post container %tmpfiles_create systemd-nspawn.conf if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for @@ -885,14 +885,17 @@ fi /bin/systemd /bin/systemd-ask-password /bin/systemctl +%{_bindir}/busctl +%{_bindir}/bootctl +%{_bindir}/hostnamectl +%{_bindir}/kernel-install +%{_bindir}/localectl %if %{with networkd} %{_bindir}/networkctl %endif -%{_bindir}/busctl -%{_bindir}/bootctl -%{_bindir}/kernel-install -%{_bindir}/hostnamectl -%{_bindir}/localectl +%if %{with resolved} +%{_bindir}/resolvectl +%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-delta @@ -929,8 +932,13 @@ fi %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd -%dir %{_prefix}/lib/systemd/user -%dir %{_prefix}/lib/systemd/system +%dir %{_unitdir} +%{_userunitdir} +%if %{with coredump} +%exclude %{_prefix}/lib/systemd/systemd-coredump +%exclude %{_unitdir}/systemd-coredump* +%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket +%endif %if %{with journal_remote} %exclude %{_unitdir}/systemd-journal-gatewayd.* %exclude %{_unitdir}/systemd-journal-remote.* @@ -939,14 +947,11 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif -%exclude %{_prefix}/lib/systemd/systemd-coredump %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service %exclude %{_unitdir}/systemd-nspawn@.service -%exclude %{_unitdir}/systemd-coredump* -%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined %exclude %{_unitdir}/systemd-machined.service @@ -973,7 +978,9 @@ fi %{_unitdir}/*.socket %{_unitdir}/*.wants %{_unitdir}/*.path -%{_userunitdir}/ + +%{_unitdir}/user-.slice.d/ + %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so @@ -1007,9 +1014,8 @@ fi %{_prefix}/lib/systemd/boot/efi/*.stub %endif -%dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d -%{_libexecdir}/modules-load.d/sg.conf +%{_libexecdir}/modules-load.d %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d @@ -1064,6 +1070,7 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf @@ -1073,7 +1080,7 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif -# FIXME: why should we have to own this dir ? +# FIXME: why do we have to own this dir ? %dir %{_prefix}/lib/modprobe.d %{_prefix}/lib/modprobe.d/systemd.conf @@ -1101,6 +1108,7 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service %if %{with networkd} %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %endif @@ -1136,9 +1144,11 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%if %{with coredump} %exclude %{_mandir}/man1/coredumpctl* %exclude %{_mandir}/man5/coredump.conf* %exclude %{_mandir}/man8/systemd-coredump* +%endif %exclude %{_mandir}/man*/*nspawn* %if %{with machined} %exclude %{_mandir}/man*/machinectl* @@ -1192,6 +1202,13 @@ fi /sbin/poweroff /sbin/telinit /sbin/runlevel +%{_sbindir}/init +%{_sbindir}/reboot +%{_sbindir}/halt +%{_sbindir}/shutdown +%{_sbindir}/poweroff +%{_sbindir}/telinit +%{_sbindir}/runlevel %if ! 0%{?bootstrap} %{_mandir}/man1/init.1* %{_mandir}/man8/halt.8* @@ -1269,7 +1286,8 @@ fi %{_mandir}/man3/*udev*.3* %endif -%files coredump%{?mini} +%if %{with coredump} +%files coredump %defattr(-,root,root) %{_bindir}/coredumpctl %{_prefix}/lib/systemd/systemd-coredump @@ -1283,12 +1301,12 @@ fi %{_mandir}/man5/coredump.conf* %{_mandir}/man8/systemd-coredump* %endif +%endif -%files container%{?mini} +%files container %defattr(-,root,root) %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service -%{_tmpfilesdir}/systemd-nspawn.conf %if %{with networkd} %{_prefix}/lib/systemd/network/80-container-ve.network %{_prefix}/lib/systemd/network/80-container-vz.network @@ -1306,6 +1324,7 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%{_tmpfilesdir}/systemd-nspawn.conf %endif %if %{with importd} %{_prefix}/lib/systemd/systemd-import* diff --git a/systemd-v237+suse.100.g19b3868d3.tar.xz b/systemd-v237+suse.100.g19b3868d3.tar.xz deleted file mode 100644 index 5e7c3bb1..00000000 --- a/systemd-v237+suse.100.g19b3868d3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1a821019ddd446a6a4d25c5152b0cdd42b197c8657c69dadc393dd36b189784f -size 4629044 diff --git a/systemd-v239+suse.87.gf39674d6d.tar.xz b/systemd-v239+suse.87.gf39674d6d.tar.xz new file mode 100644 index 00000000..f0de2fe3 --- /dev/null +++ b/systemd-v239+suse.87.gf39674d6d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f62d64a099b2cb1fec5146914220d6396777b06c6d5075a479b1dfc22838c2c5 +size 4854560 diff --git a/systemd.changes b/systemd.changes index 64a87a55..e0afa6ec 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,92 @@ +------------------------------------------------------------------- +Fri Nov 9 10:37:21 UTC 2018 - Franck Bui + +- Make systemd-mini-sysvinit provides systemd-sysvinit + + Some packages (such as shepherd-bins) want to conflicts with + systemd-sysvinit: they should also conflict with + systemd-mini-sysvinit. + +------------------------------------------------------------------- +Wed Nov 7 08:45:08 UTC 2018 - Franck Bui + +- Add 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch + + We have to keep support for UserTasksMax= for a while before + dropping it. This patch is supposed to do that and also to make + users aware of this change. It also hints how to configure that + differently. + +------------------------------------------------------------------- +Wed Nov 7 07:05:31 UTC 2018 - Franck Bui + +- Import commit f39674d6d114d999c50672c7bea8cad21e1eaed9 + + 7d1e04e85 units: use =yes rather than =true everywhere + 185ce0d34 units: assign user-runtime-dir@.service to user-%i.slice + a051f5e41 units: make sure user-runtime-dir@.service is Type=oneshot + 30c6842c3 units: set StopWhenUnneeded= for the user slice units too + e74de046e login: fix typo in log message + +------------------------------------------------------------------- +Mon Nov 5 13:10:54 UTC 2018 - Franck Bui + +- Own %{_libexecdir}/modules-load.d (again) + + This was incorrectly dropped during the split of the SUSE specific + configurations. + +------------------------------------------------------------------- +Fri Nov 2 14:17:34 UTC 2018 - Franck Bui + +- Drop a Conflicts: in systemd-coredump + + It not needed anymore since the mini variant of systemd-coredump is + not built anymore. + +------------------------------------------------------------------- +Fri Nov 2 13:54:36 UTC 2018 - Franck Bui + +- Import commit b54f5d7a8b41898ce98f43cd1a6cc92c0071806d + + 5def29d24 coredump: only install coredump.conf when ENABLED_COREDUMP=true + 9133e2d6e dhcp6: make sure we have enough space for the DHCP6 option header (bsc#1113632 CVE-2018-15688) + ebc3fa418 dhcp6: split assert_return() to be more debuggable when hit + 51eefb6ac chown-recursive: let's rework the recursive logic to use O_PATH (bsc#1113666 CVE-2018-15687) + e1e1aa237 core: skip unit deserialization and move to the next one when unit_deserialize() fails + 1c726c87d core: when deserializing state always use read_line(…, LONG_LINE_MAX, …) (bsc#1113665 CVE-2018-15686) + 4cd7d11ac core: don't create Requires for workdir if "missing ok" (bsc#1113083) + +------------------------------------------------------------------- +Fri Nov 2 13:51:46 UTC 2018 - Franck Bui + +- Make systemd-coredump sub-package optional + + and don't build the mini variant. + +------------------------------------------------------------------- +Fri Nov 2 12:02:18 UTC 2018 - Franck Bui + +- Drop duplicated %{?mini} suffix for systemd-{container,coredump} subpackages + + "-mini" is already part of the name of the main package so there's + no need to append it again for those sub packages. It's only needed + when the name of a subpackage is completely redefined, IOW when '-n' + option is used with the %package directive. + +------------------------------------------------------------------- +Fri Nov 2 11:08:27 UTC 2018 - Franck Bui + +- Dont ship /usr/sbin/resolvconf symlink for now + + It conflicts with the bin shipped by openresolv and provides + limited compat only. + +------------------------------------------------------------------- +Wed Oct 24 10:07:36 UTC 2018 - Franck Bui + +- Upgrade to v239 (commit 6d8584e7e8e5d13d2bab49b9e6f6d2ec39759978) + ------------------------------------------------------------------- Mon Oct 15 16:23:05 UTC 2018 - Franck Bui @@ -35,6 +124,17 @@ Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com d464f06934 journal: fix syslog_parse_identifier() e70422883a socket-util: attempt SO_RCVBUFFORCE/SO_SNDBUFFORCE only if SO_RCVBUF/SO_SNDBUF fails (bsc#991901) +------------------------------------------------------------------- +Fri Sep 28 06:05:03 UTC 2018 - Thomas.Blume@suse.com + +- split off SUSE specific configuration from systemd package (fate#325478) + * remove 60-io-scheduler.rules + * remove 80-hotplug-cpu-mem.rules + * remove 99-wakeup-from-idle.rules + * remove /usr/lib/modules-load.d/sg.conf + + these are now maintained in the new package system-tuning-common-SUSE + ------------------------------------------------------------------- Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com diff --git a/systemd.spec b/systemd.spec index 15a79547..9beae4f4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,10 +24,11 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.100.g19b3868d3 +%define suse_version +suse.87.gf39674d6d %bcond_with gnuefi %if 0%{?bootstrap} +%bcond_with coredump %bcond_with sysvcompat %bcond_with machined %bcond_with importd @@ -35,6 +36,7 @@ %bcond_with resolved %bcond_with journal_remote %else +%bcond_without coredump %bcond_without sysvcompat %bcond_without machined %bcond_without importd @@ -49,7 +51,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 237 +Version: 239 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -154,10 +156,6 @@ Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh Source200: scripts-udev-convert-lib-udev-path.sh -Source1000: 60-io-scheduler.rules -Source1001: 80-hotplug-cpu-mem.rules -Source1002: 99-wakeup-from-idle.rules - # Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the # SUSE git repository. But in very few cases, some stuff might be @@ -165,6 +163,7 @@ Source1002: 99-wakeup-from-idle.rules # patches are temporary and should be removed as soon as a fix is # merged by upstream. Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -196,6 +195,7 @@ Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) +Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init %description sysvinit @@ -295,23 +295,22 @@ Conflicts: libudev-devel This package contains the development files for the library libudev, a dynamic library, which provides access to udev device information. -%package coredump%{mini} +%if %{with coredump} +%package coredump Summary: Systemd tools for coredump management License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl -%if 0%{?bootstrap} -Conflicts: systemd-coredump -%endif -%description coredump%{mini} +%description coredump Systemd tools to store and manage coredumps. This package contains systemd-coredump, coredumpctl. +%endif -%package container%{?mini} +%package container Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base @@ -322,7 +321,7 @@ Provides: systemd:%{_bindir}/systemd-nspawn Conflicts: systemd-container %endif -%description container%{?mini} +%description container Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, @@ -436,6 +435,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ + -Dsplit-bin=true \ -Dpamlibdir=/%{_lib}/security \ -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ @@ -445,6 +445,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Drc-local=/etc/init.d/boot.local \ -Dhalt-local=/etc/init.d/halt.local \ -Ddebug-shell=/bin/bash \ + -Dportabled=false \ -Dseccomp=auto \ -Dselinux=auto \ -Dapparmor=auto \ @@ -455,6 +456,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Dhtml=false \ -Dmyhostname=false \ %endif +%if %{without coredump} + -Dcoredump=false \ +%endif %if %{without networkd} -Dnetworkd=false \ %endif @@ -485,6 +489,14 @@ mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} rm %{buildroot}%{_libdir}/libnss_systemd.so* %endif +# Don't ship resolvconf symlink for now as it conflicts with the +# binary shipped by openresolv and provides limited compatibility +# only +%if %{with resolved} +rm %{buildroot}%{_sbindir}/resolvconf +rm %{buildroot}%{_mandir}/man1/resolvconf.1* +%endif + # FIXME: these symlinks should die. mkdir -p %{buildroot}/{sbin,lib,bin} ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm @@ -500,11 +512,6 @@ install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif -# The rules that we shouldn't maintain -install -m0644 -D %{S:1000} %{buildroot}%{_udevrulesdir}/60-io-scheduler.rules -install -m0644 -D %{S:1001} %{buildroot}%{_udevrulesdir}/80-hotplug-cpu-mem.rules -install -m0644 -D %{S:1002} %{buildroot}%{_udevrulesdir}/99-wakeup-from-idle.rules - # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... @@ -539,13 +546,6 @@ mv %{buildroot}/%{_unitdir}/tmp.mount %{buildroot}/%{_datadir}/systemd/ # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path -# create %%{_libexecdir}/modules-load.d -mkdir -p %{buildroot}%{_libexecdir}/modules-load.d -cat << EOF > %{buildroot}%{_libexecdir}/modules-load.d/sg.conf -# load sg module at boot time -sg -EOF - # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf @@ -806,7 +806,7 @@ systemctl daemon-reload || : %postun -n libudev%{?mini}1 -p /sbin/ldconfig %postun -n libsystemd0%{?mini} -p /sbin/ldconfig -%post container%{?mini} +%post container %tmpfiles_create systemd-nspawn.conf if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for @@ -883,14 +883,17 @@ fi /bin/systemd /bin/systemd-ask-password /bin/systemctl +%{_bindir}/busctl +%{_bindir}/bootctl +%{_bindir}/hostnamectl +%{_bindir}/kernel-install +%{_bindir}/localectl %if %{with networkd} %{_bindir}/networkctl %endif -%{_bindir}/busctl -%{_bindir}/bootctl -%{_bindir}/kernel-install -%{_bindir}/hostnamectl -%{_bindir}/localectl +%if %{with resolved} +%{_bindir}/resolvectl +%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-delta @@ -927,8 +930,13 @@ fi %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd -%dir %{_prefix}/lib/systemd/user -%dir %{_prefix}/lib/systemd/system +%dir %{_unitdir} +%{_userunitdir} +%if %{with coredump} +%exclude %{_prefix}/lib/systemd/systemd-coredump +%exclude %{_unitdir}/systemd-coredump* +%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket +%endif %if %{with journal_remote} %exclude %{_unitdir}/systemd-journal-gatewayd.* %exclude %{_unitdir}/systemd-journal-remote.* @@ -937,14 +945,11 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload %endif -%exclude %{_prefix}/lib/systemd/systemd-coredump %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service %exclude %{_unitdir}/systemd-nspawn@.service -%exclude %{_unitdir}/systemd-coredump* -%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined %exclude %{_unitdir}/systemd-machined.service @@ -971,7 +976,9 @@ fi %{_unitdir}/*.socket %{_unitdir}/*.wants %{_unitdir}/*.path -%{_userunitdir}/ + +%{_unitdir}/user-.slice.d/ + %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so @@ -1005,9 +1012,8 @@ fi %{_prefix}/lib/systemd/boot/efi/*.stub %endif -%dir %{_libexecdir}/modules-load.d %dir %{_sysconfdir}/modules-load.d -%{_libexecdir}/modules-load.d/sg.conf +%{_libexecdir}/modules-load.d %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d @@ -1062,6 +1068,7 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf %if %{with networkd} %{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf @@ -1071,7 +1078,7 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif -# FIXME: why should we have to own this dir ? +# FIXME: why do we have to own this dir ? %dir %{_prefix}/lib/modprobe.d %{_prefix}/lib/modprobe.d/systemd.conf @@ -1099,6 +1106,7 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service %if %{with networkd} %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %endif @@ -1134,9 +1142,11 @@ fi %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%if %{with coredump} %exclude %{_mandir}/man1/coredumpctl* %exclude %{_mandir}/man5/coredump.conf* %exclude %{_mandir}/man8/systemd-coredump* +%endif %exclude %{_mandir}/man*/*nspawn* %if %{with machined} %exclude %{_mandir}/man*/machinectl* @@ -1190,6 +1200,13 @@ fi /sbin/poweroff /sbin/telinit /sbin/runlevel +%{_sbindir}/init +%{_sbindir}/reboot +%{_sbindir}/halt +%{_sbindir}/shutdown +%{_sbindir}/poweroff +%{_sbindir}/telinit +%{_sbindir}/runlevel %if ! 0%{?bootstrap} %{_mandir}/man1/init.1* %{_mandir}/man8/halt.8* @@ -1267,7 +1284,8 @@ fi %{_mandir}/man3/*udev*.3* %endif -%files coredump%{?mini} +%if %{with coredump} +%files coredump %defattr(-,root,root) %{_bindir}/coredumpctl %{_prefix}/lib/systemd/systemd-coredump @@ -1281,12 +1299,12 @@ fi %{_mandir}/man5/coredump.conf* %{_mandir}/man8/systemd-coredump* %endif +%endif -%files container%{?mini} +%files container %defattr(-,root,root) %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service -%{_tmpfilesdir}/systemd-nspawn.conf %if %{with networkd} %{_prefix}/lib/systemd/network/80-container-ve.network %{_prefix}/lib/systemd/network/80-container-vz.network @@ -1304,6 +1322,7 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%{_tmpfilesdir}/systemd-nspawn.conf %endif %if %{with importd} %{_prefix}/lib/systemd/systemd-import* From e8b056a952e6b020dc7ca65e7a155b1924db45d945150127000a4eb6782be78d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 20 Nov 2018 21:24:22 +0000 Subject: [PATCH 031/124] Accepting request 649552 from Base:System OBS-URL: https://build.opensuse.org/request/show/649552 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=289 --- systemd-mini.changes | 43 +++++++++++++++++++++++++ systemd-mini.spec | 2 +- systemd-v239+suse.125.g69f9f79e1.tar.xz | 3 ++ systemd-v239+suse.87.gf39674d6d.tar.xz | 3 -- systemd.changes | 43 +++++++++++++++++++++++++ systemd.spec | 2 +- 6 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 systemd-v239+suse.125.g69f9f79e1.tar.xz delete mode 100644 systemd-v239+suse.87.gf39674d6d.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index e0afa6ec..7e1e9ec4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Fri Nov 16 10:31:42 UTC 2018 - Franck Bui + +- Import commit 69f9f79e1b03e3d23df25b61cbcc9304af3e358f (bsc#1080919 CVE-2018-6954) + + f3615ce49 tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) + 7165e92f4 tmpfiles: use fd_get_path() even less excessively + c2c531c1d test: make TEST-22 easier to debug, by outputting to /dev/console + 621b78317 test: don't use "nobody:nogroup" for tests + 1f9c7acad tmpfiles: return correct error variable after fd_reopen() + 2236280c1 tmpfiles: reindent one comment less weirdly + f6bdfb889 tmpfiles: use correct error variable + bc75127cd tmpfiles: clarify that we ignore file attribute setting errors + 621c8b1fe tmpfiles: add log message where we previously failed silently + bc9229630 tmpfiles: use fd_get_path() less excessively + 5a1106039 tmpfiles: add more tests + c974086cc tmpfiles: don't follow unsafe transitions in path_set_*() + e64a510eb fs-util: add new CHASE_NOFOLLOW flag to chase_symlinks() + 7480154d0 tmpfiles: make create_fifo() safe + eb890962c fs-util: introduce mkfifoat_atomic() helper + 653bb81af fileio: make tempfn_random_child() accept empty string as path + 2b1e12bfe tmpfiles: introduce create_fifo() + 6dd80f289 tmpfiles: introduce empty_directory() + f2c137edf tmpfiles: introduce create_directory() and create_subvolume() and make them safe + 6a76f6dfb basic/stat-util: introduce is_dir_fd() + 38a7f2e81 btrfs-util: unfuck tmpfiles' subvol creation + 26e19b6fe btrfs-util: introduce btrfs_subvol_make_fd() + 5fb5bdf5d basic/label: introduce mkdirat_label()/mkdirat_errno_wrapper() helpers + 390b767da selinux: introduce mac_selinux_create_file_prepare_at() + 0f72fadba smack: introduce mac_smack_fix_at() + f2838154b tmpfiles: introduce create_directory_or_subvolume() + 2de697fb8 tmpfiles: make create_device() safe + 558c5fec7 tmpfiles: introduce create_device() + dee986b1d tmpfiles: make copy_files() safe + cacb14d3f tmpfiles: introduce copy_files() routine + 81c85ce17 tmpfiles: make write_one_file() safe + 9ec6b92ab tmpfiles: make truncate_file() safe + 8dde36e03 tmpfiles: introduce truncate_file() which deals with 'F' exclusively + 481134a93 tmpfiles: introduce create_file() which deals with 'f'/'F' exclusively + 057861560 tmpfiles: make the stat struct parameter in fd_set_*() optional + f37caffda tmpfiles: stat file in item_do() rather than in its callers + 86f1362d4 tmpfiles: set only default acls to folders #9545 (#9599) + ------------------------------------------------------------------- Fri Nov 9 10:37:21 UTC 2018 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 3d23ede6..97246174 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.87.gf39674d6d +%define suse_version +suse.125.g69f9f79e1 %bcond_with gnuefi %if 0%{?bootstrap} diff --git a/systemd-v239+suse.125.g69f9f79e1.tar.xz b/systemd-v239+suse.125.g69f9f79e1.tar.xz new file mode 100644 index 00000000..63374478 --- /dev/null +++ b/systemd-v239+suse.125.g69f9f79e1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:60a1d726a705d621a543e255ec20b8b5698c9b9e78ea23387bc60d4eef6416fd +size 4858072 diff --git a/systemd-v239+suse.87.gf39674d6d.tar.xz b/systemd-v239+suse.87.gf39674d6d.tar.xz deleted file mode 100644 index f0de2fe3..00000000 --- a/systemd-v239+suse.87.gf39674d6d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f62d64a099b2cb1fec5146914220d6396777b06c6d5075a479b1dfc22838c2c5 -size 4854560 diff --git a/systemd.changes b/systemd.changes index e0afa6ec..7e1e9ec4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,46 @@ +------------------------------------------------------------------- +Fri Nov 16 10:31:42 UTC 2018 - Franck Bui + +- Import commit 69f9f79e1b03e3d23df25b61cbcc9304af3e358f (bsc#1080919 CVE-2018-6954) + + f3615ce49 tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) + 7165e92f4 tmpfiles: use fd_get_path() even less excessively + c2c531c1d test: make TEST-22 easier to debug, by outputting to /dev/console + 621b78317 test: don't use "nobody:nogroup" for tests + 1f9c7acad tmpfiles: return correct error variable after fd_reopen() + 2236280c1 tmpfiles: reindent one comment less weirdly + f6bdfb889 tmpfiles: use correct error variable + bc75127cd tmpfiles: clarify that we ignore file attribute setting errors + 621c8b1fe tmpfiles: add log message where we previously failed silently + bc9229630 tmpfiles: use fd_get_path() less excessively + 5a1106039 tmpfiles: add more tests + c974086cc tmpfiles: don't follow unsafe transitions in path_set_*() + e64a510eb fs-util: add new CHASE_NOFOLLOW flag to chase_symlinks() + 7480154d0 tmpfiles: make create_fifo() safe + eb890962c fs-util: introduce mkfifoat_atomic() helper + 653bb81af fileio: make tempfn_random_child() accept empty string as path + 2b1e12bfe tmpfiles: introduce create_fifo() + 6dd80f289 tmpfiles: introduce empty_directory() + f2c137edf tmpfiles: introduce create_directory() and create_subvolume() and make them safe + 6a76f6dfb basic/stat-util: introduce is_dir_fd() + 38a7f2e81 btrfs-util: unfuck tmpfiles' subvol creation + 26e19b6fe btrfs-util: introduce btrfs_subvol_make_fd() + 5fb5bdf5d basic/label: introduce mkdirat_label()/mkdirat_errno_wrapper() helpers + 390b767da selinux: introduce mac_selinux_create_file_prepare_at() + 0f72fadba smack: introduce mac_smack_fix_at() + f2838154b tmpfiles: introduce create_directory_or_subvolume() + 2de697fb8 tmpfiles: make create_device() safe + 558c5fec7 tmpfiles: introduce create_device() + dee986b1d tmpfiles: make copy_files() safe + cacb14d3f tmpfiles: introduce copy_files() routine + 81c85ce17 tmpfiles: make write_one_file() safe + 9ec6b92ab tmpfiles: make truncate_file() safe + 8dde36e03 tmpfiles: introduce truncate_file() which deals with 'F' exclusively + 481134a93 tmpfiles: introduce create_file() which deals with 'f'/'F' exclusively + 057861560 tmpfiles: make the stat struct parameter in fd_set_*() optional + f37caffda tmpfiles: stat file in item_do() rather than in its callers + 86f1362d4 tmpfiles: set only default acls to folders #9545 (#9599) + ------------------------------------------------------------------- Fri Nov 9 10:37:21 UTC 2018 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 9beae4f4..960a434e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.87.gf39674d6d +%define suse_version +suse.125.g69f9f79e1 %bcond_with gnuefi %if 0%{?bootstrap} From 43123b57ccd35d3e55cd570ed27cc01212d47be475978669ef5adac866a1515d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 10 Dec 2018 11:22:20 +0000 Subject: [PATCH 032/124] Accepting request 653865 from Base:System OBS-URL: https://build.opensuse.org/request/show/653865 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=290 --- systemd-mini.changes | 34 +++++++++++++++++++++++++ systemd-mini.spec | 13 ++++------ systemd-v239+suse.125.g69f9f79e1.tar.xz | 3 --- systemd-v239+suse.138.g8ae56af78.tar.xz | 3 +++ systemd.changes | 34 +++++++++++++++++++++++++ systemd.spec | 13 ++++------ 6 files changed, 81 insertions(+), 19 deletions(-) delete mode 100644 systemd-v239+suse.125.g69f9f79e1.tar.xz create mode 100644 systemd-v239+suse.138.g8ae56af78.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 7e1e9ec4..8fc9bdc7 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Dec 4 13:20:48 UTC 2018 - Franck Bui + +- Import commit 8ae56af7802ef8f91fac64fa244d62a4468fbbd5 + + 4474878178 udev-builtin-kmod: adjust logging + 805534aff5 core: use the generic module_load() function + ac7e902530 shared/module-util: fix preexisting mixup with errno sign + 415aa40793 udev-builtin-kmod: use the generic module_load() function + 8a36b4bac6 Move module-util.h to src/shared/ and load_module() to libshared + 999b910752 core/kmod-setup: restore comments + 1f2b822a21 logind: stop managing VT switches if no sessions are registered on that VT + 5ad8d374c5 terminal-util: introduce vt_release() helper + 145d492490 logind: become the controlling terminal process before restoring VT (bsc#1101591) + d4b5dbc033 terminal-util: introduce vt_restore() helper + 2e8af185f0 logind: make session_restore_vt() static + ff3048364f udev: downgrade message when we fail to set inotify watch up (bsc#1005023) + +------------------------------------------------------------------- +Fri Nov 23 13:30:03 UTC 2018 - Franck Bui + +- Fix the test for figuring out if /etc/machine-id is writable in %post (bsc#1117063) + + "test -w" always returns true for root user even if the writable + mode bits are not set. Fix this by testing the file mode bit value + instead. + +------------------------------------------------------------------- +Fri Nov 23 11:50:19 UTC 2018 - Franck Bui + +- Move systemd-sysv-convert from /usr/sbin to /usr/lib/systemd + + This tool is not supposed to be run by users. + ------------------------------------------------------------------- Fri Nov 16 10:31:42 UTC 2018 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 97246174..5aa639d0 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.125.g69f9f79e1 +%define suse_version +suse.138.g8ae56af78 %bcond_with gnuefi %if 0%{?bootstrap} @@ -510,7 +510,7 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated -install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert +install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif @@ -699,9 +699,9 @@ fi # /etc/machine-id might have been created writeable incorrectly # (boo#1092269). -if [ -w %{_sysconfdir}/machine-id ]; then - echo "/etc/machine-id shouldn't be writable, fixing..." - chmod 444 %{_sysconfdir}/machine-id || : +if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then + echo "Incorrect file mode bits for /etc/machine-id which should be 0444, fixing..." + chmod 444 %{_sysconfdir}/machine-id fi %if ! 0%{?bootstrap} @@ -921,9 +921,6 @@ fi %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl -%if %{with sysvcompat} -%{_sbindir}/systemd-sysv-convert -%endif %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat diff --git a/systemd-v239+suse.125.g69f9f79e1.tar.xz b/systemd-v239+suse.125.g69f9f79e1.tar.xz deleted file mode 100644 index 63374478..00000000 --- a/systemd-v239+suse.125.g69f9f79e1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:60a1d726a705d621a543e255ec20b8b5698c9b9e78ea23387bc60d4eef6416fd -size 4858072 diff --git a/systemd-v239+suse.138.g8ae56af78.tar.xz b/systemd-v239+suse.138.g8ae56af78.tar.xz new file mode 100644 index 00000000..2654b425 --- /dev/null +++ b/systemd-v239+suse.138.g8ae56af78.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cd8bc41cc212cf637e93a98f0499b7ad4792ce401c1364eca15d1102944fea86 +size 4857940 diff --git a/systemd.changes b/systemd.changes index 7e1e9ec4..8fc9bdc7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,37 @@ +------------------------------------------------------------------- +Tue Dec 4 13:20:48 UTC 2018 - Franck Bui + +- Import commit 8ae56af7802ef8f91fac64fa244d62a4468fbbd5 + + 4474878178 udev-builtin-kmod: adjust logging + 805534aff5 core: use the generic module_load() function + ac7e902530 shared/module-util: fix preexisting mixup with errno sign + 415aa40793 udev-builtin-kmod: use the generic module_load() function + 8a36b4bac6 Move module-util.h to src/shared/ and load_module() to libshared + 999b910752 core/kmod-setup: restore comments + 1f2b822a21 logind: stop managing VT switches if no sessions are registered on that VT + 5ad8d374c5 terminal-util: introduce vt_release() helper + 145d492490 logind: become the controlling terminal process before restoring VT (bsc#1101591) + d4b5dbc033 terminal-util: introduce vt_restore() helper + 2e8af185f0 logind: make session_restore_vt() static + ff3048364f udev: downgrade message when we fail to set inotify watch up (bsc#1005023) + +------------------------------------------------------------------- +Fri Nov 23 13:30:03 UTC 2018 - Franck Bui + +- Fix the test for figuring out if /etc/machine-id is writable in %post (bsc#1117063) + + "test -w" always returns true for root user even if the writable + mode bits are not set. Fix this by testing the file mode bit value + instead. + +------------------------------------------------------------------- +Fri Nov 23 11:50:19 UTC 2018 - Franck Bui + +- Move systemd-sysv-convert from /usr/sbin to /usr/lib/systemd + + This tool is not supposed to be run by users. + ------------------------------------------------------------------- Fri Nov 16 10:31:42 UTC 2018 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 960a434e..cf294aaa 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.125.g69f9f79e1 +%define suse_version +suse.138.g8ae56af78 %bcond_with gnuefi %if 0%{?bootstrap} @@ -508,7 +508,7 @@ ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated -install -m0755 -D %{S:3} %{buildroot}/%{_sbindir}/systemd-sysv-convert +install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif @@ -697,9 +697,9 @@ fi # /etc/machine-id might have been created writeable incorrectly # (boo#1092269). -if [ -w %{_sysconfdir}/machine-id ]; then - echo "/etc/machine-id shouldn't be writable, fixing..." - chmod 444 %{_sysconfdir}/machine-id || : +if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then + echo "Incorrect file mode bits for /etc/machine-id which should be 0444, fixing..." + chmod 444 %{_sysconfdir}/machine-id fi %if ! 0%{?bootstrap} @@ -919,9 +919,6 @@ fi %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt %{_bindir}/timedatectl -%if %{with sysvcompat} -%{_sbindir}/systemd-sysv-convert -%endif %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat From 3caf3093ddb65abfa08d0549b891fdf67833dc2e980ecc1efcd6e18c60a833f6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 29 Jan 2019 13:44:38 +0000 Subject: [PATCH 033/124] Accepting request 666166 from Base:System OBS-URL: https://build.opensuse.org/request/show/666166 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=291 --- systemd-mini.changes | 70 +++++++++++++++++++++++++ systemd-mini.spec | 4 +- systemd-v239+suse.138.g8ae56af78.tar.xz | 3 -- systemd-v239+suse.191.gad34cc45f.tar.xz | 3 ++ systemd.changes | 70 +++++++++++++++++++++++++ systemd.spec | 4 +- 6 files changed, 147 insertions(+), 7 deletions(-) delete mode 100644 systemd-v239+suse.138.g8ae56af78.tar.xz create mode 100644 systemd-v239+suse.191.gad34cc45f.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 8fc9bdc7..b9f0720a 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Tue Jan 15 09:04:47 UTC 2019 - Franck Bui + +- Import commit ad34cc45f63720ced69960dc66b47bddb146176d + + Import a bunch of fixes from stable/v239-stable: + + c8293f5af4 Revert "network: set DynamicUser= to systemd-networkd.service" + 7f605592e6 Revert "resolve: enable DynamicUser= for systemd-resolved.service" + 5a48e92e06 test: Fix networkd test for an already running service + 36eae1688b Revert "timesyncd: enable DynamicUser=" + 3a11f24cf0 Revert "unit: drop After=systemd-sysusers.service from timesyncd" + 23cfd15ce9 machinectl: fix verbosity of import-raw or friends + ba037daf29 Make bzip2 an optional dependency for systemd-importd + fb609d2721 pull: initialize libgcrypt before calling any functions provided by libgcrypt + c50857bc6b hwdb: remove stray 'i' in hwdb match string for the HP Spectre (#9571) + 9a12fd17f5 man: Mention that paths in unit files must be fully normalized. + 76fc2ab4a6 tree-wide: use instead of #ifdef for HAVE_* + fcc699c093 network: update log message + a4f497b2cd Use #if instead of #ifdef for ENABLE_GSHADOW + 121c662eb8 man: add missing option for system.conf + 564341146e core: add missing option and drop nonexistent option in system.conf + 7082a3599f journal: add missing option in journald.conf + 3c15efa9c1 basic: add missing comma in raw_clone assembly for sparc + 4c210b6dce cryptsetup: Add dependency on loopback setup to generated units + c777fbbe3e journal-gateway: use localStorage["cursor"] only when it has valid value + c5b1bef639 journal-gateway: explicitly declare local variables + 2361522ca6 analyze: actually select longest activated-time of services + 3e810d92d9 sd-bus: fix implicit downcast of bitfield reported by LGTM + aef660a4cf resolvconf: fixes for the compatibility interface + 06b3f54f50 install: fix error handling in is_symlink_with_known_name() + f70ab9a468 portable: fix error handling + d2c40d4e80 resolve: fix return value type of dns_answer_has_dname_for_cname() + 6f684e0670 resolve: dns_scope_network_good() does not returns negative errno + 15d83e1138 bus-util: fix error handling + ba0a1f3384 core: free lines after reading them + +------------------------------------------------------------------- +Thu Jan 10 15:54:22 UTC 2019 - Franck Bui + +- Import commit 3bece8a25ae11e8ec132cdecc7e72a00ee790994 + + 89a9721a47 Revert "logind: become the controlling terminal process before restoring VT" (bsc#1120836) + c3a8dc821b pam_systemd: reword message about not creating a session + 0ba0f5b3ef pam_systemd: suppress LOG_DEBUG log messages if debugging is off + +------------------------------------------------------------------- +Thu Jan 10 07:17:22 UTC 2019 - Franck Bui + +- Import commit a3b059a8c60622e4ec30aabda93c6b41d0953dc4 + + 9dbe9f12ec journal-remote: set a limit on the number of fields in a message (CVE-2018-16865 bsc#1120323) + 61d569ab1b journal-remote: verify entry length from header + a08760b26c µhttpd: use a cleanup function to call MHD_destroy_response + 43f46a1a3d journal-gateway: use _cleanup_ attribute to stop microhttpd daemon + 437b0b2d01 journald: lower the maximum entry size limit to ½ for non-sealed fds + ac9e209710 journald: when processing a native message, bail more quickly on overbig messages + ce103705b9 journald: set a limit on the number of fields (1k) (CVE-2018-16865 bsc#1120323) + 35538171c2 coredump: fix message when we fail to save a journald coredump + cfe247b555 basic/process-util: limit command line lengths to _SC_ARG_MAX + 9d59e6f6ee journald: do not store the iovec entry for process commandline on stack (CVE-2018-16864 bsc#1120323) + 8d650a68d4 journald: remove unnecessary {} + b608f532a4 coredump: remove duplicate MESSAGE= prefix from message + 0dbb2dc066 vconsole-setup: fonts copy will fail if the current terminal is in graphical mode (bsc#1114933) + e501d65540 Revert "systemctl: when removing enablement or mask symlinks, cover both /run and /etc" + d3ea69961f fs-util: rename safe_transition() into unsafe_transition() + 338470fdc9 tmpfiles: use CHASE_WARN in addition to CHASE_SAFE + d9ae1b30da fs-util: make chase_symlink() returns -ENOLINK when unsafe transitions are met + 8b76594d1f fs-util: add new CHASE_WARN flag to chase_symlinks() + ------------------------------------------------------------------- Tue Dec 4 13:20:48 UTC 2018 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 5aa639d0..b9c0d70b 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.138.g8ae56af78 +%define suse_version +suse.191.gad34cc45f %bcond_with gnuefi %if 0%{?bootstrap} diff --git a/systemd-v239+suse.138.g8ae56af78.tar.xz b/systemd-v239+suse.138.g8ae56af78.tar.xz deleted file mode 100644 index 2654b425..00000000 --- a/systemd-v239+suse.138.g8ae56af78.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cd8bc41cc212cf637e93a98f0499b7ad4792ce401c1364eca15d1102944fea86 -size 4857940 diff --git a/systemd-v239+suse.191.gad34cc45f.tar.xz b/systemd-v239+suse.191.gad34cc45f.tar.xz new file mode 100644 index 00000000..4b76a164 --- /dev/null +++ b/systemd-v239+suse.191.gad34cc45f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:41ecaea73db343549ca13c297a93304cb211fe405d2c1e953ab047b819aa0b92 +size 4859076 diff --git a/systemd.changes b/systemd.changes index 8fc9bdc7..b9f0720a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Tue Jan 15 09:04:47 UTC 2019 - Franck Bui + +- Import commit ad34cc45f63720ced69960dc66b47bddb146176d + + Import a bunch of fixes from stable/v239-stable: + + c8293f5af4 Revert "network: set DynamicUser= to systemd-networkd.service" + 7f605592e6 Revert "resolve: enable DynamicUser= for systemd-resolved.service" + 5a48e92e06 test: Fix networkd test for an already running service + 36eae1688b Revert "timesyncd: enable DynamicUser=" + 3a11f24cf0 Revert "unit: drop After=systemd-sysusers.service from timesyncd" + 23cfd15ce9 machinectl: fix verbosity of import-raw or friends + ba037daf29 Make bzip2 an optional dependency for systemd-importd + fb609d2721 pull: initialize libgcrypt before calling any functions provided by libgcrypt + c50857bc6b hwdb: remove stray 'i' in hwdb match string for the HP Spectre (#9571) + 9a12fd17f5 man: Mention that paths in unit files must be fully normalized. + 76fc2ab4a6 tree-wide: use instead of #ifdef for HAVE_* + fcc699c093 network: update log message + a4f497b2cd Use #if instead of #ifdef for ENABLE_GSHADOW + 121c662eb8 man: add missing option for system.conf + 564341146e core: add missing option and drop nonexistent option in system.conf + 7082a3599f journal: add missing option in journald.conf + 3c15efa9c1 basic: add missing comma in raw_clone assembly for sparc + 4c210b6dce cryptsetup: Add dependency on loopback setup to generated units + c777fbbe3e journal-gateway: use localStorage["cursor"] only when it has valid value + c5b1bef639 journal-gateway: explicitly declare local variables + 2361522ca6 analyze: actually select longest activated-time of services + 3e810d92d9 sd-bus: fix implicit downcast of bitfield reported by LGTM + aef660a4cf resolvconf: fixes for the compatibility interface + 06b3f54f50 install: fix error handling in is_symlink_with_known_name() + f70ab9a468 portable: fix error handling + d2c40d4e80 resolve: fix return value type of dns_answer_has_dname_for_cname() + 6f684e0670 resolve: dns_scope_network_good() does not returns negative errno + 15d83e1138 bus-util: fix error handling + ba0a1f3384 core: free lines after reading them + +------------------------------------------------------------------- +Thu Jan 10 15:54:22 UTC 2019 - Franck Bui + +- Import commit 3bece8a25ae11e8ec132cdecc7e72a00ee790994 + + 89a9721a47 Revert "logind: become the controlling terminal process before restoring VT" (bsc#1120836) + c3a8dc821b pam_systemd: reword message about not creating a session + 0ba0f5b3ef pam_systemd: suppress LOG_DEBUG log messages if debugging is off + +------------------------------------------------------------------- +Thu Jan 10 07:17:22 UTC 2019 - Franck Bui + +- Import commit a3b059a8c60622e4ec30aabda93c6b41d0953dc4 + + 9dbe9f12ec journal-remote: set a limit on the number of fields in a message (CVE-2018-16865 bsc#1120323) + 61d569ab1b journal-remote: verify entry length from header + a08760b26c µhttpd: use a cleanup function to call MHD_destroy_response + 43f46a1a3d journal-gateway: use _cleanup_ attribute to stop microhttpd daemon + 437b0b2d01 journald: lower the maximum entry size limit to ½ for non-sealed fds + ac9e209710 journald: when processing a native message, bail more quickly on overbig messages + ce103705b9 journald: set a limit on the number of fields (1k) (CVE-2018-16865 bsc#1120323) + 35538171c2 coredump: fix message when we fail to save a journald coredump + cfe247b555 basic/process-util: limit command line lengths to _SC_ARG_MAX + 9d59e6f6ee journald: do not store the iovec entry for process commandline on stack (CVE-2018-16864 bsc#1120323) + 8d650a68d4 journald: remove unnecessary {} + b608f532a4 coredump: remove duplicate MESSAGE= prefix from message + 0dbb2dc066 vconsole-setup: fonts copy will fail if the current terminal is in graphical mode (bsc#1114933) + e501d65540 Revert "systemctl: when removing enablement or mask symlinks, cover both /run and /etc" + d3ea69961f fs-util: rename safe_transition() into unsafe_transition() + 338470fdc9 tmpfiles: use CHASE_WARN in addition to CHASE_SAFE + d9ae1b30da fs-util: make chase_symlink() returns -ENOLINK when unsafe transitions are met + 8b76594d1f fs-util: add new CHASE_WARN flag to chase_symlinks() + ------------------------------------------------------------------- Tue Dec 4 13:20:48 UTC 2018 - Franck Bui diff --git a/systemd.spec b/systemd.spec index cf294aaa..e0fbaa70 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.138.g8ae56af78 +%define suse_version +suse.191.gad34cc45f %bcond_with gnuefi %if 0%{?bootstrap} From 67ba8412064e2408ce7154ff84fb2c805f8e35572c42a149fc4b1341bc849d58 Mon Sep 17 00:00:00 2001 From: Yuchen Lin Date: Wed, 20 Feb 2019 13:09:03 +0000 Subject: [PATCH 034/124] Accepting request 677368 from Base:System OBS-URL: https://build.opensuse.org/request/show/677368 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=292 --- systemd-mini.changes | 24 ++++++++++++++++++++++++ systemd-mini.spec | 2 +- systemd-v239+suse.191.gad34cc45f.tar.xz | 3 --- systemd-v239+suse.205.ga1d86af7e.tar.xz | 3 +++ systemd.changes | 24 ++++++++++++++++++++++++ systemd.spec | 2 +- 6 files changed, 53 insertions(+), 5 deletions(-) delete mode 100644 systemd-v239+suse.191.gad34cc45f.tar.xz create mode 100644 systemd-v239+suse.205.ga1d86af7e.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index b9f0720a..3bc7d4a0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Feb 19 11:08:13 UTC 2019 - Franck Bui + +- Import commit a1d86af7ed49dacef671e8ec8dae9472a8fa47f5 + + 92d860fc12 sysctl: Don't pass null directive argument to '%s' (bsc#1121563) + 1379e30d59 Allocate temporary strings to hold dbus paths on the heap (bsc#1125352 CVE-2019-6454) + b5569a03ae Refuse dbus message paths longer than BUS_PATH_SIZE_MAX limit. (bsc#1125352 CVE-2019-6454) + +------------------------------------------------------------------- +Fri Feb 15 09:58:17 UTC 2019 - Franck Bui + +- Import commit 01b4746d3c6f6cbf969fa2176c77ac3f616a7eda + + 7af53e005b sd-bus: if we receive an invalid dbus message, ignore and proceeed + 92dcbfdd7f bus: move BUS_DONT_DESTROY calls after asserts + a83e7b3b43 automount: don't pass non-blocking pipe to kernel. + 726127ea1d units: make sure initrd-cleanup.service terminates before switching to rootfs (bsc#1123333) + a6347a3cb6 core: Fix use after free case in load_from_path() (bsc#1121563) + 22e2550222 strv: rework FOREACH_STRING() macro (bsc#1121563) + 2ddd38f41a test,systemctl,nspawn: use "const char*" instead of "char*" as iterator for FOREACH_STRING() + c2c8333e0b strv: add new macro STARTSWITH_SET() + 1db243a601 Update systemd-system.conf.xml (bsc#1122000) + ------------------------------------------------------------------- Tue Jan 15 09:04:47 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index b9c0d70b..a8ccf3f5 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.191.gad34cc45f +%define suse_version +suse.205.ga1d86af7e %bcond_with gnuefi %if 0%{?bootstrap} diff --git a/systemd-v239+suse.191.gad34cc45f.tar.xz b/systemd-v239+suse.191.gad34cc45f.tar.xz deleted file mode 100644 index 4b76a164..00000000 --- a/systemd-v239+suse.191.gad34cc45f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:41ecaea73db343549ca13c297a93304cb211fe405d2c1e953ab047b819aa0b92 -size 4859076 diff --git a/systemd-v239+suse.205.ga1d86af7e.tar.xz b/systemd-v239+suse.205.ga1d86af7e.tar.xz new file mode 100644 index 00000000..26234af1 --- /dev/null +++ b/systemd-v239+suse.205.ga1d86af7e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:72e095c8eb7312cd4ac735a0186f091799c5ff66bc434e8c49ce0e3655538734 +size 4860080 diff --git a/systemd.changes b/systemd.changes index b9f0720a..3bc7d4a0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Tue Feb 19 11:08:13 UTC 2019 - Franck Bui + +- Import commit a1d86af7ed49dacef671e8ec8dae9472a8fa47f5 + + 92d860fc12 sysctl: Don't pass null directive argument to '%s' (bsc#1121563) + 1379e30d59 Allocate temporary strings to hold dbus paths on the heap (bsc#1125352 CVE-2019-6454) + b5569a03ae Refuse dbus message paths longer than BUS_PATH_SIZE_MAX limit. (bsc#1125352 CVE-2019-6454) + +------------------------------------------------------------------- +Fri Feb 15 09:58:17 UTC 2019 - Franck Bui + +- Import commit 01b4746d3c6f6cbf969fa2176c77ac3f616a7eda + + 7af53e005b sd-bus: if we receive an invalid dbus message, ignore and proceeed + 92dcbfdd7f bus: move BUS_DONT_DESTROY calls after asserts + a83e7b3b43 automount: don't pass non-blocking pipe to kernel. + 726127ea1d units: make sure initrd-cleanup.service terminates before switching to rootfs (bsc#1123333) + a6347a3cb6 core: Fix use after free case in load_from_path() (bsc#1121563) + 22e2550222 strv: rework FOREACH_STRING() macro (bsc#1121563) + 2ddd38f41a test,systemctl,nspawn: use "const char*" instead of "char*" as iterator for FOREACH_STRING() + c2c8333e0b strv: add new macro STARTSWITH_SET() + 1db243a601 Update systemd-system.conf.xml (bsc#1122000) + ------------------------------------------------------------------- Tue Jan 15 09:04:47 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index e0fbaa70..1ab8bb15 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.191.gad34cc45f +%define suse_version +suse.205.ga1d86af7e %bcond_with gnuefi %if 0%{?bootstrap} From f805efc4e5b0b52572883723d81b04130d22a0986d48f943eed8ad5f9f40c3b9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Mar 2019 08:08:15 +0000 Subject: [PATCH 035/124] Accepting request 683889 from Base:System OBS-URL: https://build.opensuse.org/request/show/683889 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=293 --- ...ward-compatibility-with-UserTasksMax.patch | 36 ++++++------- ...e-etc-resolv.conf-symlink-at-runtime.patch | 16 +++--- systemd-mini.changes | 38 ++++++++++++++ systemd-mini.spec | 52 +++++++++++++------ systemd-v239+suse.205.ga1d86af7e.tar.xz | 3 -- systemd-v241+suse.42.g15a1b4d58.tar.xz | 3 ++ systemd.changes | 38 ++++++++++++++ systemd.spec | 52 +++++++++++++------ 8 files changed, 174 insertions(+), 64 deletions(-) delete mode 100644 systemd-v239+suse.205.ga1d86af7e.tar.xz create mode 100644 systemd-v241+suse.42.g15a1b4d58.tar.xz diff --git a/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch b/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch index a8e39cfd..04b042c6 100644 --- a/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch +++ b/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch @@ -1,4 +1,4 @@ -From d3acd5b49a6a321dc3b1512416132b8724b2fd20 Mon Sep 17 00:00:00 2001 +From 819616fabe327d4baf587337f427c24588192af5 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 6 Nov 2018 11:51:26 +0100 Subject: [PATCH] logind: keep backward compatibility with UserTasksMax= in @@ -30,27 +30,27 @@ Expect this generator to be dropped in the future. create mode 100644 src/login/compat-tasks-max-generator.c diff --git a/meson.build b/meson.build -index 5c7c165ba..7e3e8ca16 100644 +index eacadc1505..7c00470fff 100644 --- a/meson.build +++ b/meson.build -@@ -1701,6 +1701,14 @@ if conf.get('ENABLE_LOGIND') == 1 +@@ -1866,6 +1866,14 @@ if conf.get('ENABLE_LOGIND') == 1 + endif endif - endif -+executable('logind-compat-tasks-max-generator', -+ 'src/login/compat-tasks-max-generator.c', -+ include_directories : includes, -+ link_with : [libshared, liblogind_core], -+ install_rpath : rootlibexecdir, -+ install : true, -+ install_dir : systemgeneratordir) ++ executable('logind-compat-tasks-max-generator', ++ 'src/login/compat-tasks-max-generator.c', ++ include_directories : includes, ++ link_with : [libshared, liblogind_core], ++ install_rpath : rootlibexecdir, ++ install : true, ++ install_dir : systemgeneratordir) + - executable('systemd-user-runtime-dir', - user_runtime_dir_sources, - include_directories : includes, + executable('systemd-user-runtime-dir', + user_runtime_dir_sources, + include_directories : includes, diff --git a/src/login/compat-tasks-max-generator.c b/src/login/compat-tasks-max-generator.c new file mode 100644 -index 000000000..404ca5f23 +index 0000000000..404ca5f237 --- /dev/null +++ b/src/login/compat-tasks-max-generator.c @@ -0,0 +1,66 @@ @@ -121,10 +121,10 @@ index 000000000..404ca5f23 + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index 66f5c896d..fe58b0398 100644 +index ae27bfb662..bbcac62783 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c -@@ -743,17 +743,50 @@ int config_parse_compat_user_tasks_max( +@@ -843,17 +843,50 @@ int config_parse_compat_user_tasks_max( void *data, void *userdata) { @@ -181,5 +181,5 @@ index 66f5c896d..fe58b0398 100644 return 0; } -- -2.19.0 +2.20.1 diff --git a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch index 09c040f2..df56368d 100644 --- a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -1,7 +1,7 @@ -From a482b51673d4344faf76a0460a69d7f273b36e47 Mon Sep 17 00:00:00 2001 +From 86aa208e639b119007332718aa4f453af2a061d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH 1/1] resolved: create /etc/resolv.conf symlink at runtime +Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime If the symlink doesn't exists, and we are being started, let's create it to provie name resolution. @@ -12,19 +12,17 @@ a location used by some service that hasn't started yet, so we don't touch it in that case either. https://bugzilla.redhat.com/show_bug.cgi?id=1313085 - -[fbui: fixes boo#1024897] --- src/resolve/resolved.c | 4 ++++ tmpfiles.d/etc.conf.m4 | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index a4cda0b5e..68bca8077 100644 +index f4efddf8e5..3386e3bf67 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c -@@ -71,6 +71,10 @@ int main(int argc, char *argv[]) { - /* Drop privileges, but only if we have been started as root. If we are not running as root we assume all +@@ -45,6 +45,10 @@ static int run(int argc, char *argv[]) { + /* Drop privileges, but only if we have been started as root. If we are not running as root we assume most * privileges are already dropped. */ if (getuid() == 0) { + r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); @@ -35,7 +33,7 @@ index a4cda0b5e..68bca8077 100644 /* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */ r = drop_privileges(uid, gid, diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index df8d42101..928105ea8 100644 +index df8d42101c..928105ea8d 100644 --- a/tmpfiles.d/etc.conf.m4 +++ b/tmpfiles.d/etc.conf.m4 @@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts @@ -49,5 +47,5 @@ index df8d42101..928105ea8 100644 m4_ifdef(`HAVE_PAM', C /etc/pam.d - - - - -- -2.16.2 +2.19.2 diff --git a/systemd-mini.changes b/systemd-mini.changes index 3bc7d4a0..fb31cad2 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Mon Mar 11 12:58:19 UTC 2019 - Franck Bui + +- Stop installing macros.systemd + + There're no points in installing this file if we remove it right + after. + +------------------------------------------------------------------- +Mon Mar 11 10:48:54 UTC 2019 - Franck Bui + +- Make sure systemd-network.rules take precedence over our polkit-default-privs (bsc#1125438) + +------------------------------------------------------------------- +Thu Mar 7 14:27:59 UTC 2019 - Franck Bui + +- Include the SUSE version along with the major version of systemd + + $ systemctl --version + systemd 241 (+suse.42.g15a1b4d58) + + Note that the SUSE version format maybe subject to change and as + such scripts should not try to parse it. + +------------------------------------------------------------------- +Wed Mar 6 14:59:22 UTC 2019 - Franck Bui + +- systemd-mini: explicitly disable some of the systemd components + + For some reasons, some build requirements get pulled in for the mini + variant now, enabling some parts of the code that were expected to + be turned OFF. + +------------------------------------------------------------------- +Tue Mar 5 17:51:02 UTC 2019 - Franck Bui + +- Upgrade to v241 (commit 15a1b4d58f1d2bc9c21c7cbab6fe63b58e48bda1) + ------------------------------------------------------------------- Tue Feb 19 11:08:13 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index a8ccf3f5..1970f56d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.205.ga1d86af7e +%define suse_version +suse.42.g15a1b4d58 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 239 +Version: 241 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -434,12 +434,13 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dversion-tag=%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ -Dsplit-bin=true \ -Dpamlibdir=/%{_lib}/security \ - -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ + -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ @@ -456,20 +457,29 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) %if 0%{?bootstrap} -Dman=false \ -Dhtml=false \ - -Dmyhostname=false \ + -Dnss-myhostname=false \ %endif %if %{without coredump} -Dcoredump=false \ %endif +%if %{without gnuefi} + -Dgnu-efi=false \ +%endif +%if %{without importd} + -Dimportd=false \ +%endif +%if %{without journal_remote} + -Dremote=false \ +%endif +%if %{without machined} + -Dmachined=false \ +%endif %if %{without networkd} -Dnetworkd=false \ %endif %if %{without resolved} -Dresolve=false \ %endif -%if %{without machined} - -Dmachined=false \ -%endif %if %{without sysvcompat} -Dsysvinit-path= \ -Dsysvrcnd-path= \ @@ -535,8 +545,7 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -f %{buildroot}/etc/systemd/system/default.target -# Overwrite /etc/pam.d/systemd-user shipped by upstream with one -# customized for openSUSE distros. +# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ # Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs @@ -552,6 +561,13 @@ rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.pat # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# Make sure systemd-network polkit rules file starts with a suitable +# number prefix so it takes precedence over our polkit-default-privs. +%if %{with networkd} +mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ + %{buildroot}%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%endif + # since v207 /etc/sysctl.conf is no longer parsed (commit # 04bf3c1a60d82791), however backward compatibility is provided by # /usr/lib/sysctl.d/99-sysctl.conf. @@ -645,9 +661,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed %fdupes -s %{buildroot}%{_mandir} -# packaged in systemd-rpm-macros -rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd - # Make sure to disable all services by default. The Suse branding # presets package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset @@ -901,6 +914,7 @@ fi %{_bindir}/systemd-delta %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot +%{_bindir}/systemd-id128 %{_bindir}/systemd-path %{_bindir}/systemd-sysusers %{_bindir}/systemd-mount @@ -1048,11 +1062,16 @@ fi %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf -%config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/logind.conf + %config(noreplace) %{_sysconfdir}/systemd/journald.conf +%config(noreplace) %{_sysconfdir}/systemd/logind.conf +%config(noreplace) %{_sysconfdir}/systemd/sleep.conf +%config(noreplace) %{_sysconfdir}/systemd/system.conf +%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf +%if %{with networkd} +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%endif %if %{with resolved} %config(noreplace) %{_sysconfdir}/systemd/resolved.conf %endif @@ -1121,7 +1140,7 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %if %{with networkd} -%{_datadir}/polkit-1/rules.d/systemd-networkd.rules +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %endif %if %{with resolved} %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy @@ -1228,7 +1247,6 @@ fi %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/cdrom_id -%{_prefix}/lib/udev/collect %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id diff --git a/systemd-v239+suse.205.ga1d86af7e.tar.xz b/systemd-v239+suse.205.ga1d86af7e.tar.xz deleted file mode 100644 index 26234af1..00000000 --- a/systemd-v239+suse.205.ga1d86af7e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:72e095c8eb7312cd4ac735a0186f091799c5ff66bc434e8c49ce0e3655538734 -size 4860080 diff --git a/systemd-v241+suse.42.g15a1b4d58.tar.xz b/systemd-v241+suse.42.g15a1b4d58.tar.xz new file mode 100644 index 00000000..a342ebea --- /dev/null +++ b/systemd-v241+suse.42.g15a1b4d58.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2650bb2798f0be894a4bada35eb7ea214e0f7c6e8b5974b9be432679e7e6a788 +size 5192288 diff --git a/systemd.changes b/systemd.changes index 3bc7d4a0..fb31cad2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,41 @@ +------------------------------------------------------------------- +Mon Mar 11 12:58:19 UTC 2019 - Franck Bui + +- Stop installing macros.systemd + + There're no points in installing this file if we remove it right + after. + +------------------------------------------------------------------- +Mon Mar 11 10:48:54 UTC 2019 - Franck Bui + +- Make sure systemd-network.rules take precedence over our polkit-default-privs (bsc#1125438) + +------------------------------------------------------------------- +Thu Mar 7 14:27:59 UTC 2019 - Franck Bui + +- Include the SUSE version along with the major version of systemd + + $ systemctl --version + systemd 241 (+suse.42.g15a1b4d58) + + Note that the SUSE version format maybe subject to change and as + such scripts should not try to parse it. + +------------------------------------------------------------------- +Wed Mar 6 14:59:22 UTC 2019 - Franck Bui + +- systemd-mini: explicitly disable some of the systemd components + + For some reasons, some build requirements get pulled in for the mini + variant now, enabling some parts of the code that were expected to + be turned OFF. + +------------------------------------------------------------------- +Tue Mar 5 17:51:02 UTC 2019 - Franck Bui + +- Upgrade to v241 (commit 15a1b4d58f1d2bc9c21c7cbab6fe63b58e48bda1) + ------------------------------------------------------------------- Tue Feb 19 11:08:13 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 1ab8bb15..5ea0442f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.205.ga1d86af7e +%define suse_version +suse.42.g15a1b4d58 %bcond_with gnuefi %if 0%{?bootstrap} @@ -51,7 +51,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 239 +Version: 241 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -432,12 +432,13 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dversion-tag=%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ -Dsplit-bin=true \ -Dpamlibdir=/%{_lib}/security \ - -Drpmmacrosdir=%{_prefix}/lib/rpm/macros.d \ + -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ @@ -454,20 +455,29 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) %if 0%{?bootstrap} -Dman=false \ -Dhtml=false \ - -Dmyhostname=false \ + -Dnss-myhostname=false \ %endif %if %{without coredump} -Dcoredump=false \ %endif +%if %{without gnuefi} + -Dgnu-efi=false \ +%endif +%if %{without importd} + -Dimportd=false \ +%endif +%if %{without journal_remote} + -Dremote=false \ +%endif +%if %{without machined} + -Dmachined=false \ +%endif %if %{without networkd} -Dnetworkd=false \ %endif %if %{without resolved} -Dresolve=false \ %endif -%if %{without machined} - -Dmachined=false \ -%endif %if %{without sysvcompat} -Dsysvinit-path= \ -Dsysvrcnd-path= \ @@ -533,8 +543,7 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel rm -rf %{buildroot}/etc/systemd/system/*.target.wants rm -f %{buildroot}/etc/systemd/system/default.target -# Overwrite /etc/pam.d/systemd-user shipped by upstream with one -# customized for openSUSE distros. +# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ # Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs @@ -550,6 +559,13 @@ rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.pat # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +# Make sure systemd-network polkit rules file starts with a suitable +# number prefix so it takes precedence over our polkit-default-privs. +%if %{with networkd} +mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ + %{buildroot}%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%endif + # since v207 /etc/sysctl.conf is no longer parsed (commit # 04bf3c1a60d82791), however backward compatibility is provided by # /usr/lib/sysctl.d/99-sysctl.conf. @@ -643,9 +659,6 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed %fdupes -s %{buildroot}%{_mandir} -# packaged in systemd-rpm-macros -rm -f %{buildroot}/%{_prefix}/lib/rpm/macros.d/macros.systemd - # Make sure to disable all services by default. The Suse branding # presets package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset @@ -899,6 +912,7 @@ fi %{_bindir}/systemd-delta %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot +%{_bindir}/systemd-id128 %{_bindir}/systemd-path %{_bindir}/systemd-sysusers %{_bindir}/systemd-mount @@ -1046,11 +1060,16 @@ fi %{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user -%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf -%config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/logind.conf + %config(noreplace) %{_sysconfdir}/systemd/journald.conf +%config(noreplace) %{_sysconfdir}/systemd/logind.conf +%config(noreplace) %{_sysconfdir}/systemd/sleep.conf +%config(noreplace) %{_sysconfdir}/systemd/system.conf +%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf +%if %{with networkd} +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%endif %if %{with resolved} %config(noreplace) %{_sysconfdir}/systemd/resolved.conf %endif @@ -1119,7 +1138,7 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %if %{with networkd} -%{_datadir}/polkit-1/rules.d/systemd-networkd.rules +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %endif %if %{with resolved} %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy @@ -1226,7 +1245,6 @@ fi %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/cdrom_id -%{_prefix}/lib/udev/collect %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id From cff4d7df1b4d72c156da64509ed52edd1b4764617a0c3b3849d48a566c77390d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 15 Apr 2019 11:59:21 +0000 Subject: [PATCH 036/124] Accepting request 693792 from Base:System OBS-URL: https://build.opensuse.org/request/show/693792 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=294 --- systemd-mini.changes | 16 ++++++++++++++++ systemd-mini.spec | 4 +++- systemd-v241+suse.42.g15a1b4d58.tar.xz | 3 --- systemd-v241+suse.46.g4e6e66ea9.tar.xz | 3 +++ systemd.changes | 16 ++++++++++++++++ systemd.spec | 4 +++- 6 files changed, 41 insertions(+), 5 deletions(-) delete mode 100644 systemd-v241+suse.42.g15a1b4d58.tar.xz create mode 100644 systemd-v241+suse.46.g4e6e66ea9.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index fb31cad2..3eb25d2f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Apr 12 14:13:54 UTC 2019 - Franck Bui + +- Import commit 4e6e66ea94cf5125f9044f0869939a86801ed2d8 + + 430877e794 pam-systemd: use secure_getenv() rather than getenv() (bsc#1132348 CVE-2019-3842) + 3cff2e6514 man: document that if the main process exits after SIGTERM we go directly to SIGKILL + 26c4f7191c bus: fix memleak on invalid message + +------------------------------------------------------------------- +Tue Mar 19 16:11:44 UTC 2019 - Franck Bui + +- systemd-coredump: generate a stack trace of all core dumps (bsc#1128832) + + This stack trace is logged to the journal. + ------------------------------------------------------------------- Mon Mar 11 12:58:19 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 1970f56d..168751e7 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.42.g15a1b4d58 +%define suse_version +suse.46.g4e6e66ea9 %bcond_with gnuefi %if 0%{?bootstrap} @@ -70,6 +70,7 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) @@ -454,6 +455,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Dapparmor=auto \ -Dsmack=false \ -Dima=false \ + -Delfutils=auto \ %if 0%{?bootstrap} -Dman=false \ -Dhtml=false \ diff --git a/systemd-v241+suse.42.g15a1b4d58.tar.xz b/systemd-v241+suse.42.g15a1b4d58.tar.xz deleted file mode 100644 index a342ebea..00000000 --- a/systemd-v241+suse.42.g15a1b4d58.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2650bb2798f0be894a4bada35eb7ea214e0f7c6e8b5974b9be432679e7e6a788 -size 5192288 diff --git a/systemd-v241+suse.46.g4e6e66ea9.tar.xz b/systemd-v241+suse.46.g4e6e66ea9.tar.xz new file mode 100644 index 00000000..381248ae --- /dev/null +++ b/systemd-v241+suse.46.g4e6e66ea9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5f2a3be6a40ed5994348c6db064051f09470bdfd0f0be6012b01209f26ccf3ee +size 5192692 diff --git a/systemd.changes b/systemd.changes index fb31cad2..3eb25d2f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Fri Apr 12 14:13:54 UTC 2019 - Franck Bui + +- Import commit 4e6e66ea94cf5125f9044f0869939a86801ed2d8 + + 430877e794 pam-systemd: use secure_getenv() rather than getenv() (bsc#1132348 CVE-2019-3842) + 3cff2e6514 man: document that if the main process exits after SIGTERM we go directly to SIGKILL + 26c4f7191c bus: fix memleak on invalid message + +------------------------------------------------------------------- +Tue Mar 19 16:11:44 UTC 2019 - Franck Bui + +- systemd-coredump: generate a stack trace of all core dumps (bsc#1128832) + + This stack trace is logged to the journal. + ------------------------------------------------------------------- Mon Mar 11 12:58:19 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 5ea0442f..03bf9e96 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.42.g15a1b4d58 +%define suse_version +suse.46.g4e6e66ea9 %bcond_with gnuefi %if 0%{?bootstrap} @@ -68,6 +68,7 @@ BuildRequires: libxslt-tools BuildRequires: python3 BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) @@ -452,6 +453,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Dapparmor=auto \ -Dsmack=false \ -Dima=false \ + -Delfutils=auto \ %if 0%{?bootstrap} -Dman=false \ -Dhtml=false \ From bfe5264cbd1e54bbd84b616482bfd8fa907754e7cda71d6cfcd8a3580fcbce73 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 21 May 2019 08:22:34 +0000 Subject: [PATCH 037/124] Accepting request 702871 from Base:System OBS-URL: https://build.opensuse.org/request/show/702871 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=295 --- ...ward-compatibility-with-UserTasksMax.patch | 26 ++++--- debug-only-remove-new-policies.patch | 51 +++++++++++++ systemd-mini.changes | 75 +++++++++++++++++++ systemd-mini.spec | 19 +++-- systemd-v241+suse.46.g4e6e66ea9.tar.xz | 3 - systemd-v242+suse.75.g9984a86d0d.tar.xz | 3 + systemd.changes | 75 +++++++++++++++++++ systemd.spec | 19 +++-- 8 files changed, 242 insertions(+), 29 deletions(-) create mode 100644 debug-only-remove-new-policies.patch delete mode 100644 systemd-v241+suse.46.g4e6e66ea9.tar.xz create mode 100644 systemd-v242+suse.75.g9984a86d0d.tar.xz diff --git a/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch b/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch index 04b042c6..553fd89f 100644 --- a/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch +++ b/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch @@ -1,4 +1,4 @@ -From 819616fabe327d4baf587337f427c24588192af5 Mon Sep 17 00:00:00 2001 +From ce59acc7743f1897a335449b718f9ede33add394 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 6 Nov 2018 11:51:26 +0100 Subject: [PATCH] logind: keep backward compatibility with UserTasksMax= in @@ -23,17 +23,17 @@ The main advantages to use a generator are: Expect this generator to be dropped in the future. --- - meson.build | 8 ++++ - src/login/compat-tasks-max-generator.c | 66 ++++++++++++++++++++++++++ - src/login/logind-user.c | 43 +++++++++++++++-- - 3 files changed, 112 insertions(+), 5 deletions(-) + meson.build | 8 +++ + src/login/compat-tasks-max-generator.c | 68 ++++++++++++++++++++++++++ + src/login/logind-user.c | 43 ++++++++++++++-- + 3 files changed, 114 insertions(+), 5 deletions(-) create mode 100644 src/login/compat-tasks-max-generator.c diff --git a/meson.build b/meson.build -index eacadc1505..7c00470fff 100644 +index dc6e970095..d834108f24 100644 --- a/meson.build +++ b/meson.build -@@ -1866,6 +1866,14 @@ if conf.get('ENABLE_LOGIND') == 1 +@@ -1885,6 +1885,14 @@ if conf.get('ENABLE_LOGIND') == 1 endif endif @@ -50,11 +50,13 @@ index eacadc1505..7c00470fff 100644 include_directories : includes, diff --git a/src/login/compat-tasks-max-generator.c b/src/login/compat-tasks-max-generator.c new file mode 100644 -index 0000000000..404ca5f237 +index 0000000000..964d0596fb --- /dev/null +++ b/src/login/compat-tasks-max-generator.c -@@ -0,0 +1,66 @@ +@@ -0,0 +1,68 @@ +#include ++#include ++#include + +#include "alloc-util.h" +#include "dropin.h" @@ -121,10 +123,10 @@ index 0000000000..404ca5f237 + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +} diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index ae27bfb662..bbcac62783 100644 +index 045b6f0e17..1c19d6512b 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c -@@ -843,17 +843,50 @@ int config_parse_compat_user_tasks_max( +@@ -847,17 +847,50 @@ int config_parse_compat_user_tasks_max( void *data, void *userdata) { @@ -181,5 +183,5 @@ index ae27bfb662..bbcac62783 100644 return 0; } -- -2.20.1 +2.21.0 diff --git a/debug-only-remove-new-policies.patch b/debug-only-remove-new-policies.patch new file mode 100644 index 00000000..670f8f26 --- /dev/null +++ b/debug-only-remove-new-policies.patch @@ -0,0 +1,51 @@ +diff --git a/src/login/org.freedesktop.login1.policy b/src/login/org.freedesktop.login1.policy +index 6dc79aa32a..398fb7bc21 100644 +--- a/src/login/org.freedesktop.login1.policy ++++ b/src/login/org.freedesktop.login1.policy +@@ -337,17 +337,6 @@ + + + +- +- Set the reboot "reason" in the kernel +- Authentication is required to set the reboot "reason" in the kernel. +- +- auth_admin_keep +- auth_admin_keep +- yes +- +- org.freedesktop.login1.reboot +- +- + + Indicate to the firmware to boot to setup interface + Authentication is required to indicate to the firmware to boot to setup interface. +@@ -359,28 +348,6 @@ + org.freedesktop.login1.reboot + + +- +- Indicate to the boot loader to boot to the boot loader menu +- Authentication is required to indicate to the boot loader to boot to the boot loader menu. +- +- auth_admin_keep +- auth_admin_keep +- yes +- +- org.freedesktop.login1.reboot +- +- +- +- Indicate to the boot loader to boot a specific entry +- Authentication is required to indicate to the boot loader to boot into a specific boot loader entry. +- +- auth_admin_keep +- auth_admin_keep +- yes +- +- org.freedesktop.login1.reboot +- +- + + Set a wall message + Authentication is required to set a wall message diff --git a/systemd-mini.changes b/systemd-mini.changes index 3eb25d2f..51e13e4c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Tue May 14 14:27:12 UTC 2019 - Franck Bui + +- Import commit 9984a86d0d2259d54c7060f9c09f214202b4efa7 + + f2459bf373 random-util: eat up bad RDRAND values seen on AMD CPUs + c90a2e9793 util-lib: fix a typo in rdrand + 4db1cc9d46 random-util: rename "err" to "success" + 981a62a102 random-util: hash AT_RANDOM getauxval() value before using it + 64a9c3d918 random-util: use gcc's bit_RDRND definition if it exists + c5d6ecfdca random-util: rename RANDOM_DONT_DRAIN → RANDOM_MAY_FAIL + 298d13df7e network: remove redunant link name in message + 77cbde31f2 hwdb: Align airplane mode toggle key mapping for all Acer series + 460f03794e Revert "hwdb: Apply Acer mappings to all Gateway and Packard Bell models" + fe9271ad84 test: return a non-zero return code when 'nobody' user doesn't exist + 29d355e755 fstab-generator: Prevent double free of reused FILE* + f30f1adc11 meson: make source files including nspawn-settings.h depend on libseccomp + 84bab914b8 alloc-util: don't use malloc_usable_size() to determine allocated size + 5240972d8d units: drop reference to sushell man page + 0a26de5e33 codespell: fix spelling errors + 582de105c8 nspawn-expose-ports: fix a typo in error message + +------------------------------------------------------------------- +Mon May 13 08:46:38 UTC 2019 - Franck Bui + +- Buildrequire polkit so /usr/share/polkit-1/rules.d has an owner + + Otherwise the "post build checks" would complain and would force + systemd to own this directory. The owner should still be "polkit" + and the perms should be in sync with the perm set by polkit + itself. + +------------------------------------------------------------------- +Thu May 9 07:13:44 UTC 2019 - Franck Bui + +- Add debug-only-remove-new-policies.patch + + A temporary patch to suppress the new DBUS methods introduced by + v242 until they are reviewed and whitelisted by the secteam. + +------------------------------------------------------------------- +Thu May 9 07:11:08 UTC 2019 - Franck Bui + +- Add a comment explaining why static enablement symlinks in /etc are suppressed + + Also remove any /etc/systemd/system/*.requires/ symlinks for the + same reason. + +------------------------------------------------------------------- +Thu May 2 15:24:45 UTC 2019 - Franck Bui + +- preset remote-cryptsetup.target during package installation + + This target is supposed to be part of the targets that should be + enabled (or not depending on the presets) at package installation. + +------------------------------------------------------------------- +Thu May 2 13:12:23 UTC 2019 - Franck Bui + +- Upgrade to v242 (commit 071c380dcc434dca2a0c8b6de0519cc9e816c6d6) + + See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for + details. + +------------------------------------------------------------------- +Wed Apr 24 07:23:44 UTC 2019 - Franck Bui + +- Drop "BuildRequires: -post-build-checks" from the specfile (bsc#1130230) + + The syntax of this directive is obsolete and should be replaced by + "#!BuildIgnore: post-build-checks". + + However there's no good reasons to disable these SUSE extra checks, + so let's re-enable them and fix the few errors it detected. + ------------------------------------------------------------------- Fri Apr 12 14:13:54 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 168751e7..8ff76041 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.46.g4e6e66ea9 +%define suse_version +suse.75.g9984a86d0d %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,19 +53,19 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 241 +Version: 242 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} -BuildRequires: -post-build-checks BuildRequires: docbook-xsl-stylesheets BuildRequires: kbd BuildRequires: libapparmor-devel BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools +BuildRequires: polkit # python is only required for generating systemd.directives.xml BuildRequires: python3 BuildRequires: python3-lxml @@ -167,6 +167,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh # merged by upstream. Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch +Patch3: debug-only-remove-new-policies.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -544,7 +545,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel -rm -rf %{buildroot}/etc/systemd/system/*.target.wants + +# Make sure we don't ship static enablement symlinks in /etc during +# installation, presets should be honoured instead. +rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. @@ -606,6 +610,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d # Make sure directories in /var exist mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog + # Create ghost databases touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin @@ -732,6 +737,7 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. +%systemd_post remote-cryptsetup.target %systemd_post getty@.service %systemd_post machines.target %systemd_post remote-fs.target @@ -942,6 +948,7 @@ fi %{_bindir}/systemd-cat %dir %{_prefix}/lib/kernel %dir %{_prefix}/lib/kernel/install.d +%{_prefix}/lib/kernel/install.d/00-entry-directory.install %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd @@ -1090,11 +1097,9 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf %if %{with networkd} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif @@ -1263,7 +1268,7 @@ fi %{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ -%ghost %{_sysconfdir}/udev/hwdb.bin +%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %config(noreplace) %{_sysconfdir}/udev/udev.conf %if ! 0%{?bootstrap} %{_mandir}/man5/udev* diff --git a/systemd-v241+suse.46.g4e6e66ea9.tar.xz b/systemd-v241+suse.46.g4e6e66ea9.tar.xz deleted file mode 100644 index 381248ae..00000000 --- a/systemd-v241+suse.46.g4e6e66ea9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5f2a3be6a40ed5994348c6db064051f09470bdfd0f0be6012b01209f26ccf3ee -size 5192692 diff --git a/systemd-v242+suse.75.g9984a86d0d.tar.xz b/systemd-v242+suse.75.g9984a86d0d.tar.xz new file mode 100644 index 00000000..50615f14 --- /dev/null +++ b/systemd-v242+suse.75.g9984a86d0d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5ad0c9c95ffa3b089676482ccdf91c72d6e2a01f4f97eece0264a737afc9af5 +size 5323056 diff --git a/systemd.changes b/systemd.changes index 3eb25d2f..51e13e4c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Tue May 14 14:27:12 UTC 2019 - Franck Bui + +- Import commit 9984a86d0d2259d54c7060f9c09f214202b4efa7 + + f2459bf373 random-util: eat up bad RDRAND values seen on AMD CPUs + c90a2e9793 util-lib: fix a typo in rdrand + 4db1cc9d46 random-util: rename "err" to "success" + 981a62a102 random-util: hash AT_RANDOM getauxval() value before using it + 64a9c3d918 random-util: use gcc's bit_RDRND definition if it exists + c5d6ecfdca random-util: rename RANDOM_DONT_DRAIN → RANDOM_MAY_FAIL + 298d13df7e network: remove redunant link name in message + 77cbde31f2 hwdb: Align airplane mode toggle key mapping for all Acer series + 460f03794e Revert "hwdb: Apply Acer mappings to all Gateway and Packard Bell models" + fe9271ad84 test: return a non-zero return code when 'nobody' user doesn't exist + 29d355e755 fstab-generator: Prevent double free of reused FILE* + f30f1adc11 meson: make source files including nspawn-settings.h depend on libseccomp + 84bab914b8 alloc-util: don't use malloc_usable_size() to determine allocated size + 5240972d8d units: drop reference to sushell man page + 0a26de5e33 codespell: fix spelling errors + 582de105c8 nspawn-expose-ports: fix a typo in error message + +------------------------------------------------------------------- +Mon May 13 08:46:38 UTC 2019 - Franck Bui + +- Buildrequire polkit so /usr/share/polkit-1/rules.d has an owner + + Otherwise the "post build checks" would complain and would force + systemd to own this directory. The owner should still be "polkit" + and the perms should be in sync with the perm set by polkit + itself. + +------------------------------------------------------------------- +Thu May 9 07:13:44 UTC 2019 - Franck Bui + +- Add debug-only-remove-new-policies.patch + + A temporary patch to suppress the new DBUS methods introduced by + v242 until they are reviewed and whitelisted by the secteam. + +------------------------------------------------------------------- +Thu May 9 07:11:08 UTC 2019 - Franck Bui + +- Add a comment explaining why static enablement symlinks in /etc are suppressed + + Also remove any /etc/systemd/system/*.requires/ symlinks for the + same reason. + +------------------------------------------------------------------- +Thu May 2 15:24:45 UTC 2019 - Franck Bui + +- preset remote-cryptsetup.target during package installation + + This target is supposed to be part of the targets that should be + enabled (or not depending on the presets) at package installation. + +------------------------------------------------------------------- +Thu May 2 13:12:23 UTC 2019 - Franck Bui + +- Upgrade to v242 (commit 071c380dcc434dca2a0c8b6de0519cc9e816c6d6) + + See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for + details. + +------------------------------------------------------------------- +Wed Apr 24 07:23:44 UTC 2019 - Franck Bui + +- Drop "BuildRequires: -post-build-checks" from the specfile (bsc#1130230) + + The syntax of this directive is obsolete and should be replaced by + "#!BuildIgnore: post-build-checks". + + However there's no good reasons to disable these SUSE extra checks, + so let's re-enable them and fix the few errors it detected. + ------------------------------------------------------------------- Fri Apr 12 14:13:54 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 03bf9e96..245e57c2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.46.g4e6e66ea9 +%define suse_version +suse.75.g9984a86d0d %bcond_with gnuefi %if 0%{?bootstrap} @@ -51,19 +51,19 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 241 +Version: 242 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} -BuildRequires: -post-build-checks BuildRequires: docbook-xsl-stylesheets BuildRequires: kbd BuildRequires: libapparmor-devel BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools +BuildRequires: polkit # python is only required for generating systemd.directives.xml BuildRequires: python3 BuildRequires: python3-lxml @@ -165,6 +165,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh # merged by upstream. Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch +Patch3: debug-only-remove-new-policies.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -542,7 +543,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel -rm -rf %{buildroot}/etc/systemd/system/*.target.wants + +# Make sure we don't ship static enablement symlinks in /etc during +# installation, presets should be honoured instead. +rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. @@ -604,6 +608,7 @@ mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d # Make sure directories in /var exist mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog + # Create ghost databases touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin @@ -730,6 +735,7 @@ systemctl daemon-reexec || : # Create default config in /etc at first install. # Later package updates should not overwrite these settings. +%systemd_post remote-cryptsetup.target %systemd_post getty@.service %systemd_post machines.target %systemd_post remote-fs.target @@ -940,6 +946,7 @@ fi %{_bindir}/systemd-cat %dir %{_prefix}/lib/kernel %dir %{_prefix}/lib/kernel/install.d +%{_prefix}/lib/kernel/install.d/00-entry-directory.install %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd @@ -1088,11 +1095,9 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf %if %{with networkd} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %endif %if %{with resolved} -%{_sysconfdir}/systemd/system/dbus-org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %endif @@ -1261,7 +1266,7 @@ fi %{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ -%ghost %{_sysconfdir}/udev/hwdb.bin +%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %config(noreplace) %{_sysconfdir}/udev/udev.conf %if ! 0%{?bootstrap} %{_mandir}/man5/udev* From 6ab432dbe10f6e112f194202c7306c27ea6fb4fd551a45ae134676aeece58612 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 2 Jun 2019 13:15:04 +0000 Subject: [PATCH 038/124] Accepting request 705897 from Base:System OBS-URL: https://build.opensuse.org/request/show/705897 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=296 --- 0001-Revert-insserv.conf-generator.patch | 365 ++++++++++++++++++ ...nerator-deprecate-halt.local-support.patch | 31 ++ debug-only-remove-new-policies.patch | 51 --- systemd-mini.changes | 33 ++ systemd-mini.spec | 5 +- systemd-v242+suse.75.g9984a86d0d.tar.xz | 3 - systemd-v242+suse.77.geaa7b8b148.tar.xz | 3 + systemd.changes | 33 ++ systemd.spec | 5 +- 9 files changed, 471 insertions(+), 58 deletions(-) create mode 100644 0001-Revert-insserv.conf-generator.patch create mode 100644 0001-rc-local-generator-deprecate-halt.local-support.patch delete mode 100644 debug-only-remove-new-policies.patch delete mode 100644 systemd-v242+suse.75.g9984a86d0d.tar.xz create mode 100644 systemd-v242+suse.77.geaa7b8b148.tar.xz diff --git a/0001-Revert-insserv.conf-generator.patch b/0001-Revert-insserv.conf-generator.patch new file mode 100644 index 00000000..cdcd3409 --- /dev/null +++ b/0001-Revert-insserv.conf-generator.patch @@ -0,0 +1,365 @@ +From e143d8271cd8d8dd862a627754d3daa2d6f9cd48 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Mon, 27 May 2019 10:54:26 +0200 +Subject: [PATCH] Revert "insserv.conf generator" + +This reverts commit dbb7a2e71bec6f6400f2b67cc409b22915fe8c72. + +The only (system) packages which were still relying on the insserv-generator +have been fixed, see bsc#1052837 for the details. + +[fbui: fixes bsc#1052837] +--- + meson.build | 8 - + src/insserv-generator/insserv-generator.c | 320 ---------------------- + 2 files changed, 328 deletions(-) + delete mode 100644 src/insserv-generator/insserv-generator.c + +diff --git a/meson.build b/meson.build +index 54664661b5..4377fe8419 100644 +--- a/meson.build ++++ b/meson.build +@@ -2083,14 +2083,6 @@ if conf.get('HAVE_SYSV_COMPAT') == 1 + install_rpath : rootlibexecdir, + install : true, + install_dir : systemgeneratordir) +- +- executable('systemd-insserv-generator', +- 'src/insserv-generator/insserv-generator.c', +- include_directories : includes, +- link_with : [libshared], +- install_rpath : rootlibexecdir, +- install : true, +- install_dir : systemgeneratordir) + endif + + if conf.get('ENABLE_HOSTNAMED') == 1 +diff --git a/src/insserv-generator/insserv-generator.c b/src/insserv-generator/insserv-generator.c +deleted file mode 100644 +index 23b5a8255a..0000000000 +--- a/src/insserv-generator/insserv-generator.c ++++ /dev/null +@@ -1,320 +0,0 @@ +-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ +- +-/*** +- This file is part of systemd. +- +- Copyright 2012 Lennart Poettering +- +- systemd is free software; you can redistribute it and/or modify it +- under the terms of the GNU Lesser General Public License as published by +- the Free Software Foundation; either version 2.1 of the License, or +- (at your option) any later version. +- +- systemd 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 +- Lesser General Public License for more details. +- +- You should have received a copy of the GNU Lesser General Public License +- along with systemd; If not, see . +- ***/ +- +-#include +-#include +-#include +-#include +- +-#include "alloc-util.h" +-#include "mkdir.h" +-#include "log.h" +-#include "fileio.h" +-#include "unit-name.h" +-#include "special.h" +-#include "path-util.h" +-#include "util.h" +-#include "fd-util.h" +-#include "string-util.h" +-#include "strv.h" +- +-static const char *arg_dest = "/tmp"; +- +-static char *sysv_translate_name(const char *name) { +- char *r; +- +- r = new(char, strlen(name) + sizeof(".service")); +- if (!r) +- return NULL; +- +- if (endswith(name, ".sh")) +- /* Drop .sh suffix */ +- strcpy(stpcpy(r, name) - 3, ".service"); +- if (startswith(name, "boot.")) +- /* Drop SuSE-style boot. prefix */ +- strcpy(stpcpy(r, name + 5), ".service"); +- else +- /* Normal init script name */ +- strcpy(stpcpy(r, name), ".service"); +- +- return r; +-} +- +-static int sysv_translate_facility(const char *name, const char *filename, char **_r) { +- +- /* We silently ignore the $ prefix here. According to the LSB +- * spec it simply indicates whether something is a +- * standardized name or a distribution-specific one. Since we +- * just follow what already exists and do not introduce new +- * uses or names we don't care who introduced a new name. */ +- +- static const char * const table[] = { +- /* LSB defined facilities */ +- "local_fs", NULL, +- "network", SPECIAL_NETWORK_ONLINE_TARGET, +- "named", SPECIAL_NSS_LOOKUP_TARGET, +- "portmap", SPECIAL_RPCBIND_TARGET, +- "remote_fs", SPECIAL_REMOTE_FS_TARGET, +- "syslog", NULL, +- "time", SPECIAL_TIME_SYNC_TARGET, +- }; +- +- unsigned i; +- int e; +- char *r; +- const char *n; +- +- assert(name); +- assert(_r); +- +- n = *name == '$' ? name + 1 : name; +- +- for (i = 0; i < ELEMENTSOF(table); i += 2) { +- +- if (!streq(table[i], n)) +- continue; +- +- if (!table[i+1]) +- return 0; +- +- r = strdup(table[i+1]); +- if (!r) +- return log_oom(); +- +- goto finish; +- } +- +- /* If we don't know this name, fallback heuristics to figure +- * out whether something is a target or a service alias. */ +- +- if (*name == '$') { +- if (!unit_prefix_is_valid(n)) +- return -EINVAL; +- +- /* Facilities starting with $ are most likely targets */ +- e = unit_name_build(n, NULL, ".target", &r); +- if (e < 0) +- return log_error_errno(e, "Failed to generate unit name: %m"); +- +- } else if (filename && streq(name, filename)) +- /* Names equaling the file name of the services are redundant */ +- return 0; +- else +- /* Everything else we assume to be normal service names */ +- r = sysv_translate_name(n); +- +- if (!r) +- return -ENOMEM; +- +-finish: +- *_r = r; +- +- return 1; +-} +- +- +- +-static int parse_insserv_conf(const char* filename) { +- _cleanup_fclose_ FILE *f = NULL; +- int r; +- +- if (!(f = fopen(filename, "re"))) { +- log_debug("Failed to open file %s", filename); +- r = errno == ENOENT ? 0 : -errno; +- return r; +- } +- +- while (!feof(f)) { +- char l[LINE_MAX], *t; +- _cleanup_strv_free_ char **parsed = NULL; +- +- if (!fgets(l, sizeof(l), f)) { +- if (feof(f)) +- break; +- +- r = -errno; +- log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); +- return -r; +- } +- +- t = strstrip(l); +- if (*t != '$' && *t != '<') +- continue; +- +- parsed = strv_split(t,WHITESPACE); +- /* we ignore , not used, equivalent to X-Interactive */ +- if (parsed && !startswith_no_case (parsed[0], "")) { +- _cleanup_free_ char *facility = NULL; +- if (sysv_translate_facility(parsed[0], NULL, &facility) < 0 || !facility) +- continue; +- if (streq(facility, SPECIAL_REMOTE_FS_TARGET)) { +- _cleanup_free_ char *unit = NULL; +- /* insert also a Wants dependency from remote-fs-pre on remote-fs */ +- unit = strjoin(arg_dest, "/remote-fs.target.d/50-",basename(filename),".conf", NULL); +- if (!unit) +- return log_oom(); +- +- mkdir_parents_label(unit, 0755); +- +- r = write_string_file(unit, +- "# Automatically generated by systemd-insserv-generator\n\n" +- "[Unit]\n" +- "Wants=remote-fs-pre.target\n", WRITE_STRING_FILE_CREATE); +- if (r) +- return r; +- free (facility); +- facility=strdup(SPECIAL_REMOTE_FS_PRE_TARGET); +- } +- if (facility && endswith(facility, ".target")) { +- char *name, **j; +- FILE *file = NULL; +- +- STRV_FOREACH (j, parsed+1) { +- _cleanup_free_ char *unit = NULL; +- _cleanup_free_ char *dep = NULL; +- +- if (*j[0] == '+') +- name = *j+1; +- else +- name = *j; +- if (streq(name, "boot.localfs") || +- streq(name, "boot.crypto")) +- continue; +- if ((sysv_translate_facility(name, NULL, &dep) < 0) || !dep) +- continue; +- +- unit = strjoin(arg_dest, "/", dep, ".d/50-",basename(filename),"-",parsed[0],".conf", NULL); +- if (!unit) +- return log_oom(); +- +- mkdir_parents_label(unit, 0755); +- +- file = fopen(unit, "wxe"); +- if (!file) { +- if (errno == EEXIST) +- log_error("Failed to create drop-in file %s", unit); +- else +- log_error("Failed to create drop-in file %s: %m", unit); +- return -errno; +- } +- +- fprintf(file, +- "# Automatically generated by systemd-insserv-generator\n\n" +- "[Unit]\n" +- "Wants=%s\n" +- "Before=%s\n", +- facility, facility); +- +- fflush(file); +- if (ferror(file)) { +- log_error("Failed to write unit file %s: %m", unit); +- return -errno; +- } +- fclose(file); +- +- if (*j[0] != '+') { +- free (unit); +- unit = strjoin(arg_dest, "/", facility, ".d/50-hard-dependency-",basename(filename),"-",parsed[0],".conf", NULL); +- if (!unit) +- return log_oom(); +- +- mkdir_parents_label(unit, 0755); +- +- file = fopen(unit, "wxe"); +- if (!file) { +- if (errno == EEXIST) +- log_error("Failed to create drop-in file %s, as it already exists", unit); +- else +- log_error("Failed to create drop-in file %s: %m", unit); +- return -errno; +- } +- +- +- fprintf(file, +- "# Automatically generated by systemd-insserv-generator\n\n" +- "[Unit]\n" +- "SourcePath=%s\n" +- "Requires=%s\n", +- filename, dep); +- fflush(file); +- if (ferror(file)) { +- log_error("Failed to write unit file %s: %m", unit); +- return -errno; +- } +- fclose(file); +- } +- } +- } +- } +- } +- return r; +-} +- +-static int parse_insserv(void) { +- DIR *d = NULL; +- struct dirent *de; +- int r = 0; +- +- if (!(d = opendir("/etc/insserv.conf.d/"))) { +- if (errno != ENOENT) { +- log_debug("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); +- } +- } else { +- +- while ((de = readdir(d))) { +- char *path = NULL; +- if (hidden_or_backup_file(de->d_name)) +- continue; +- +- path = strjoin("/etc/insserv.conf.d/", de->d_name, NULL); +- parse_insserv_conf(path); +- free(path); +- } +- closedir (d); +- } +- +- r = parse_insserv_conf("/etc/insserv.conf"); +- +- return r; +-} +- +-int main(int argc, char *argv[]) { +- int r = 0; +- +- if (argc > 1 && argc != 4) { +- log_error("This program takes three or no arguments."); +- return EXIT_FAILURE; +- } +- +- if (argc > 1) +- arg_dest = argv[1]; +- +- log_set_prohibit_ipc(true); +- log_set_target(LOG_TARGET_AUTO); +- log_parse_environment(); +- log_open(); +- +- umask(0022); +- +- r = parse_insserv(); +- +- return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS; +-} +-- +2.21.0 + diff --git a/0001-rc-local-generator-deprecate-halt.local-support.patch b/0001-rc-local-generator-deprecate-halt.local-support.patch new file mode 100644 index 00000000..cda1fa59 --- /dev/null +++ b/0001-rc-local-generator-deprecate-halt.local-support.patch @@ -0,0 +1,31 @@ +From 5e397db506aa75e50387bdcb6bfd3d4fa7ac92e7 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Mon, 27 May 2019 14:50:36 +0200 +Subject: [PATCH] rc-local-generator: deprecate halt.local support + +Its support will be dropped after systemd v242, see [1]. So let's give users of +this script a chance to replace it nicely. + +[1] https://github.com/systemd/systemd/pull/12571 +--- + src/rc-local-generator/rc-local-generator.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c +index 7a3948e92d..5699c4f876 100644 +--- a/src/rc-local-generator/rc-local-generator.c ++++ b/src/rc-local-generator/rc-local-generator.c +@@ -68,6 +68,10 @@ static int run(const char *dest, const char *dest_early, const char *dest_late) + if (check_executable(RC_LOCAL_SCRIPT_PATH_STOP) >= 0) { + log_debug("Automatically adding halt-local.service."); + ++ log_warning("Support for %s will be removed soon. " ++ "Please see systemd-shutdown(8) man page for a similar but better alternative.", ++ RC_LOCAL_SCRIPT_PATH_STOP); ++ + k = add_symlink("halt-local.service", "final.target"); + } + +-- +2.21.0 + diff --git a/debug-only-remove-new-policies.patch b/debug-only-remove-new-policies.patch deleted file mode 100644 index 670f8f26..00000000 --- a/debug-only-remove-new-policies.patch +++ /dev/null @@ -1,51 +0,0 @@ -diff --git a/src/login/org.freedesktop.login1.policy b/src/login/org.freedesktop.login1.policy -index 6dc79aa32a..398fb7bc21 100644 ---- a/src/login/org.freedesktop.login1.policy -+++ b/src/login/org.freedesktop.login1.policy -@@ -337,17 +337,6 @@ - - - -- -- Set the reboot "reason" in the kernel -- Authentication is required to set the reboot "reason" in the kernel. -- -- auth_admin_keep -- auth_admin_keep -- yes -- -- org.freedesktop.login1.reboot -- -- - - Indicate to the firmware to boot to setup interface - Authentication is required to indicate to the firmware to boot to setup interface. -@@ -359,28 +348,6 @@ - org.freedesktop.login1.reboot - - -- -- Indicate to the boot loader to boot to the boot loader menu -- Authentication is required to indicate to the boot loader to boot to the boot loader menu. -- -- auth_admin_keep -- auth_admin_keep -- yes -- -- org.freedesktop.login1.reboot -- -- -- -- Indicate to the boot loader to boot a specific entry -- Authentication is required to indicate to the boot loader to boot into a specific boot loader entry. -- -- auth_admin_keep -- auth_admin_keep -- yes -- -- org.freedesktop.login1.reboot -- -- - - Set a wall message - Authentication is required to set a wall message diff --git a/systemd-mini.changes b/systemd-mini.changes index 51e13e4c..adc89a36 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue May 28 11:53:30 UTC 2019 - Franck Bui + +- Import commit eaa7b8b148927d471609de75e542dffcc1b36df4 + + 7e58b89136 udevd: change the default value of udev.children-max (again) (bsc#1107617) + +------------------------------------------------------------------- +Tue May 28 09:51:30 UTC 2019 - Franck Bui + +- Add 0001-rc-local-generator-deprecate-halt.local-support.patch + + /etc/init.d/halt.local support will removed from the next systemd + version (v243) so for now on warn (hopefully the few) users who rely + on this script so they have a chance to switch to systemd-shutdown + interface. + +------------------------------------------------------------------- +Mon May 27 09:33:45 UTC 2019 - Franck Bui + +- Add 0001-Revert-insserv.conf-generator.patch (bsc#1052837) + + All remaining packages have been fixed so they don't rely on the + insser-generator to generate proper deps. So let's drop it as all + services should carry the proper dependencies itself. + +------------------------------------------------------------------- +Mon May 27 09:30:05 UTC 2019 - Franck Bui + +- Drop debug-only-remove-new-policies.patch + + The new DBUS methods have been reviewed by the security team. + ------------------------------------------------------------------- Tue May 14 14:27:12 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 8ff76041..bb101f9f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.75.g9984a86d0d +%define suse_version +suse.77.geaa7b8b148 %bcond_with gnuefi %if 0%{?bootstrap} @@ -167,7 +167,8 @@ Source200: scripts-udev-convert-lib-udev-path.sh # merged by upstream. Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch -Patch3: debug-only-remove-new-policies.patch +Patch3: 0001-Revert-insserv.conf-generator.patch +Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB diff --git a/systemd-v242+suse.75.g9984a86d0d.tar.xz b/systemd-v242+suse.75.g9984a86d0d.tar.xz deleted file mode 100644 index 50615f14..00000000 --- a/systemd-v242+suse.75.g9984a86d0d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d5ad0c9c95ffa3b089676482ccdf91c72d6e2a01f4f97eece0264a737afc9af5 -size 5323056 diff --git a/systemd-v242+suse.77.geaa7b8b148.tar.xz b/systemd-v242+suse.77.geaa7b8b148.tar.xz new file mode 100644 index 00000000..a33f98d1 --- /dev/null +++ b/systemd-v242+suse.77.geaa7b8b148.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2dbfb5d5a7c25807a420b63449cb2e275f610c31c3bdcdd84264c17797617a3d +size 5322904 diff --git a/systemd.changes b/systemd.changes index 51e13e4c..adc89a36 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue May 28 11:53:30 UTC 2019 - Franck Bui + +- Import commit eaa7b8b148927d471609de75e542dffcc1b36df4 + + 7e58b89136 udevd: change the default value of udev.children-max (again) (bsc#1107617) + +------------------------------------------------------------------- +Tue May 28 09:51:30 UTC 2019 - Franck Bui + +- Add 0001-rc-local-generator-deprecate-halt.local-support.patch + + /etc/init.d/halt.local support will removed from the next systemd + version (v243) so for now on warn (hopefully the few) users who rely + on this script so they have a chance to switch to systemd-shutdown + interface. + +------------------------------------------------------------------- +Mon May 27 09:33:45 UTC 2019 - Franck Bui + +- Add 0001-Revert-insserv.conf-generator.patch (bsc#1052837) + + All remaining packages have been fixed so they don't rely on the + insser-generator to generate proper deps. So let's drop it as all + services should carry the proper dependencies itself. + +------------------------------------------------------------------- +Mon May 27 09:30:05 UTC 2019 - Franck Bui + +- Drop debug-only-remove-new-policies.patch + + The new DBUS methods have been reviewed by the security team. + ------------------------------------------------------------------- Tue May 14 14:27:12 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 245e57c2..4559a522 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.75.g9984a86d0d +%define suse_version +suse.77.geaa7b8b148 %bcond_with gnuefi %if 0%{?bootstrap} @@ -165,7 +165,8 @@ Source200: scripts-udev-convert-lib-udev-path.sh # merged by upstream. Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch -Patch3: debug-only-remove-new-policies.patch +Patch3: 0001-Revert-insserv.conf-generator.patch +Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 42ce6e5851c581d2f7e25ad97a2e1600e33b526df27b32c0b2ae8b2aa8037bb6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 26 Jul 2019 10:06:35 +0000 Subject: [PATCH 039/124] Accepting request 718032 from Base:System OBS-URL: https://build.opensuse.org/request/show/718032 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=297 --- systemd-mini.changes | 72 ++++++++++++++++++++++++ systemd-mini.spec | 13 ++++- systemd-v242+suse.135.g0f9271c133.tar.xz | 3 + systemd-v242+suse.77.geaa7b8b148.tar.xz | 3 - systemd.changes | 72 ++++++++++++++++++++++++ systemd.spec | 13 ++++- 6 files changed, 171 insertions(+), 5 deletions(-) create mode 100644 systemd-v242+suse.135.g0f9271c133.tar.xz delete mode 100644 systemd-v242+suse.77.geaa7b8b148.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index adc89a36..86dc393e 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Mon Jul 22 15:29:51 UTC 2019 - Franck Bui + +- Import commit 0f9271c1336c5c9055e75389732a44745d796851 (changes from v242-stable) + + 07f0549ffe network: do not send ipv6 token to kernel + 9d34e79ae8 systemd-mount: don't check for non-normalized WHAT for network FS + 5af677680c core: set fs.file-max sysctl to LONG_MAX rather than ULONG_MAX (bsc#1142099) + 29dda7597a random-util: eat up bad RDRAND values seen on AMD CPUs + eb6c17c178 util-lib: fix a typo in rdrand + 829c20dc8e random-util: rename "err" to "success" + 5442366fbf man: rework the description of Aliases and .wants/.requires directories + ae71c6f634 docs: typo in arg name replace-irreversible -> replace-irreversibly + 09774a5fcb meson: make nologin path build time configurable + 69ffeeb0b1 man: add note about systemctl stop return value + 4cf14b5513 shared/conf-parser: say "key name" not "lvalue", add dot + 4481ca7f86 shared/conf-parser: emit a nicer warning for something like "======" + 46f3db894b shared/conf-parser: be nice and ignore lines without "=" + 7d928995f7 nspawn: fix memleak in argument parsing + 7727e6c0ae resolve: fix memleak + 7f32a81976 journal: properly read unaligned le64 integers + fa419099e5 activate: move array allocation to heap + 815a9fef2a systemctl: print non-elapsing timers as "n/a" not "(null)" + a4fc3c88f1 factory: include pam_keyinit.so in PAM factory configuration + a453d63315 factory: add comment to PAM file, explaining that the defaults are not useful + d9a5a70a59 factory: tighten PAM configuration + 5e2d3bf80b test: make sure colors don't confuse our test + 5fe3be1334 wait-online: change log level + c49b6959d5 systemctl: emit warning when we get an invalid process entry from pid1 and continue + 3c9f43eb03 systemctl: do not suggest passing --all if the user passed --state= + 5964d1474e man: offline-updates: make dependence on system-update.target explicit + a04dd26e03 alloc-util: drop _alloc_ decorator from memdup_suffix0() + 7c46a694ca man: add example for setting multiple properties at once + 1d72789271 man: CPUShares= is so 2015 + 45da304673 man: document that WakeSystem= requires privs + bed58a06e4 man: document that "systemd-analyze blame/critical-chain" is not useful to track down job latency + c5461f31b3 man: be more explicit that Type=oneshot services are not "active" after starting + 455ee07abe man: document that the supplementary groups list is initialized from User='s database entry + 5f0cb2616a alloc-util: drop _alloc_(2, 3) decorator from memdup_suffix0_multiply() + 7bc336794d generator: downgrade Requires= → Wants= of fsck from /usr mount unit + 66465c4381 systemctl: allow "cat" on units with bad settings + ca937b49da pid1: fix serialization/deserialization of commmands with spaces + 4bb3113023 growfs: call crypt_set_debug_level() correctly, skip if not needed + 0db716771e cryptsetup: enable libcryptsetup debug logging if we want it + c8b9b3956f cryptsetup: set libcryptsetup global log callback too + 679b3f6b7f basic/log: fix SYSTEMD_LOG_* parsing error messages + 8d6b5158aa units: add SystemCallErrorNumber=EPERM to systemd-portabled.service + 6681fcd445 network: fix the initial value of the counter for brvlan + 853ec5f458 man: Add some notes about variable $prefix for StateDirectory= + e6d23358e9 sd-netlink: fix inverted log message + 6feb862407 blockdev: filter out invalid block devices early + 9f7c0dbc75 blockdev-util: propagate actual error + 3f5355bcb9 man: document tmpfiles.d/ user/group resolvability needs + c15b92cd98 man: fix wrong udev property name + 9768a900d6 meson: drop duplicated source + 15194f22ed cryptsetup-generator: fix luks-* entry parsing from crypttab + c2475390b4 core: skip whitespace after "|" and "!" in the condition parser + fdc754aeb7 shared/condition: fix printing of ConditionNull= + 572385e135 test: add testcase for issue #12883 + 9aa1edddb0 conf-parser: fix continuation handling + 8fbc72f45f networkd: fix link_up() (#12505) + +------------------------------------------------------------------- +Mon Jul 1 15:14:58 UTC 2019 - Franck Bui + +- State directory of systemd-timesync might become inaccessible after upgrading to v240+ (bsc#1137341) + + This happens for users who had previously used systemd-timesync with + DynamicUser=true, ie the ones who upgraded from a systemd version + between v235 and v239 to systemd v240 and later (v240 was the + version where DynamicUser was switched back to OFF). + ------------------------------------------------------------------- Tue May 28 11:53:30 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index bb101f9f..28708939 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.77.geaa7b8b148 +%define suse_version +suse.135.g0f9271c133 %bcond_with gnuefi %if 0%{?bootstrap} @@ -763,6 +763,17 @@ for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do chmod 0644 $username done +# Due to the fact that DynamicUser= was turned ON during v235 and then +# switched back to off in v240, /var/lib/systemd/timesync might be a +# symlink pointing to /var/lib/private/systemd/timesync, which is +# inaccessible for systemd-timesync user as /var/lib/private is 0700 +# root:root, see https://github.com/systemd/systemd/issues/11329 for +# details. Note: only TW users might be affected by this bug. +if [ -L %{_localstatedir}/lib/systemd/timesync ]; then + rm %{_localstatedir}/lib/systemd/timesync + mv %{_localstatedir}/lib/private/systemd/timesync %{_localstatedir}/lib/systemd/timesync +fi + # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : diff --git a/systemd-v242+suse.135.g0f9271c133.tar.xz b/systemd-v242+suse.135.g0f9271c133.tar.xz new file mode 100644 index 00000000..eadc9ec2 --- /dev/null +++ b/systemd-v242+suse.135.g0f9271c133.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:383bf8d4d50df8d334449ce7135d4de33e5c386109791914c6e6c4474bd2f5db +size 5325036 diff --git a/systemd-v242+suse.77.geaa7b8b148.tar.xz b/systemd-v242+suse.77.geaa7b8b148.tar.xz deleted file mode 100644 index a33f98d1..00000000 --- a/systemd-v242+suse.77.geaa7b8b148.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2dbfb5d5a7c25807a420b63449cb2e275f610c31c3bdcdd84264c17797617a3d -size 5322904 diff --git a/systemd.changes b/systemd.changes index adc89a36..86dc393e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Mon Jul 22 15:29:51 UTC 2019 - Franck Bui + +- Import commit 0f9271c1336c5c9055e75389732a44745d796851 (changes from v242-stable) + + 07f0549ffe network: do not send ipv6 token to kernel + 9d34e79ae8 systemd-mount: don't check for non-normalized WHAT for network FS + 5af677680c core: set fs.file-max sysctl to LONG_MAX rather than ULONG_MAX (bsc#1142099) + 29dda7597a random-util: eat up bad RDRAND values seen on AMD CPUs + eb6c17c178 util-lib: fix a typo in rdrand + 829c20dc8e random-util: rename "err" to "success" + 5442366fbf man: rework the description of Aliases and .wants/.requires directories + ae71c6f634 docs: typo in arg name replace-irreversible -> replace-irreversibly + 09774a5fcb meson: make nologin path build time configurable + 69ffeeb0b1 man: add note about systemctl stop return value + 4cf14b5513 shared/conf-parser: say "key name" not "lvalue", add dot + 4481ca7f86 shared/conf-parser: emit a nicer warning for something like "======" + 46f3db894b shared/conf-parser: be nice and ignore lines without "=" + 7d928995f7 nspawn: fix memleak in argument parsing + 7727e6c0ae resolve: fix memleak + 7f32a81976 journal: properly read unaligned le64 integers + fa419099e5 activate: move array allocation to heap + 815a9fef2a systemctl: print non-elapsing timers as "n/a" not "(null)" + a4fc3c88f1 factory: include pam_keyinit.so in PAM factory configuration + a453d63315 factory: add comment to PAM file, explaining that the defaults are not useful + d9a5a70a59 factory: tighten PAM configuration + 5e2d3bf80b test: make sure colors don't confuse our test + 5fe3be1334 wait-online: change log level + c49b6959d5 systemctl: emit warning when we get an invalid process entry from pid1 and continue + 3c9f43eb03 systemctl: do not suggest passing --all if the user passed --state= + 5964d1474e man: offline-updates: make dependence on system-update.target explicit + a04dd26e03 alloc-util: drop _alloc_ decorator from memdup_suffix0() + 7c46a694ca man: add example for setting multiple properties at once + 1d72789271 man: CPUShares= is so 2015 + 45da304673 man: document that WakeSystem= requires privs + bed58a06e4 man: document that "systemd-analyze blame/critical-chain" is not useful to track down job latency + c5461f31b3 man: be more explicit that Type=oneshot services are not "active" after starting + 455ee07abe man: document that the supplementary groups list is initialized from User='s database entry + 5f0cb2616a alloc-util: drop _alloc_(2, 3) decorator from memdup_suffix0_multiply() + 7bc336794d generator: downgrade Requires= → Wants= of fsck from /usr mount unit + 66465c4381 systemctl: allow "cat" on units with bad settings + ca937b49da pid1: fix serialization/deserialization of commmands with spaces + 4bb3113023 growfs: call crypt_set_debug_level() correctly, skip if not needed + 0db716771e cryptsetup: enable libcryptsetup debug logging if we want it + c8b9b3956f cryptsetup: set libcryptsetup global log callback too + 679b3f6b7f basic/log: fix SYSTEMD_LOG_* parsing error messages + 8d6b5158aa units: add SystemCallErrorNumber=EPERM to systemd-portabled.service + 6681fcd445 network: fix the initial value of the counter for brvlan + 853ec5f458 man: Add some notes about variable $prefix for StateDirectory= + e6d23358e9 sd-netlink: fix inverted log message + 6feb862407 blockdev: filter out invalid block devices early + 9f7c0dbc75 blockdev-util: propagate actual error + 3f5355bcb9 man: document tmpfiles.d/ user/group resolvability needs + c15b92cd98 man: fix wrong udev property name + 9768a900d6 meson: drop duplicated source + 15194f22ed cryptsetup-generator: fix luks-* entry parsing from crypttab + c2475390b4 core: skip whitespace after "|" and "!" in the condition parser + fdc754aeb7 shared/condition: fix printing of ConditionNull= + 572385e135 test: add testcase for issue #12883 + 9aa1edddb0 conf-parser: fix continuation handling + 8fbc72f45f networkd: fix link_up() (#12505) + +------------------------------------------------------------------- +Mon Jul 1 15:14:58 UTC 2019 - Franck Bui + +- State directory of systemd-timesync might become inaccessible after upgrading to v240+ (bsc#1137341) + + This happens for users who had previously used systemd-timesync with + DynamicUser=true, ie the ones who upgraded from a systemd version + between v235 and v239 to systemd v240 and later (v240 was the + version where DynamicUser was switched back to OFF). + ------------------------------------------------------------------- Tue May 28 11:53:30 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 4559a522..352e67a4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.77.geaa7b8b148 +%define suse_version +suse.135.g0f9271c133 %bcond_with gnuefi %if 0%{?bootstrap} @@ -761,6 +761,17 @@ for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do chmod 0644 $username done +# Due to the fact that DynamicUser= was turned ON during v235 and then +# switched back to off in v240, /var/lib/systemd/timesync might be a +# symlink pointing to /var/lib/private/systemd/timesync, which is +# inaccessible for systemd-timesync user as /var/lib/private is 0700 +# root:root, see https://github.com/systemd/systemd/issues/11329 for +# details. Note: only TW users might be affected by this bug. +if [ -L %{_localstatedir}/lib/systemd/timesync ]; then + rm %{_localstatedir}/lib/systemd/timesync + mv %{_localstatedir}/lib/private/systemd/timesync %{_localstatedir}/lib/systemd/timesync +fi + # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : From 4562d218e1cfab9e7c7e78f40defaa3eef1a309e0f80579a0764ce4cce13deaa Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 4 Oct 2019 09:20:29 +0000 Subject: [PATCH 040/124] Accepting request 732684 from Base:System OBS-URL: https://build.opensuse.org/request/show/732684 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=298 --- 0001-Revert-insserv.conf-generator.patch | 365 ------------------ ...nerator-deprecate-halt.local-support.patch | 31 -- ...e-etc-resolv.conf-symlink-at-runtime.patch | 51 --- _service | 2 +- systemd-mini.changes | 53 +++ systemd-mini.spec | 92 ++++- systemd-v242+suse.135.g0f9271c133.tar.xz | 3 - systemd-v243+suse.36.g9e41d7ec35.tar.xz | 3 + systemd.changes | 53 +++ systemd.spec | 92 ++++- 10 files changed, 270 insertions(+), 475 deletions(-) delete mode 100644 0001-Revert-insserv.conf-generator.patch delete mode 100644 0001-rc-local-generator-deprecate-halt.local-support.patch delete mode 100644 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch delete mode 100644 systemd-v242+suse.135.g0f9271c133.tar.xz create mode 100644 systemd-v243+suse.36.g9e41d7ec35.tar.xz diff --git a/0001-Revert-insserv.conf-generator.patch b/0001-Revert-insserv.conf-generator.patch deleted file mode 100644 index cdcd3409..00000000 --- a/0001-Revert-insserv.conf-generator.patch +++ /dev/null @@ -1,365 +0,0 @@ -From e143d8271cd8d8dd862a627754d3daa2d6f9cd48 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Mon, 27 May 2019 10:54:26 +0200 -Subject: [PATCH] Revert "insserv.conf generator" - -This reverts commit dbb7a2e71bec6f6400f2b67cc409b22915fe8c72. - -The only (system) packages which were still relying on the insserv-generator -have been fixed, see bsc#1052837 for the details. - -[fbui: fixes bsc#1052837] ---- - meson.build | 8 - - src/insserv-generator/insserv-generator.c | 320 ---------------------- - 2 files changed, 328 deletions(-) - delete mode 100644 src/insserv-generator/insserv-generator.c - -diff --git a/meson.build b/meson.build -index 54664661b5..4377fe8419 100644 ---- a/meson.build -+++ b/meson.build -@@ -2083,14 +2083,6 @@ if conf.get('HAVE_SYSV_COMPAT') == 1 - install_rpath : rootlibexecdir, - install : true, - install_dir : systemgeneratordir) -- -- executable('systemd-insserv-generator', -- 'src/insserv-generator/insserv-generator.c', -- include_directories : includes, -- link_with : [libshared], -- install_rpath : rootlibexecdir, -- install : true, -- install_dir : systemgeneratordir) - endif - - if conf.get('ENABLE_HOSTNAMED') == 1 -diff --git a/src/insserv-generator/insserv-generator.c b/src/insserv-generator/insserv-generator.c -deleted file mode 100644 -index 23b5a8255a..0000000000 ---- a/src/insserv-generator/insserv-generator.c -+++ /dev/null -@@ -1,320 +0,0 @@ --/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ -- --/*** -- This file is part of systemd. -- -- Copyright 2012 Lennart Poettering -- -- systemd is free software; you can redistribute it and/or modify it -- under the terms of the GNU Lesser General Public License as published by -- the Free Software Foundation; either version 2.1 of the License, or -- (at your option) any later version. -- -- systemd 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 -- Lesser General Public License for more details. -- -- You should have received a copy of the GNU Lesser General Public License -- along with systemd; If not, see . -- ***/ -- --#include --#include --#include --#include -- --#include "alloc-util.h" --#include "mkdir.h" --#include "log.h" --#include "fileio.h" --#include "unit-name.h" --#include "special.h" --#include "path-util.h" --#include "util.h" --#include "fd-util.h" --#include "string-util.h" --#include "strv.h" -- --static const char *arg_dest = "/tmp"; -- --static char *sysv_translate_name(const char *name) { -- char *r; -- -- r = new(char, strlen(name) + sizeof(".service")); -- if (!r) -- return NULL; -- -- if (endswith(name, ".sh")) -- /* Drop .sh suffix */ -- strcpy(stpcpy(r, name) - 3, ".service"); -- if (startswith(name, "boot.")) -- /* Drop SuSE-style boot. prefix */ -- strcpy(stpcpy(r, name + 5), ".service"); -- else -- /* Normal init script name */ -- strcpy(stpcpy(r, name), ".service"); -- -- return r; --} -- --static int sysv_translate_facility(const char *name, const char *filename, char **_r) { -- -- /* We silently ignore the $ prefix here. According to the LSB -- * spec it simply indicates whether something is a -- * standardized name or a distribution-specific one. Since we -- * just follow what already exists and do not introduce new -- * uses or names we don't care who introduced a new name. */ -- -- static const char * const table[] = { -- /* LSB defined facilities */ -- "local_fs", NULL, -- "network", SPECIAL_NETWORK_ONLINE_TARGET, -- "named", SPECIAL_NSS_LOOKUP_TARGET, -- "portmap", SPECIAL_RPCBIND_TARGET, -- "remote_fs", SPECIAL_REMOTE_FS_TARGET, -- "syslog", NULL, -- "time", SPECIAL_TIME_SYNC_TARGET, -- }; -- -- unsigned i; -- int e; -- char *r; -- const char *n; -- -- assert(name); -- assert(_r); -- -- n = *name == '$' ? name + 1 : name; -- -- for (i = 0; i < ELEMENTSOF(table); i += 2) { -- -- if (!streq(table[i], n)) -- continue; -- -- if (!table[i+1]) -- return 0; -- -- r = strdup(table[i+1]); -- if (!r) -- return log_oom(); -- -- goto finish; -- } -- -- /* If we don't know this name, fallback heuristics to figure -- * out whether something is a target or a service alias. */ -- -- if (*name == '$') { -- if (!unit_prefix_is_valid(n)) -- return -EINVAL; -- -- /* Facilities starting with $ are most likely targets */ -- e = unit_name_build(n, NULL, ".target", &r); -- if (e < 0) -- return log_error_errno(e, "Failed to generate unit name: %m"); -- -- } else if (filename && streq(name, filename)) -- /* Names equaling the file name of the services are redundant */ -- return 0; -- else -- /* Everything else we assume to be normal service names */ -- r = sysv_translate_name(n); -- -- if (!r) -- return -ENOMEM; -- --finish: -- *_r = r; -- -- return 1; --} -- -- -- --static int parse_insserv_conf(const char* filename) { -- _cleanup_fclose_ FILE *f = NULL; -- int r; -- -- if (!(f = fopen(filename, "re"))) { -- log_debug("Failed to open file %s", filename); -- r = errno == ENOENT ? 0 : -errno; -- return r; -- } -- -- while (!feof(f)) { -- char l[LINE_MAX], *t; -- _cleanup_strv_free_ char **parsed = NULL; -- -- if (!fgets(l, sizeof(l), f)) { -- if (feof(f)) -- break; -- -- r = -errno; -- log_error("Failed to read configuration file '%s': %s", filename, strerror(-r)); -- return -r; -- } -- -- t = strstrip(l); -- if (*t != '$' && *t != '<') -- continue; -- -- parsed = strv_split(t,WHITESPACE); -- /* we ignore , not used, equivalent to X-Interactive */ -- if (parsed && !startswith_no_case (parsed[0], "")) { -- _cleanup_free_ char *facility = NULL; -- if (sysv_translate_facility(parsed[0], NULL, &facility) < 0 || !facility) -- continue; -- if (streq(facility, SPECIAL_REMOTE_FS_TARGET)) { -- _cleanup_free_ char *unit = NULL; -- /* insert also a Wants dependency from remote-fs-pre on remote-fs */ -- unit = strjoin(arg_dest, "/remote-fs.target.d/50-",basename(filename),".conf", NULL); -- if (!unit) -- return log_oom(); -- -- mkdir_parents_label(unit, 0755); -- -- r = write_string_file(unit, -- "# Automatically generated by systemd-insserv-generator\n\n" -- "[Unit]\n" -- "Wants=remote-fs-pre.target\n", WRITE_STRING_FILE_CREATE); -- if (r) -- return r; -- free (facility); -- facility=strdup(SPECIAL_REMOTE_FS_PRE_TARGET); -- } -- if (facility && endswith(facility, ".target")) { -- char *name, **j; -- FILE *file = NULL; -- -- STRV_FOREACH (j, parsed+1) { -- _cleanup_free_ char *unit = NULL; -- _cleanup_free_ char *dep = NULL; -- -- if (*j[0] == '+') -- name = *j+1; -- else -- name = *j; -- if (streq(name, "boot.localfs") || -- streq(name, "boot.crypto")) -- continue; -- if ((sysv_translate_facility(name, NULL, &dep) < 0) || !dep) -- continue; -- -- unit = strjoin(arg_dest, "/", dep, ".d/50-",basename(filename),"-",parsed[0],".conf", NULL); -- if (!unit) -- return log_oom(); -- -- mkdir_parents_label(unit, 0755); -- -- file = fopen(unit, "wxe"); -- if (!file) { -- if (errno == EEXIST) -- log_error("Failed to create drop-in file %s", unit); -- else -- log_error("Failed to create drop-in file %s: %m", unit); -- return -errno; -- } -- -- fprintf(file, -- "# Automatically generated by systemd-insserv-generator\n\n" -- "[Unit]\n" -- "Wants=%s\n" -- "Before=%s\n", -- facility, facility); -- -- fflush(file); -- if (ferror(file)) { -- log_error("Failed to write unit file %s: %m", unit); -- return -errno; -- } -- fclose(file); -- -- if (*j[0] != '+') { -- free (unit); -- unit = strjoin(arg_dest, "/", facility, ".d/50-hard-dependency-",basename(filename),"-",parsed[0],".conf", NULL); -- if (!unit) -- return log_oom(); -- -- mkdir_parents_label(unit, 0755); -- -- file = fopen(unit, "wxe"); -- if (!file) { -- if (errno == EEXIST) -- log_error("Failed to create drop-in file %s, as it already exists", unit); -- else -- log_error("Failed to create drop-in file %s: %m", unit); -- return -errno; -- } -- -- -- fprintf(file, -- "# Automatically generated by systemd-insserv-generator\n\n" -- "[Unit]\n" -- "SourcePath=%s\n" -- "Requires=%s\n", -- filename, dep); -- fflush(file); -- if (ferror(file)) { -- log_error("Failed to write unit file %s: %m", unit); -- return -errno; -- } -- fclose(file); -- } -- } -- } -- } -- } -- return r; --} -- --static int parse_insserv(void) { -- DIR *d = NULL; -- struct dirent *de; -- int r = 0; -- -- if (!(d = opendir("/etc/insserv.conf.d/"))) { -- if (errno != ENOENT) { -- log_debug("opendir() failed on /etc/insserv.conf.d/ %s", strerror(errno)); -- } -- } else { -- -- while ((de = readdir(d))) { -- char *path = NULL; -- if (hidden_or_backup_file(de->d_name)) -- continue; -- -- path = strjoin("/etc/insserv.conf.d/", de->d_name, NULL); -- parse_insserv_conf(path); -- free(path); -- } -- closedir (d); -- } -- -- r = parse_insserv_conf("/etc/insserv.conf"); -- -- return r; --} -- --int main(int argc, char *argv[]) { -- int r = 0; -- -- if (argc > 1 && argc != 4) { -- log_error("This program takes three or no arguments."); -- return EXIT_FAILURE; -- } -- -- if (argc > 1) -- arg_dest = argv[1]; -- -- log_set_prohibit_ipc(true); -- log_set_target(LOG_TARGET_AUTO); -- log_parse_environment(); -- log_open(); -- -- umask(0022); -- -- r = parse_insserv(); -- -- return (r < 0) ? EXIT_FAILURE : EXIT_SUCCESS; --} --- -2.21.0 - diff --git a/0001-rc-local-generator-deprecate-halt.local-support.patch b/0001-rc-local-generator-deprecate-halt.local-support.patch deleted file mode 100644 index cda1fa59..00000000 --- a/0001-rc-local-generator-deprecate-halt.local-support.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 5e397db506aa75e50387bdcb6bfd3d4fa7ac92e7 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Mon, 27 May 2019 14:50:36 +0200 -Subject: [PATCH] rc-local-generator: deprecate halt.local support - -Its support will be dropped after systemd v242, see [1]. So let's give users of -this script a chance to replace it nicely. - -[1] https://github.com/systemd/systemd/pull/12571 ---- - src/rc-local-generator/rc-local-generator.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/rc-local-generator/rc-local-generator.c b/src/rc-local-generator/rc-local-generator.c -index 7a3948e92d..5699c4f876 100644 ---- a/src/rc-local-generator/rc-local-generator.c -+++ b/src/rc-local-generator/rc-local-generator.c -@@ -68,6 +68,10 @@ static int run(const char *dest, const char *dest_early, const char *dest_late) - if (check_executable(RC_LOCAL_SCRIPT_PATH_STOP) >= 0) { - log_debug("Automatically adding halt-local.service."); - -+ log_warning("Support for %s will be removed soon. " -+ "Please see systemd-shutdown(8) man page for a similar but better alternative.", -+ RC_LOCAL_SCRIPT_PATH_STOP); -+ - k = add_symlink("halt-local.service", "final.target"); - } - --- -2.21.0 - diff --git a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch deleted file mode 100644 index df56368d..00000000 --- a/0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 86aa208e639b119007332718aa4f453af2a061d0 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH] resolved: create /etc/resolv.conf symlink at runtime - -If the symlink doesn't exists, and we are being started, let's -create it to provie name resolution. - -If it exists, do nothing. In particular, if it is a broken symlink, -we cannot really know if the administator configured it to point to -a location used by some service that hasn't started yet, so we -don't touch it in that case either. - -https://bugzilla.redhat.com/show_bug.cgi?id=1313085 ---- - src/resolve/resolved.c | 4 ++++ - tmpfiles.d/etc.conf.m4 | 3 --- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index f4efddf8e5..3386e3bf67 100644 ---- a/src/resolve/resolved.c -+++ b/src/resolve/resolved.c -@@ -45,6 +45,10 @@ static int run(int argc, char *argv[]) { - /* Drop privileges, but only if we have been started as root. If we are not running as root we assume most - * privileges are already dropped. */ - if (getuid() == 0) { -+ r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); -+ if (r < 0 && errno != EEXIST) -+ log_warning_errno(errno, -+ "Could not create /etc/resolv.conf symlink: %m"); - - /* Drop privileges, but keep three caps. Note that we drop those too, later on (see below) */ - r = drop_privileges(uid, gid, -diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index df8d42101c..928105ea8d 100644 ---- a/tmpfiles.d/etc.conf.m4 -+++ b/tmpfiles.d/etc.conf.m4 -@@ -13,9 +13,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - m4_ifdef(`HAVE_SMACK_RUN_LABEL', - t /etc/mtab - - - - security.SMACK64=_ - )m4_dnl --m4_ifdef(`ENABLE_RESOLVE', --L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --)m4_dnl - C /etc/nsswitch.conf - - - - - m4_ifdef(`HAVE_PAM', - C /etc/pam.d - - - - --- -2.19.2 - diff --git a/_service b/_service index 43a94db3..a55e596a 100644 --- a/_service +++ b/_service @@ -10,7 +10,7 @@ openSUSE-Factory - *systemd-v237+suse.*.tar + *systemd-v243+suse.*.tar xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 86dc393e..49f95bcf 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Mon Sep 23 11:45:18 UTC 2019 - Franck Bui + +- Some files related to the portable stuff were missing some %exclude + +------------------------------------------------------------------- +Wed Sep 18 12:17:37 UTC 2019 - Franck Bui + +- Import commit 9e41d7ec3572d8d5ea1e00f683e9fbf8108e85b4 + + fb1b9d54f9 tty-ask-pwd-agent: fix message forwarded to wall(1) + dd14da3bb6 core: restore initialization of u->source_mtime + d62f30f647 resolved: create /etc/resolv.conf symlink at runtime + +------------------------------------------------------------------- +Wed Sep 18 11:33:16 UTC 2019 - Franck Bui + +- Slighly rework (mostly reorganization) the portable stuff + +------------------------------------------------------------------- +Fri Sep 6 06:20:11 UTC 2019 - Franck Bui + +- Track 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + in the git repo + + This patch has been in the quarantine area long enough, so let's + move it in the git repo. + +------------------------------------------------------------------- +Tue Sep 3 15:10:10 UTC 2019 - Franck Bui + +- Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be) + + See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for + details. + + Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped + from branch SUSE/v243 while we were rebasing. + + Drop 0001-rc-local-generator-deprecate-halt.local-support.patch as + this functionality had been deprecated during the previous release + and now have been dropped by upstream. + +------------------------------------------------------------------- +Wed Aug 14 14:25:43 UTC 2019 - Ludwig Nussel + +- enable systemd-portabled + +------------------------------------------------------------------- +Wed Jul 31 14:38:13 UTC 2019 - Franck Bui + +- systemd-container creates and owns /etc/systemd/nspawn now + ------------------------------------------------------------------- Mon Jul 22 15:29:51 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 28708939..87e7e4d3 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.135.g0f9271c133 +%define suse_version +suse.36.g9e41d7ec35 %bcond_with gnuefi %if 0%{?bootstrap} @@ -35,6 +35,7 @@ %bcond_with machined %bcond_with importd %bcond_with networkd +%bcond_with portabled %bcond_with resolved %bcond_with journal_remote %else @@ -43,6 +44,7 @@ %bcond_without machined %bcond_without importd %bcond_without networkd +%bcond_without portabled %bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 @@ -53,7 +55,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 242 +Version: 243 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -165,10 +167,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch -Patch3: 0001-Revert-insserv.conf-generator.patch -Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -332,6 +331,26 @@ Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, and systemd-importd. +%if %{with portabled} +%package portable +Summary: Systemd tools for portable services +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires + +%description portable +Systemd tools to manage portable services. The feature is still +considered experimental so the package might change or vanish. +Use at own risk. + +More information can be found online: + +http://0pointer.net/blog/walkthrough-for-portable-services.html +https://systemd.io/PORTABLE_SERVICES + +%endif + %if ! 0%{?bootstrap} %package logger Summary: Journal only logging @@ -449,18 +468,19 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Ddefault-kill-user-processes=false \ -Dntp-servers="${opensuse_ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ - -Dhalt-local=/etc/init.d/halt.local \ -Ddebug-shell=/bin/bash \ - -Dportabled=false \ -Dseccomp=auto \ -Dselinux=auto \ -Dapparmor=auto \ -Dsmack=false \ -Dima=false \ -Delfutils=auto \ + -Dpstore=false \ +%if ! 0%{?bootstrap} + -Dman=true \ + -Dhtml=true \ +%endif %if 0%{?bootstrap} - -Dman=false \ - -Dhtml=false \ -Dnss-myhostname=false \ %endif %if %{without coredump} @@ -475,6 +495,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) %if %{without journal_remote} -Dremote=false \ %endif +%if %{without portabled} + -Dportabled=false \ +%endif %if %{without machined} -Dmachined=false \ %endif @@ -528,6 +551,8 @@ install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif +mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn + # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... @@ -567,6 +592,7 @@ rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.pat # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +rm -f %{buildroot}%{_sysctldir}/50-pid-max.conf # Make sure systemd-network polkit rules file starts with a suitable # number prefix so it takes precedence over our polkit-default-privs. @@ -910,6 +936,21 @@ fi %service_del_postun systemd-journal-upload.service %endif +%if %{with portabled} +%pre portable +%service_add_pre systemd-portabled.service + +%post portable +%tmpfiles_create portables.conf +%service_add_post systemd-portabled.service + +%preun portable +%service_del_preun systemd-portabled.service + +%postun portable +%service_del_postun systemd-portabled.service +%endif + %clean %files -f systemd.lang @@ -1000,6 +1041,13 @@ fi %exclude %{_unitdir}/systemd-importd.service %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif +%if %{with portabled} +%exclude %{_prefix}/lib/systemd/systemd-portabled +%exclude %{_prefix}/lib/systemd/portable +%exclude %{_unitdir}/systemd-portabled.service +%exclude %{_unitdir}/dbus-org.freedesktop.portable1.service +%exclude %{_tmpfilesdir}/portables.conf +%endif %{_unitdir}/*.automount %{_unitdir}/*.service @@ -1031,6 +1079,7 @@ fi %{_systemd_system_env_generator_dir} %{_systemd_user_env_generator_dir} %dir %{_ntpunitsdir} +%{_ntpunitsdir}/80-systemd-timesync.list %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ @@ -1099,7 +1148,6 @@ fi %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system.d -%dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf @@ -1137,8 +1185,6 @@ fi %exclude %{_datadir}/systemd/gatewayd %endif -%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service @@ -1159,6 +1205,7 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %if %{with networkd} +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %endif %if %{with resolved} @@ -1192,6 +1239,10 @@ fi %if %{with importd} %exclude %{_mandir}/man*/systemd-importd* %endif +%if %{with portabled} +%exclude %{_mandir}/man*/portablectl* +%exclude %{_mandir}/man*/systemd-portabled* +%endif %endif %{_docdir}/systemd @@ -1339,6 +1390,7 @@ fi %files container %defattr(-,root,root) +%dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service %if %{with networkd} @@ -1434,4 +1486,20 @@ fi %{_datadir}/systemd/gatewayd %endif +%if %{with portabled} +%files portable +%defattr(-,root,root) +%{_bindir}/portablectl +%{_prefix}/lib/systemd/systemd-portabled +%{_prefix}/lib/systemd/portable +%{_unitdir}/systemd-portabled.service +%{_unitdir}/dbus-org.freedesktop.portable1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service +%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy +%{_tmpfilesdir}/portables.conf +%{_mandir}/man*/portablectl* +%{_mandir}/man*/systemd-portabled* +%endif + %changelog diff --git a/systemd-v242+suse.135.g0f9271c133.tar.xz b/systemd-v242+suse.135.g0f9271c133.tar.xz deleted file mode 100644 index eadc9ec2..00000000 --- a/systemd-v242+suse.135.g0f9271c133.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:383bf8d4d50df8d334449ce7135d4de33e5c386109791914c6e6c4474bd2f5db -size 5325036 diff --git a/systemd-v243+suse.36.g9e41d7ec35.tar.xz b/systemd-v243+suse.36.g9e41d7ec35.tar.xz new file mode 100644 index 00000000..5a752616 --- /dev/null +++ b/systemd-v243+suse.36.g9e41d7ec35.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:37e21cde36399fea6092d54907123ee25da6ef9f1c50746f720576f6ca1a03ba +size 5615256 diff --git a/systemd.changes b/systemd.changes index 86dc393e..49f95bcf 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Mon Sep 23 11:45:18 UTC 2019 - Franck Bui + +- Some files related to the portable stuff were missing some %exclude + +------------------------------------------------------------------- +Wed Sep 18 12:17:37 UTC 2019 - Franck Bui + +- Import commit 9e41d7ec3572d8d5ea1e00f683e9fbf8108e85b4 + + fb1b9d54f9 tty-ask-pwd-agent: fix message forwarded to wall(1) + dd14da3bb6 core: restore initialization of u->source_mtime + d62f30f647 resolved: create /etc/resolv.conf symlink at runtime + +------------------------------------------------------------------- +Wed Sep 18 11:33:16 UTC 2019 - Franck Bui + +- Slighly rework (mostly reorganization) the portable stuff + +------------------------------------------------------------------- +Fri Sep 6 06:20:11 UTC 2019 - Franck Bui + +- Track 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + in the git repo + + This patch has been in the quarantine area long enough, so let's + move it in the git repo. + +------------------------------------------------------------------- +Tue Sep 3 15:10:10 UTC 2019 - Franck Bui + +- Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be) + + See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for + details. + + Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped + from branch SUSE/v243 while we were rebasing. + + Drop 0001-rc-local-generator-deprecate-halt.local-support.patch as + this functionality had been deprecated during the previous release + and now have been dropped by upstream. + +------------------------------------------------------------------- +Wed Aug 14 14:25:43 UTC 2019 - Ludwig Nussel + +- enable systemd-portabled + +------------------------------------------------------------------- +Wed Jul 31 14:38:13 UTC 2019 - Franck Bui + +- systemd-container creates and owns /etc/systemd/nspawn now + ------------------------------------------------------------------- Mon Jul 22 15:29:51 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 352e67a4..ec3759c7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.135.g0f9271c133 +%define suse_version +suse.36.g9e41d7ec35 %bcond_with gnuefi %if 0%{?bootstrap} @@ -33,6 +33,7 @@ %bcond_with machined %bcond_with importd %bcond_with networkd +%bcond_with portabled %bcond_with resolved %bcond_with journal_remote %else @@ -41,6 +42,7 @@ %bcond_without machined %bcond_without importd %bcond_without networkd +%bcond_without portabled %bcond_without resolved %bcond_without journal_remote %ifarch %{ix86} x86_64 @@ -51,7 +53,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 242 +Version: 243 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -163,10 +165,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch -Patch3: 0001-Revert-insserv.conf-generator.patch -Patch4: 0001-rc-local-generator-deprecate-halt.local-support.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -330,6 +329,26 @@ Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, and systemd-importd. +%if %{with portabled} +%package portable +Summary: Systemd tools for portable services +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires + +%description portable +Systemd tools to manage portable services. The feature is still +considered experimental so the package might change or vanish. +Use at own risk. + +More information can be found online: + +http://0pointer.net/blog/walkthrough-for-portable-services.html +https://systemd.io/PORTABLE_SERVICES + +%endif + %if ! 0%{?bootstrap} %package logger Summary: Journal only logging @@ -447,18 +466,19 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Ddefault-kill-user-processes=false \ -Dntp-servers="${opensuse_ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ - -Dhalt-local=/etc/init.d/halt.local \ -Ddebug-shell=/bin/bash \ - -Dportabled=false \ -Dseccomp=auto \ -Dselinux=auto \ -Dapparmor=auto \ -Dsmack=false \ -Dima=false \ -Delfutils=auto \ + -Dpstore=false \ +%if ! 0%{?bootstrap} + -Dman=true \ + -Dhtml=true \ +%endif %if 0%{?bootstrap} - -Dman=false \ - -Dhtml=false \ -Dnss-myhostname=false \ %endif %if %{without coredump} @@ -473,6 +493,9 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) %if %{without journal_remote} -Dremote=false \ %endif +%if %{without portabled} + -Dportabled=false \ +%endif %if %{without machined} -Dmachined=false \ %endif @@ -526,6 +549,8 @@ install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif +mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn + # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... @@ -565,6 +590,7 @@ rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.pat # do not ship sysctl defaults in systemd package, will be part of # aaa_base (in procps for now) rm -f %{buildroot}%{_sysctldir}/50-default.conf +rm -f %{buildroot}%{_sysctldir}/50-pid-max.conf # Make sure systemd-network polkit rules file starts with a suitable # number prefix so it takes precedence over our polkit-default-privs. @@ -908,6 +934,21 @@ fi %service_del_postun systemd-journal-upload.service %endif +%if %{with portabled} +%pre portable +%service_add_pre systemd-portabled.service + +%post portable +%tmpfiles_create portables.conf +%service_add_post systemd-portabled.service + +%preun portable +%service_del_preun systemd-portabled.service + +%postun portable +%service_del_postun systemd-portabled.service +%endif + %clean %files -f systemd.lang @@ -998,6 +1039,13 @@ fi %exclude %{_unitdir}/systemd-importd.service %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif +%if %{with portabled} +%exclude %{_prefix}/lib/systemd/systemd-portabled +%exclude %{_prefix}/lib/systemd/portable +%exclude %{_unitdir}/systemd-portabled.service +%exclude %{_unitdir}/dbus-org.freedesktop.portable1.service +%exclude %{_tmpfilesdir}/portables.conf +%endif %{_unitdir}/*.automount %{_unitdir}/*.service @@ -1029,6 +1077,7 @@ fi %{_systemd_system_env_generator_dir} %{_systemd_user_env_generator_dir} %dir %{_ntpunitsdir} +%{_ntpunitsdir}/80-systemd-timesync.list %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ @@ -1097,7 +1146,6 @@ fi %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system.d -%dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf @@ -1135,8 +1183,6 @@ fi %exclude %{_datadir}/systemd/gatewayd %endif -%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service @@ -1157,6 +1203,7 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %if %{with networkd} +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %endif %if %{with resolved} @@ -1190,6 +1237,10 @@ fi %if %{with importd} %exclude %{_mandir}/man*/systemd-importd* %endif +%if %{with portabled} +%exclude %{_mandir}/man*/portablectl* +%exclude %{_mandir}/man*/systemd-portabled* +%endif %endif %{_docdir}/systemd @@ -1337,6 +1388,7 @@ fi %files container %defattr(-,root,root) +%dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service %if %{with networkd} @@ -1432,4 +1484,20 @@ fi %{_datadir}/systemd/gatewayd %endif +%if %{with portabled} +%files portable +%defattr(-,root,root) +%{_bindir}/portablectl +%{_prefix}/lib/systemd/systemd-portabled +%{_prefix}/lib/systemd/portable +%{_unitdir}/systemd-portabled.service +%{_unitdir}/dbus-org.freedesktop.portable1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service +%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy +%{_tmpfilesdir}/portables.conf +%{_mandir}/man*/portablectl* +%{_mandir}/man*/systemd-portabled* +%endif + %changelog From 28215e64b89de50783fd570dca41e72f36a8792192f23174230221114e0a72a2 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 23 Oct 2019 13:45:55 +0000 Subject: [PATCH 041/124] Accepting request 741487 from Base:System OBS-URL: https://build.opensuse.org/request/show/741487 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=299 --- ...escape-when-used-for-shell-expansion.patch | 46 ++++++ systemd-mini.changes | 83 ++++++++++ systemd-mini.spec | 156 +++++++++++------- systemd-v243+suse.36.g9e41d7ec35.tar.xz | 3 - systemd-v243+suse.91.g428b937f91.tar.xz | 3 + systemd.changes | 83 ++++++++++ systemd.spec | 156 +++++++++++------- 7 files changed, 403 insertions(+), 127 deletions(-) create mode 100644 0001-compat-rules-escape-when-used-for-shell-expansion.patch delete mode 100644 systemd-v243+suse.36.g9e41d7ec35.tar.xz create mode 100644 systemd-v243+suse.91.g428b937f91.tar.xz diff --git a/0001-compat-rules-escape-when-used-for-shell-expansion.patch b/0001-compat-rules-escape-when-used-for-shell-expansion.patch new file mode 100644 index 00000000..207188cb --- /dev/null +++ b/0001-compat-rules-escape-when-used-for-shell-expansion.patch @@ -0,0 +1,46 @@ +From b37054aa5aebfed9e7c8ee423067aefef0facd39 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Wed, 9 Oct 2019 16:11:17 +0200 +Subject: [PATCH] compat-rules: escape '$' when used for shell expansion + +Make sure to use '$$' in shell expansions since the behavior of udev +is undefined when it encounters unknown substitions. + +udev used to silently ignore them but since v243 (commit +d7aee41db35f808bca), it throws such warning: + + systemd-udevd[443]: /usr/lib/udev/rules.d/61-persistent-storage-compat.rules:83 Invalid value "/bin/sh -c 'eui="%s{eui}"; echo ${eui// /}" for PROGRAM (char 33: invalid substitution type), ignoring, but please fix it. + +No functional changes. +--- + rules/61-persistent-storage-compat.rules | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/rules/61-persistent-storage-compat.rules b/rules/61-persistent-storage-compat.rules +index 0cdc8c4195..bd229f619b 100644 +--- a/rules/61-persistent-storage-compat.rules ++++ b/rules/61-persistent-storage-compat.rules +@@ -80,17 +80,17 @@ ENV{COMPAT_SYMLINK_GENERATION}!="1", GOTO="generation_2" + # symlink is created. + + KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_EUI_COMPAT}!="?*", ATTRS{eui}=="?*", ATTRS{eui}!="0000000000000000", \ +- PROGRAM=="/bin/sh -c 'eui=\"%s{eui}\"; echo ${eui// /}", ENV{ID_NVME_EUI_COMPAT}="2%c" ++ PROGRAM=="/bin/sh -c 'eui=\"%s{eui}\"; echo $${eui// /}", ENV{ID_NVME_EUI_COMPAT}="2%c" + + KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_NGUID_COMPAT}!="?*", ATTRS{nguid}=="?*", \ +- PROGRAM=="/bin/sh -c 'nguid=\"%s{nguid}\"; echo ${nguid//-/}", ENV{ID_NVME_NGUID_COMPAT}="%c" ++ PROGRAM=="/bin/sh -c 'nguid=\"%s{nguid}\"; echo $${nguid//-/}", ENV{ID_NVME_NGUID_COMPAT}="%c" + + KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", ATTRS{model}=="?*", ATTRS{serial}=="?*", \ + PROGRAM=="/bin/sh -c ' \ + cd /sys/%p; \ + while ! [ -f model ]; do \ + cd ..; \ +- [ $(pwd) = %S ] && exit 1; \ ++ [ $$(pwd) = %S ] && exit 1; \ + done; \ + cut -c 1-16 model'", ENV{ID_NVME_SERIAL_COMPAT}="SNVMe_%c%s{serial}" + +-- +2.16.4 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 49f95bcf..8196fde7 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,8 +1,91 @@ +------------------------------------------------------------------- +Mon Oct 21 10:33:27 UTC 2019 - Franck Bui + +- Add 0001-compat-rules-escape-when-used-for-shell-expansion.patch (bsc#1153648) + + Added to the quaratine area to avoid uploading a new tar ball just + for that single change. It will be dropped during the next import. + +------------------------------------------------------------------- +Mon Oct 21 09:06:10 UTC 2019 - Ludwig Nussel + +- don't package locales in -mini package + +------------------------------------------------------------------- +Fri Oct 4 14:26:59 UTC 2019 - Franck Bui + +- Import commit 428b937f917ae177f2315e8469800941885e441a + + 0026b58744 pid1: fix DefaultTasksMax initialization + +------------------------------------------------------------------- +Mon Sep 30 10:43:28 UTC 2019 - Franck Bui + +- Import commit ed81f69153488279957268e247a5c81b678da491 (changes from v243-stable) + + fab6f010ac dhcp6: use unaligned_read_be32() + f2d9af4322 dhcp6: add missing option length check + ccf797511e ndisc: make first solicit delayed randomly + f2275b6e12 dhcp6: read OPTION_INFORMATION_REFRESH_TIME option + 6dfbe58ee7 l10n: update Czech Translation + d4cd0e9d32 sd-radv: if lifetime < SD_RADV_DEFAULT_MAX_TIMEOUT_USEC, adjust timeout (#13491) + dbefe59259 polkit: fix typo + a321507476 sd-netlink: fix invalid assertion + 45dca7fe86 network: do not enter failed state if device's sysfs entry does not exist yet + dd83d58796 network: add missing link->network checks + b294305888 path: stop watching path specs once we triggered the target unit + 2cd636c437 hwdb: add Medion Akoya E2292 (#13498) + d133bdd1fa po: update Brazilian Portuguese translation + 530e09b594 po: update Polish translation + 0c5c3e34c1 polkit: change "revert settings" to "reset settings" + 73e0f372d8 man: fix description of ARPIntervalSec= units + 5412cc54a1 hwdb: axis override for Dell 9360 touchpad + 9d4e658529 test: drop the missed || exit 1 expression + 7ed7ea82f6 udevadm: use usec_add() + 477bf86c91 udevadm: missing initialization of descriptor + 19ac31c989 networkd: unbreak routing_policy_rule_compare_func() + a20a2157a8 core: coldplug possible nop_job + eb55241742 tty-ask-pwd-agent: fix message forwarded to wall(1) + 1a3c53c06c core: Fix setting StatusUnitFormat from config files + 91db81e4dd network DHCP4: Dont mislead the logs. + 6af590838b Update m4 for selective utmp support. modified: tmpfiles.d/systemd.conf.m4 + 6823c907cf core: restore initialization of u->source_mtime + 29308bcc13 mount-setup: relabel items mentioned directly in relabel-extra.d + 8ca1e56165 Call getgroups() to know size of supplementary groups array to allocate + 5d84a7ad1c test: add test cases for empty string match + 1536348cc8 udev: fix multi match + 3ccafef0ad man: move TimeoutCleanSec= entry from .service to .exec + 8c0c30a820 zsh: udpate bootctl completions + 0556c247a2 resolved: fix abort when recv() returns 0 + 9a25d75520 man: remove repeated words + be3be29347 hwdb: Also mark lis3lv02d sensors in "HP" laptops as being in the base + 4b92ffccaa udev: also logs file permission + 75a2845e5a udev: add missing flag for OPTIONS=static_node + 19e9fc4262 network: do not abort execution when a config file cannot be loaded + 3e1267cf50 fileio: update warning message + 1b3156edd2 pstore: fix use after free + f500d2fa81 journal: Make the output of --update-catalog deterministic + 64d0f7042d travis: protect the systemd organization on Fuzzit from forks + 4247938ee1 hwdb: Mark lis3lv02d sensors in HP laptops as being in the base + 379158684a po: update Japanese translation + 31e1bbd1ca docs: fix push recipe in RELEASE.md + f06530d86b man/systemctl.xml: fix missing "not" + 22aba2b969 docs: fix typo in boot loader doc + 000e08ca70 pstore: fix typo in error message - directoy -> directory + f7f9c69ac5 Fix typo in comment: overide -> override + ca8ba8f8c0 po: update Polish translation + ------------------------------------------------------------------- Mon Sep 23 11:45:18 UTC 2019 - Franck Bui - Some files related to the portable stuff were missing some %exclude +------------------------------------------------------------------- +Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel + +- split off networkd and resolved into separate network subpackage +- use separate lang package for translations + ------------------------------------------------------------------- Wed Sep 18 12:17:37 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 87e7e4d3..45161ddd 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.36.g9e41d7ec35 +%define suse_version +suse.91.g428b937f91 %bcond_with gnuefi %if 0%{?bootstrap} @@ -167,6 +167,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. +Patch1: 0001-compat-rules-escape-when-used-for-shell-expansion.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description @@ -331,6 +332,22 @@ Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, and systemd-importd. +%if %{with networkd} || %{with resolved} +%package network +Summary: Systemd tools for networkd and resolved +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +Provides: systemd:/usr/lib/systemd/systemd-networkd +Provides: systemd:/usr/lib/systemd/systemd-resolved +%systemd_requires + +%description network +Systemd tools to manage network settings using networkd and +resolver tools for resolved + +%endif + %if %{with portabled} %package portable Summary: Systemd tools for portable services @@ -398,7 +415,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -447,6 +464,10 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%if ! 0%{?bootstrap} +%lang_package +%endif + %prep %setup -q -n systemd-v%{version}%{suse_version} %autopatch -p1 @@ -526,6 +547,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm -r %{buildroot}%{_datadir}/locale %endif # Don't ship resolvconf symlink for now as it conflicts with the @@ -719,7 +741,9 @@ fi # which may still be used by yast. cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +%if ! 0%{?bootstrap} %find_lang systemd +%endif # Build of installation images uses a hard coded list of packages with # a %pre that needs to be run during the build. systemd is one of them @@ -769,13 +793,6 @@ systemctl daemon-reexec || : %systemd_post machines.target %systemd_post remote-fs.target %systemd_post systemd-timesyncd.service -%if %{with networkd} -%systemd_post systemd-networkd.service -%systemd_post systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%systemd_post systemd-resolved.service -%endif # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have @@ -818,12 +835,6 @@ test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { # Avoid restarting logind until fixed upstream (issue #1163) %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service -%if %{with networkd} -%systemd_postun_with_restart systemd-networkd.service -%endif -%if %{with resolved} -%systemd_postun_with_restart systemd-resolved.service -%endif %pre -n udev%{?mini} # New installations uses the last compat symlink generation number @@ -936,6 +947,45 @@ fi %service_del_postun systemd-journal-upload.service %endif +%if %{with networkd} || %{with resolved} +%pre network +%if %{with networkd} +%service_add_pre systemd-networkd.service +%service_add_pre systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_pre systemd-resolved.service +%endif + +%post network +%tmpfiles_create portables.conf +%if %{with networkd} +%service_add_post systemd-networkd.service +%service_add_post systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_post systemd-resolved.service +%endif + +%preun network +%if %{with networkd} +%service_del_preun systemd-networkd.service +%service_del_preun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_preun systemd-resolved.service +%endif + +%postun network +%if %{with networkd} +%service_del_postun systemd-networkd.service +%service_del_postun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_postun systemd-resolved.service +%endif +%endif + %if %{with portabled} %pre portable %service_add_pre systemd-portabled.service @@ -953,7 +1003,7 @@ fi %clean -%files -f systemd.lang +%files %defattr(-,root,root) %license LICENSE* /bin/systemd @@ -964,12 +1014,6 @@ fi %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl -%if %{with networkd} -%{_bindir}/networkctl -%endif -%if %{with resolved} -%{_bindir}/resolvectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-delta @@ -989,9 +1033,6 @@ fi %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%if %{with resolved} -%{_bindir}/systemd-resolve -%endif %{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt @@ -1064,9 +1105,6 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} -%{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/scripts %exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} @@ -1116,11 +1154,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%if %{with networkd} -%dir %{_sysconfdir}/systemd/network -%{_prefix}/lib/systemd/network/80-container-host0.network -%endif - %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1139,12 +1172,6 @@ fi %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf -%if %{with networkd} -%config(noreplace) %{_sysconfdir}/systemd/networkd.conf -%endif -%if %{with resolved} -%config(noreplace) %{_sysconfdir}/systemd/resolved.conf -%endif %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system.d @@ -1156,12 +1183,6 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf -%if %{with networkd} -%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf -%endif # FIXME: why do we have to own this dir ? %dir %{_prefix}/lib/modprobe.d @@ -1190,12 +1211,6 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service -%if %{with networkd} -%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1204,13 +1219,6 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with networkd} -%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy -%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%endif -%if %{with resolved} -%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy -%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* @@ -1393,10 +1401,6 @@ fi %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service -%if %{with networkd} -%{_prefix}/lib/systemd/network/80-container-ve.network -%{_prefix}/lib/systemd/network/80-container-vz.network -%endif %if %{with machined} %{_bindir}/machinectl %{_prefix}/lib/systemd/systemd-machined @@ -1434,6 +1438,8 @@ fi %endif %if ! 0%{?bootstrap} +%files lang -f systemd.lang + %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ @@ -1486,6 +1492,32 @@ fi %{_datadir}/systemd/gatewayd %endif +%if %{with networkd} || %{with resolved} +%files network +%defattr(-,root,root) +%if %{with networkd} +%dir %{_sysconfdir}/systemd/network +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%{_bindir}/networkctl +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%{_prefix}/lib/systemd/network/80-container-host0.network +%{_prefix}/lib/systemd/network/80-container-ve.network +%{_prefix}/lib/systemd/network/80-container-vz.network +%endif +%if %{with resolved} +%{_bindir}/resolvectl +%{_bindir}/systemd-resolve +%config(noreplace) %{_sysconfdir}/systemd/resolved.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%{_prefix}/lib/systemd/resolv.conf +%endif +%endif + %if %{with portabled} %files portable %defattr(-,root,root) diff --git a/systemd-v243+suse.36.g9e41d7ec35.tar.xz b/systemd-v243+suse.36.g9e41d7ec35.tar.xz deleted file mode 100644 index 5a752616..00000000 --- a/systemd-v243+suse.36.g9e41d7ec35.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:37e21cde36399fea6092d54907123ee25da6ef9f1c50746f720576f6ca1a03ba -size 5615256 diff --git a/systemd-v243+suse.91.g428b937f91.tar.xz b/systemd-v243+suse.91.g428b937f91.tar.xz new file mode 100644 index 00000000..38f5db51 --- /dev/null +++ b/systemd-v243+suse.91.g428b937f91.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3bf4fd83f69bfb10a6e461edaeb32b3d259420b641c1d5526165596f7467d35a +size 5617708 diff --git a/systemd.changes b/systemd.changes index 49f95bcf..8196fde7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,8 +1,91 @@ +------------------------------------------------------------------- +Mon Oct 21 10:33:27 UTC 2019 - Franck Bui + +- Add 0001-compat-rules-escape-when-used-for-shell-expansion.patch (bsc#1153648) + + Added to the quaratine area to avoid uploading a new tar ball just + for that single change. It will be dropped during the next import. + +------------------------------------------------------------------- +Mon Oct 21 09:06:10 UTC 2019 - Ludwig Nussel + +- don't package locales in -mini package + +------------------------------------------------------------------- +Fri Oct 4 14:26:59 UTC 2019 - Franck Bui + +- Import commit 428b937f917ae177f2315e8469800941885e441a + + 0026b58744 pid1: fix DefaultTasksMax initialization + +------------------------------------------------------------------- +Mon Sep 30 10:43:28 UTC 2019 - Franck Bui + +- Import commit ed81f69153488279957268e247a5c81b678da491 (changes from v243-stable) + + fab6f010ac dhcp6: use unaligned_read_be32() + f2d9af4322 dhcp6: add missing option length check + ccf797511e ndisc: make first solicit delayed randomly + f2275b6e12 dhcp6: read OPTION_INFORMATION_REFRESH_TIME option + 6dfbe58ee7 l10n: update Czech Translation + d4cd0e9d32 sd-radv: if lifetime < SD_RADV_DEFAULT_MAX_TIMEOUT_USEC, adjust timeout (#13491) + dbefe59259 polkit: fix typo + a321507476 sd-netlink: fix invalid assertion + 45dca7fe86 network: do not enter failed state if device's sysfs entry does not exist yet + dd83d58796 network: add missing link->network checks + b294305888 path: stop watching path specs once we triggered the target unit + 2cd636c437 hwdb: add Medion Akoya E2292 (#13498) + d133bdd1fa po: update Brazilian Portuguese translation + 530e09b594 po: update Polish translation + 0c5c3e34c1 polkit: change "revert settings" to "reset settings" + 73e0f372d8 man: fix description of ARPIntervalSec= units + 5412cc54a1 hwdb: axis override for Dell 9360 touchpad + 9d4e658529 test: drop the missed || exit 1 expression + 7ed7ea82f6 udevadm: use usec_add() + 477bf86c91 udevadm: missing initialization of descriptor + 19ac31c989 networkd: unbreak routing_policy_rule_compare_func() + a20a2157a8 core: coldplug possible nop_job + eb55241742 tty-ask-pwd-agent: fix message forwarded to wall(1) + 1a3c53c06c core: Fix setting StatusUnitFormat from config files + 91db81e4dd network DHCP4: Dont mislead the logs. + 6af590838b Update m4 for selective utmp support. modified: tmpfiles.d/systemd.conf.m4 + 6823c907cf core: restore initialization of u->source_mtime + 29308bcc13 mount-setup: relabel items mentioned directly in relabel-extra.d + 8ca1e56165 Call getgroups() to know size of supplementary groups array to allocate + 5d84a7ad1c test: add test cases for empty string match + 1536348cc8 udev: fix multi match + 3ccafef0ad man: move TimeoutCleanSec= entry from .service to .exec + 8c0c30a820 zsh: udpate bootctl completions + 0556c247a2 resolved: fix abort when recv() returns 0 + 9a25d75520 man: remove repeated words + be3be29347 hwdb: Also mark lis3lv02d sensors in "HP" laptops as being in the base + 4b92ffccaa udev: also logs file permission + 75a2845e5a udev: add missing flag for OPTIONS=static_node + 19e9fc4262 network: do not abort execution when a config file cannot be loaded + 3e1267cf50 fileio: update warning message + 1b3156edd2 pstore: fix use after free + f500d2fa81 journal: Make the output of --update-catalog deterministic + 64d0f7042d travis: protect the systemd organization on Fuzzit from forks + 4247938ee1 hwdb: Mark lis3lv02d sensors in HP laptops as being in the base + 379158684a po: update Japanese translation + 31e1bbd1ca docs: fix push recipe in RELEASE.md + f06530d86b man/systemctl.xml: fix missing "not" + 22aba2b969 docs: fix typo in boot loader doc + 000e08ca70 pstore: fix typo in error message - directoy -> directory + f7f9c69ac5 Fix typo in comment: overide -> override + ca8ba8f8c0 po: update Polish translation + ------------------------------------------------------------------- Mon Sep 23 11:45:18 UTC 2019 - Franck Bui - Some files related to the portable stuff were missing some %exclude +------------------------------------------------------------------- +Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel + +- split off networkd and resolved into separate network subpackage +- use separate lang package for translations + ------------------------------------------------------------------- Wed Sep 18 12:17:37 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ec3759c7..2a119e33 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.36.g9e41d7ec35 +%define suse_version +suse.91.g428b937f91 %bcond_with gnuefi %if 0%{?bootstrap} @@ -165,6 +165,7 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. +Patch1: 0001-compat-rules-escape-when-used-for-shell-expansion.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description @@ -329,6 +330,22 @@ Systemd tools to spawn and manage containers and virtual machines. This package contains systemd-nspawn, machinectl, systemd-machined, and systemd-importd. +%if %{with networkd} || %{with resolved} +%package network +Summary: Systemd tools for networkd and resolved +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +Provides: systemd:/usr/lib/systemd/systemd-networkd +Provides: systemd:/usr/lib/systemd/systemd-resolved +%systemd_requires + +%description network +Systemd tools to manage network settings using networkd and +resolver tools for resolved + +%endif + %if %{with portabled} %package portable Summary: Systemd tools for portable services @@ -396,7 +413,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -445,6 +462,10 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%if ! 0%{?bootstrap} +%lang_package +%endif + %prep %setup -q -n systemd-v%{version}%{suse_version} %autopatch -p1 @@ -524,6 +545,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} %else rm %{buildroot}%{_libdir}/libnss_systemd.so* +rm -r %{buildroot}%{_datadir}/locale %endif # Don't ship resolvconf symlink for now as it conflicts with the @@ -717,7 +739,9 @@ fi # which may still be used by yast. cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +%if ! 0%{?bootstrap} %find_lang systemd +%endif # Build of installation images uses a hard coded list of packages with # a %pre that needs to be run during the build. systemd is one of them @@ -767,13 +791,6 @@ systemctl daemon-reexec || : %systemd_post machines.target %systemd_post remote-fs.target %systemd_post systemd-timesyncd.service -%if %{with networkd} -%systemd_post systemd-networkd.service -%systemd_post systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%systemd_post systemd-resolved.service -%endif # v228 wrongly set world writable suid root permissions on timestamp # files used by permanent timers. Fix the timestamps that might have @@ -816,12 +833,6 @@ test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { # Avoid restarting logind until fixed upstream (issue #1163) %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service -%if %{with networkd} -%systemd_postun_with_restart systemd-networkd.service -%endif -%if %{with resolved} -%systemd_postun_with_restart systemd-resolved.service -%endif %pre -n udev%{?mini} # New installations uses the last compat symlink generation number @@ -934,6 +945,45 @@ fi %service_del_postun systemd-journal-upload.service %endif +%if %{with networkd} || %{with resolved} +%pre network +%if %{with networkd} +%service_add_pre systemd-networkd.service +%service_add_pre systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_pre systemd-resolved.service +%endif + +%post network +%tmpfiles_create portables.conf +%if %{with networkd} +%service_add_post systemd-networkd.service +%service_add_post systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_add_post systemd-resolved.service +%endif + +%preun network +%if %{with networkd} +%service_del_preun systemd-networkd.service +%service_del_preun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_preun systemd-resolved.service +%endif + +%postun network +%if %{with networkd} +%service_del_postun systemd-networkd.service +%service_del_postun systemd-networkd-wait-online.service +%endif +%if %{with resolved} +%service_del_postun systemd-resolved.service +%endif +%endif + %if %{with portabled} %pre portable %service_add_pre systemd-portabled.service @@ -951,7 +1001,7 @@ fi %clean -%files -f systemd.lang +%files %defattr(-,root,root) %license LICENSE* /bin/systemd @@ -962,12 +1012,6 @@ fi %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl -%if %{with networkd} -%{_bindir}/networkctl -%endif -%if %{with resolved} -%{_bindir}/resolvectl -%endif %{_bindir}/systemctl %{_bindir}/systemd-analyze %{_bindir}/systemd-delta @@ -987,9 +1031,6 @@ fi %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-tmpfiles %{_bindir}/systemd-machine-id-setup -%if %{with resolved} -%{_bindir}/systemd-resolve -%endif %{_bindir}/systemd-socket-activate %{_bindir}/systemd-stdio-bridge %{_bindir}/systemd-detect-virt @@ -1062,9 +1103,6 @@ fi %{_prefix}/lib/systemd/systemd-* %{_prefix}/lib/systemd/systemd %{_prefix}/lib/systemd/libsystemd-shared-*.so -%if %{with resolved} -%{_prefix}/lib/systemd/resolv.conf -%endif %{_prefix}/lib/systemd/scripts %exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh %dir %{_journalcatalogdir} @@ -1114,11 +1152,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%if %{with networkd} -%dir %{_sysconfdir}/systemd/network -%{_prefix}/lib/systemd/network/80-container-host0.network -%endif - %dir %{_sysconfdir}/X11/xinit %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1137,12 +1170,6 @@ fi %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf -%if %{with networkd} -%config(noreplace) %{_sysconfdir}/systemd/networkd.conf -%endif -%if %{with resolved} -%config(noreplace) %{_sysconfdir}/systemd/resolved.conf -%endif %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/system.d @@ -1154,12 +1181,6 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf -%if %{with networkd} -%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf -%endif # FIXME: why do we have to own this dir ? %dir %{_prefix}/lib/modprobe.d @@ -1188,12 +1209,6 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service %{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service -%if %{with networkd} -%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service -%endif -%if %{with resolved} -%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service -%endif %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions @@ -1202,13 +1217,6 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy -%if %{with networkd} -%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy -%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%endif -%if %{with resolved} -%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy -%endif %if ! 0%{?bootstrap} %{_mandir}/man1/[a-rt-z]*ctl.1* @@ -1391,10 +1399,6 @@ fi %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn %{_unitdir}/systemd-nspawn@.service -%if %{with networkd} -%{_prefix}/lib/systemd/network/80-container-ve.network -%{_prefix}/lib/systemd/network/80-container-vz.network -%endif %if %{with machined} %{_bindir}/machinectl %{_prefix}/lib/systemd/systemd-machined @@ -1432,6 +1436,8 @@ fi %endif %if ! 0%{?bootstrap} +%files lang -f systemd.lang + %files logger %defattr(-,root,root) %dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ @@ -1484,6 +1490,32 @@ fi %{_datadir}/systemd/gatewayd %endif +%if %{with networkd} || %{with resolved} +%files network +%defattr(-,root,root) +%if %{with networkd} +%dir %{_sysconfdir}/systemd/network +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%{_bindir}/networkctl +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%{_prefix}/lib/systemd/network/80-container-host0.network +%{_prefix}/lib/systemd/network/80-container-ve.network +%{_prefix}/lib/systemd/network/80-container-vz.network +%endif +%if %{with resolved} +%{_bindir}/resolvectl +%{_bindir}/systemd-resolve +%config(noreplace) %{_sysconfdir}/systemd/resolved.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%{_prefix}/lib/systemd/resolv.conf +%endif +%endif + %if %{with portabled} %files portable %defattr(-,root,root) From 7bd4c08065cd3bb4742384c4d5d9e0e97ff547d9ab11a5d28653111f15518e2d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 3 Nov 2019 10:58:18 +0000 Subject: [PATCH 042/124] Accepting request 744384 from Base:System OBS-URL: https://build.opensuse.org/request/show/744384 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=300 --- ...escape-when-used-for-shell-expansion.patch | 46 --------------- systemd-mini.changes | 59 +++++++++++++++++++ systemd-mini.spec | 6 +- systemd-v243+suse.126.gb7467b7b55.tar.xz | 3 + systemd-v243+suse.91.g428b937f91.tar.xz | 3 - systemd.changes | 59 +++++++++++++++++++ systemd.spec | 6 +- 7 files changed, 125 insertions(+), 57 deletions(-) delete mode 100644 0001-compat-rules-escape-when-used-for-shell-expansion.patch create mode 100644 systemd-v243+suse.126.gb7467b7b55.tar.xz delete mode 100644 systemd-v243+suse.91.g428b937f91.tar.xz diff --git a/0001-compat-rules-escape-when-used-for-shell-expansion.patch b/0001-compat-rules-escape-when-used-for-shell-expansion.patch deleted file mode 100644 index 207188cb..00000000 --- a/0001-compat-rules-escape-when-used-for-shell-expansion.patch +++ /dev/null @@ -1,46 +0,0 @@ -From b37054aa5aebfed9e7c8ee423067aefef0facd39 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Wed, 9 Oct 2019 16:11:17 +0200 -Subject: [PATCH] compat-rules: escape '$' when used for shell expansion - -Make sure to use '$$' in shell expansions since the behavior of udev -is undefined when it encounters unknown substitions. - -udev used to silently ignore them but since v243 (commit -d7aee41db35f808bca), it throws such warning: - - systemd-udevd[443]: /usr/lib/udev/rules.d/61-persistent-storage-compat.rules:83 Invalid value "/bin/sh -c 'eui="%s{eui}"; echo ${eui// /}" for PROGRAM (char 33: invalid substitution type), ignoring, but please fix it. - -No functional changes. ---- - rules/61-persistent-storage-compat.rules | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/rules/61-persistent-storage-compat.rules b/rules/61-persistent-storage-compat.rules -index 0cdc8c4195..bd229f619b 100644 ---- a/rules/61-persistent-storage-compat.rules -+++ b/rules/61-persistent-storage-compat.rules -@@ -80,17 +80,17 @@ ENV{COMPAT_SYMLINK_GENERATION}!="1", GOTO="generation_2" - # symlink is created. - - KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_EUI_COMPAT}!="?*", ATTRS{eui}=="?*", ATTRS{eui}!="0000000000000000", \ -- PROGRAM=="/bin/sh -c 'eui=\"%s{eui}\"; echo ${eui// /}", ENV{ID_NVME_EUI_COMPAT}="2%c" -+ PROGRAM=="/bin/sh -c 'eui=\"%s{eui}\"; echo $${eui// /}", ENV{ID_NVME_EUI_COMPAT}="2%c" - - KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_NGUID_COMPAT}!="?*", ATTRS{nguid}=="?*", \ -- PROGRAM=="/bin/sh -c 'nguid=\"%s{nguid}\"; echo ${nguid//-/}", ENV{ID_NVME_NGUID_COMPAT}="%c" -+ PROGRAM=="/bin/sh -c 'nguid=\"%s{nguid}\"; echo $${nguid//-/}", ENV{ID_NVME_NGUID_COMPAT}="%c" - - KERNEL=="nvme*", ENV{DEVTYPE}=="disk", ENV{ID_NVME_SERIAL_COMPAT}!="?*", ATTRS{model}=="?*", ATTRS{serial}=="?*", \ - PROGRAM=="/bin/sh -c ' \ - cd /sys/%p; \ - while ! [ -f model ]; do \ - cd ..; \ -- [ $(pwd) = %S ] && exit 1; \ -+ [ $$(pwd) = %S ] && exit 1; \ - done; \ - cut -c 1-16 model'", ENV{ID_NVME_SERIAL_COMPAT}="SNVMe_%c%s{serial}" - --- -2.16.4 - diff --git a/systemd-mini.changes b/systemd-mini.changes index 8196fde7..f493f24f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Thu Oct 31 07:38:55 UTC 2019 - Franck Bui + +- Drop 0001-compat-rules-escape-when-used-for-shell-expansion.patch + + It's part of the previous import. + +------------------------------------------------------------------- +Thu Oct 31 07:32:47 UTC 2019 - Franck Bui + +- Import commit b7467b7b553d6d0d6f92758d966b69f1a88b6b42 + + 441f44f371 fileio: introduce read_full_virtual_file() for reading virtual files in sysfs, procfs (bsc#1133495) + 8a1bb5c66b swap: do not make swap units wanted by its device unit anymore + +------------------------------------------------------------------- +Tue Oct 29 10:35:03 UTC 2019 - Franck Bui + +- Import commit 5df9000899ef7d45ddbcacd0fdf73afa07a40f6b + + f0ed7237e4 udev/cdrom_id: Do not open CD-rom in exclusive mode. (bsc#1154256) + b37054aa5a compat-rules: escape '$' when used for shell expansion + + Changes from the v243-stable: + + ef677436aa test: Pass personality test even when i686 userland runs on x86_64 kernel + 3f6398c450 docs: fix inadvertent change in uid range + 25bb377a73 cgroup: fix typo in BPF firewall support warning message + 6d97aca0d5 fix build with compilers with default stack-protector enabled + fbad077cec nspawn: surrender controlling terminal to PID2 when using the PID1 stub + 0553c3c668 pid1: fix DefaultTasksMax initialization + f406a691a7 src/core/automount: use DirectoryMode when calling mkdir -p + 20438f96c3 udevadm trigger: do not propagate EACCES and ENODEV + 6480630bc3 hwdb: Correct WWWW Pattern In Documentation Comment + 9d8e889810 nspawn: consistenly fail if parsing the environment fails + 40e169b304 nspawn: default to unified hierarchy if --as-pid2 is used + b5df1037a0 cgroup: Mark memory protections as explicitly set in transient units + f14e3e02cc cgroup: Respect DefaultMemoryMin when setting memory.min + ea248e53bf cgroup: Check ancestor memory min for unified memory config + de1d25a506 cgroup: docs: memory.high doc fixups + 2ab45f38d8 cgroup: docs: Mention unbounded protection for memory.{low,min} + 19a43dc38a Consider smb3 as remote filesystem + 5c0224c7bf Handle d_type == DT_UNKNOWN correctly + 8282bc61df util-lib: Don't propagate EACCES from find_binary PATH lookup to caller + 9d0ae987a6 network: drop noisy log message + f67f0e4ec4 Updated log message when the timesync happens for the first time (#13624) + e151bf4674 units: make systemd-binfmt.service easier to work with no autofs + 2b8e574d82 Corect man page reference in systemd-nologin.conf comments + a0577353f1 man: Add a missing space in machinectl(1) + 693e983988 log: Add missing "%" in "%m" log format strings + ea7151b8c4 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist + b90549290e man: fix typo + +------------------------------------------------------------------- +Tue Oct 22 22:25:34 UTC 2019 - Stefan Brüns + +- Remove intltool BuildRequires, not needed since v237 +- Use python3-base BuildRequires instead of full python3 + ------------------------------------------------------------------- Mon Oct 21 10:33:27 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 45161ddd..d49a96ac 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.91.g428b937f91 +%define suse_version +suse.126.gb7467b7b55 %bcond_with gnuefi %if 0%{?bootstrap} @@ -69,7 +69,7 @@ BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools BuildRequires: polkit # python is only required for generating systemd.directives.xml -BuildRequires: python3 +BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) @@ -84,7 +84,6 @@ BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif BuildRequires: fdupes BuildRequires: gperf -BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 @@ -167,7 +166,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-compat-rules-escape-when-used-for-shell-expansion.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description diff --git a/systemd-v243+suse.126.gb7467b7b55.tar.xz b/systemd-v243+suse.126.gb7467b7b55.tar.xz new file mode 100644 index 00000000..b7f0a72a --- /dev/null +++ b/systemd-v243+suse.126.gb7467b7b55.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:90e94b87ba38b29d80fa47c14858e6047f32d197847fbac705caabe38a56467d +size 5617640 diff --git a/systemd-v243+suse.91.g428b937f91.tar.xz b/systemd-v243+suse.91.g428b937f91.tar.xz deleted file mode 100644 index 38f5db51..00000000 --- a/systemd-v243+suse.91.g428b937f91.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3bf4fd83f69bfb10a6e461edaeb32b3d259420b641c1d5526165596f7467d35a -size 5617708 diff --git a/systemd.changes b/systemd.changes index 8196fde7..f493f24f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,62 @@ +------------------------------------------------------------------- +Thu Oct 31 07:38:55 UTC 2019 - Franck Bui + +- Drop 0001-compat-rules-escape-when-used-for-shell-expansion.patch + + It's part of the previous import. + +------------------------------------------------------------------- +Thu Oct 31 07:32:47 UTC 2019 - Franck Bui + +- Import commit b7467b7b553d6d0d6f92758d966b69f1a88b6b42 + + 441f44f371 fileio: introduce read_full_virtual_file() for reading virtual files in sysfs, procfs (bsc#1133495) + 8a1bb5c66b swap: do not make swap units wanted by its device unit anymore + +------------------------------------------------------------------- +Tue Oct 29 10:35:03 UTC 2019 - Franck Bui + +- Import commit 5df9000899ef7d45ddbcacd0fdf73afa07a40f6b + + f0ed7237e4 udev/cdrom_id: Do not open CD-rom in exclusive mode. (bsc#1154256) + b37054aa5a compat-rules: escape '$' when used for shell expansion + + Changes from the v243-stable: + + ef677436aa test: Pass personality test even when i686 userland runs on x86_64 kernel + 3f6398c450 docs: fix inadvertent change in uid range + 25bb377a73 cgroup: fix typo in BPF firewall support warning message + 6d97aca0d5 fix build with compilers with default stack-protector enabled + fbad077cec nspawn: surrender controlling terminal to PID2 when using the PID1 stub + 0553c3c668 pid1: fix DefaultTasksMax initialization + f406a691a7 src/core/automount: use DirectoryMode when calling mkdir -p + 20438f96c3 udevadm trigger: do not propagate EACCES and ENODEV + 6480630bc3 hwdb: Correct WWWW Pattern In Documentation Comment + 9d8e889810 nspawn: consistenly fail if parsing the environment fails + 40e169b304 nspawn: default to unified hierarchy if --as-pid2 is used + b5df1037a0 cgroup: Mark memory protections as explicitly set in transient units + f14e3e02cc cgroup: Respect DefaultMemoryMin when setting memory.min + ea248e53bf cgroup: Check ancestor memory min for unified memory config + de1d25a506 cgroup: docs: memory.high doc fixups + 2ab45f38d8 cgroup: docs: Mention unbounded protection for memory.{low,min} + 19a43dc38a Consider smb3 as remote filesystem + 5c0224c7bf Handle d_type == DT_UNKNOWN correctly + 8282bc61df util-lib: Don't propagate EACCES from find_binary PATH lookup to caller + 9d0ae987a6 network: drop noisy log message + f67f0e4ec4 Updated log message when the timesync happens for the first time (#13624) + e151bf4674 units: make systemd-binfmt.service easier to work with no autofs + 2b8e574d82 Corect man page reference in systemd-nologin.conf comments + a0577353f1 man: Add a missing space in machinectl(1) + 693e983988 log: Add missing "%" in "%m" log format strings + ea7151b8c4 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist + b90549290e man: fix typo + +------------------------------------------------------------------- +Tue Oct 22 22:25:34 UTC 2019 - Stefan Brüns + +- Remove intltool BuildRequires, not needed since v237 +- Use python3-base BuildRequires instead of full python3 + ------------------------------------------------------------------- Mon Oct 21 10:33:27 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 2a119e33..389ff129 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.91.g428b937f91 +%define suse_version +suse.126.gb7467b7b55 %bcond_with gnuefi %if 0%{?bootstrap} @@ -67,7 +67,7 @@ BuildRequires: libgcrypt-devel BuildRequires: libxslt-tools BuildRequires: polkit # python is only required for generating systemd.directives.xml -BuildRequires: python3 +BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) @@ -82,7 +82,6 @@ BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif BuildRequires: fdupes BuildRequires: gperf -BuildRequires: intltool BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 @@ -165,7 +164,6 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-compat-rules-escape-when-used-for-shell-expansion.patch Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch %description From dc12e8b6a3f6d85e3af83f8bc96fafbec4b0edc3367d60a5529fdc21045dfe62 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 18 Nov 2019 18:57:26 +0000 Subject: [PATCH 043/124] Accepting request 748032 from Base:System OBS-URL: https://build.opensuse.org/request/show/748032 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=301 --- kbd-model-map.legacy | 1 + systemd-mini.changes | 25 ++++++++++++++++++++++++ systemd-mini.spec | 6 +++--- systemd-v243+suse.126.gb7467b7b55.tar.xz | 3 --- systemd-v243+suse.135.g0b715187a8.tar.xz | 3 +++ systemd.changes | 25 ++++++++++++++++++++++++ systemd.spec | 6 +++--- 7 files changed, 60 insertions(+), 9 deletions(-) delete mode 100644 systemd-v243+suse.126.gb7467b7b55.tar.xz create mode 100644 systemd-v243+suse.135.g0b715187a8.tar.xz diff --git a/kbd-model-map.legacy b/kbd-model-map.legacy index 6c497f42..5ddbd8d6 100644 --- a/kbd-model-map.legacy +++ b/kbd-model-map.legacy @@ -4,6 +4,7 @@ arabic ara,us pc105 - terminate:ctrl_al cn-latin1 ca pc105 multix terminate:ctrl_alt_bksp cz-lat2-us cz,us pc105 qwerty,basic terminate:ctrl_alt_bksp,grp:shift_toggle es-cp850 es pc105 - terminate:ctrl_alt_bksp +ir ir pc105 - terminate:ctrl_alt_bksp korean kr pc105 - terminate:ctrl_alt_bksp lt.std lt pc105 std terminate:ctrl_alt_bksp no-latin1 no pc105 - terminate:ctrl_alt_bksp diff --git a/systemd-mini.changes b/systemd-mini.changes index f493f24f..4ac78fd8 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Nov 12 14:15:03 UTC 2019 - Franck Bui + +- Import commit 0b715187a87907e18edf98eab9d0a50fced4a424 + + 9dbdbc2f10 logind: fix (again) the race that might happen when logind restores VT (bsc#1101591 bsc#1140081) + c848bec110 libblkid: open device in nonblock mode. (bsc#1084671) + b70ad6c927 resolved: check for IP in certificate when using DoT with GnuTLS (bsc#1155539 CVE-2018-21029) + bbedf3d557 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS + eb732c2e29 resolved: fix connection failures with TLS 1.3 and GnuTLS + 4e45084ac5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() + 2e297f0d87 shared/install: fix error codes returned by install_context_apply() + dd29d70d32 man: alias names can't be used with enable command + +------------------------------------------------------------------- +Tue Nov 5 10:56:54 UTC 2019 - Franck Bui + +- Fix %{_libexecdir} misuses of /usr/lib + ------------------------------------------------------------------- Thu Oct 31 07:38:55 UTC 2019 - Franck Bui @@ -139,6 +158,12 @@ Mon Sep 23 11:45:18 UTC 2019 - Franck Bui - Some files related to the portable stuff were missing some %exclude +------------------------------------------------------------------- +Thu Sep 19 08:49:59 UTC 2019 - Martin Vidner + +- Allow YaST to select Iranian (Persian, Farsi) keyboard layout + (bsc#1092920) + ------------------------------------------------------------------- Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel diff --git a/systemd-mini.spec b/systemd-mini.spec index d49a96ac..c15d809a 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.126.gb7467b7b55 +%define suse_version +suse.135.g0b715187a8 %bcond_with gnuefi %if 0%{?bootstrap} @@ -1132,7 +1132,7 @@ fi %endif %dir %{_sysconfdir}/modules-load.d -%{_libexecdir}/modules-load.d +%{_prefix}/lib/modules-load.d %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d @@ -1143,7 +1143,7 @@ fi %exclude %{_sysusersdir}/systemd-remote.conf %endif -%{_libexecdir}/environment.d/ +%{_prefix}/lib/environment.d/ %dir %{_binfmtdir} %dir %{_sysconfdir}/binfmt.d diff --git a/systemd-v243+suse.126.gb7467b7b55.tar.xz b/systemd-v243+suse.126.gb7467b7b55.tar.xz deleted file mode 100644 index b7f0a72a..00000000 --- a/systemd-v243+suse.126.gb7467b7b55.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:90e94b87ba38b29d80fa47c14858e6047f32d197847fbac705caabe38a56467d -size 5617640 diff --git a/systemd-v243+suse.135.g0b715187a8.tar.xz b/systemd-v243+suse.135.g0b715187a8.tar.xz new file mode 100644 index 00000000..8e1237a8 --- /dev/null +++ b/systemd-v243+suse.135.g0b715187a8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2ee8ed4694914a70e8831b9f5b88f23167e2fc87ca8893d991495de13f19ba74 +size 5618704 diff --git a/systemd.changes b/systemd.changes index f493f24f..4ac78fd8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Nov 12 14:15:03 UTC 2019 - Franck Bui + +- Import commit 0b715187a87907e18edf98eab9d0a50fced4a424 + + 9dbdbc2f10 logind: fix (again) the race that might happen when logind restores VT (bsc#1101591 bsc#1140081) + c848bec110 libblkid: open device in nonblock mode. (bsc#1084671) + b70ad6c927 resolved: check for IP in certificate when using DoT with GnuTLS (bsc#1155539 CVE-2018-21029) + bbedf3d557 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS + eb732c2e29 resolved: fix connection failures with TLS 1.3 and GnuTLS + 4e45084ac5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() + 2e297f0d87 shared/install: fix error codes returned by install_context_apply() + dd29d70d32 man: alias names can't be used with enable command + +------------------------------------------------------------------- +Tue Nov 5 10:56:54 UTC 2019 - Franck Bui + +- Fix %{_libexecdir} misuses of /usr/lib + ------------------------------------------------------------------- Thu Oct 31 07:38:55 UTC 2019 - Franck Bui @@ -139,6 +158,12 @@ Mon Sep 23 11:45:18 UTC 2019 - Franck Bui - Some files related to the portable stuff were missing some %exclude +------------------------------------------------------------------- +Thu Sep 19 08:49:59 UTC 2019 - Martin Vidner + +- Allow YaST to select Iranian (Persian, Farsi) keyboard layout + (bsc#1092920) + ------------------------------------------------------------------- Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel diff --git a/systemd.spec b/systemd.spec index 389ff129..4fbd18a0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.126.gb7467b7b55 +%define suse_version +suse.135.g0b715187a8 %bcond_with gnuefi %if 0%{?bootstrap} @@ -1130,7 +1130,7 @@ fi %endif %dir %{_sysconfdir}/modules-load.d -%{_libexecdir}/modules-load.d +%{_prefix}/lib/modules-load.d %{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d @@ -1141,7 +1141,7 @@ fi %exclude %{_sysusersdir}/systemd-remote.conf %endif -%{_libexecdir}/environment.d/ +%{_prefix}/lib/environment.d/ %dir %{_binfmtdir} %dir %{_sysconfdir}/binfmt.d From b2ca62110ea0c7ad73b0159967a857bd823a3d8b1fdd1d60f092ed0d17bb1af1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 11 Dec 2019 10:58:35 +0000 Subject: [PATCH 044/124] Accepting request 753895 from Base:System OBS-URL: https://build.opensuse.org/request/show/753895 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=302 --- systemd-mini.changes | 22 ++++++++++++++++++++++ systemd-mini.spec | 2 +- systemd-v243+suse.135.g0b715187a8.tar.xz | 3 --- systemd-v243+suse.225.gdbb1d4734d.tar.xz | 3 +++ systemd.changes | 22 ++++++++++++++++++++++ systemd.spec | 2 +- 6 files changed, 49 insertions(+), 5 deletions(-) delete mode 100644 systemd-v243+suse.135.g0b715187a8.tar.xz create mode 100644 systemd-v243+suse.225.gdbb1d4734d.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 4ac78fd8..7bf8c925 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Dec 3 16:56:31 UTC 2019 - Franck Bui + +- Import commit dbb1d4734daffa62e0eddecfa4f784c84a9d8e76 + + 1439d72a72 udevd: don't use monitor after manager_exit() + 99288dd778 Revert "udevd: fix crash when workers time out after exit is signal caught" + 152577d6d0 udevd: fix crash when workers time out after exit is signal caught + f854991504 udevd: wait for workers to finish when exiting (bsc#1106383) + + Changes from the v243-stable (84 commits): + + e51d9bf9e5 man: add entry about SpeedMeter= + aa1fc791c7 udev: silence warning about PROGRAM+= or IMPORT+= rules + b9a619bb67 udevadm: ignore EROFS and return earlier + 1ec5b9f80c basic: add vmware hypervisor detection from device-tree + 7fa7080248 umount: be happy if /proc/swaps doesn't exist + [...] + 47d0e23d26 udev: fix memleak caused by wrong cleanup function + a6fb0542c5 parse_hwdb: fix compatibility with pyparsing 2.4.* + cb1d892f17 parse_hwdb: process files in order + ------------------------------------------------------------------- Tue Nov 12 14:15:03 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index c15d809a..770c21a4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.135.g0b715187a8 +%define suse_version +suse.225.gdbb1d4734d %bcond_with gnuefi %if 0%{?bootstrap} diff --git a/systemd-v243+suse.135.g0b715187a8.tar.xz b/systemd-v243+suse.135.g0b715187a8.tar.xz deleted file mode 100644 index 8e1237a8..00000000 --- a/systemd-v243+suse.135.g0b715187a8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2ee8ed4694914a70e8831b9f5b88f23167e2fc87ca8893d991495de13f19ba74 -size 5618704 diff --git a/systemd-v243+suse.225.gdbb1d4734d.tar.xz b/systemd-v243+suse.225.gdbb1d4734d.tar.xz new file mode 100644 index 00000000..17eae932 --- /dev/null +++ b/systemd-v243+suse.225.gdbb1d4734d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:75e337763ce116e5e9125f6cd96c015ad29416f47c9bfe063f25478b532569d0 +size 5619504 diff --git a/systemd.changes b/systemd.changes index 4ac78fd8..7bf8c925 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Dec 3 16:56:31 UTC 2019 - Franck Bui + +- Import commit dbb1d4734daffa62e0eddecfa4f784c84a9d8e76 + + 1439d72a72 udevd: don't use monitor after manager_exit() + 99288dd778 Revert "udevd: fix crash when workers time out after exit is signal caught" + 152577d6d0 udevd: fix crash when workers time out after exit is signal caught + f854991504 udevd: wait for workers to finish when exiting (bsc#1106383) + + Changes from the v243-stable (84 commits): + + e51d9bf9e5 man: add entry about SpeedMeter= + aa1fc791c7 udev: silence warning about PROGRAM+= or IMPORT+= rules + b9a619bb67 udevadm: ignore EROFS and return earlier + 1ec5b9f80c basic: add vmware hypervisor detection from device-tree + 7fa7080248 umount: be happy if /proc/swaps doesn't exist + [...] + 47d0e23d26 udev: fix memleak caused by wrong cleanup function + a6fb0542c5 parse_hwdb: fix compatibility with pyparsing 2.4.* + cb1d892f17 parse_hwdb: process files in order + ------------------------------------------------------------------- Tue Nov 12 14:15:03 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 4fbd18a0..335a6bda 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.135.g0b715187a8 +%define suse_version +suse.225.gdbb1d4734d %bcond_with gnuefi %if 0%{?bootstrap} From 48c23099765236f14e87dcfe594b8b25fceeb40c7409ce5bff7f1bf328fb2776 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 16 Jan 2020 17:19:33 +0000 Subject: [PATCH 045/124] Accepting request 764325 from Base:System OBS-URL: https://build.opensuse.org/request/show/764325 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=303 --- ...lock-group-to-follow-openSUSE-policy.patch | 38 ++++ ...E-policy-do-not-clean-tmp-by-default.patch | 26 +++ ...ward-compatibility-with-UserTasksMax.patch | 187 ------------------ systemd-mini.changes | 73 +++++++ systemd-mini.spec | 37 ++-- systemd-v243+suse.225.gdbb1d4734d.tar.xz | 3 - systemd-v244+suse.58.g8254b8d964.tar.xz | 3 + systemd.changes | 73 +++++++ systemd.spec | 37 ++-- 9 files changed, 245 insertions(+), 232 deletions(-) create mode 100644 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch create mode 100644 0001-SUSE-policy-do-not-clean-tmp-by-default.patch delete mode 100644 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch delete mode 100644 systemd-v243+suse.225.gdbb1d4734d.tar.xz create mode 100644 systemd-v244+suse.58.g8254b8d964.tar.xz diff --git a/0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch b/0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch new file mode 100644 index 00000000..66eeece9 --- /dev/null +++ b/0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch @@ -0,0 +1,38 @@ +From ca2788b478d763e49d2463378272d9fef2ef1bf3 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Mon, 9 May 2016 16:10:21 +0200 +Subject: [PATCH 1/1] Fix /run/lock group to follow openSUSE policy + +This is a partial import of commit +88013cabb939e4bd7347ce324c9eb9c1a45582de part of SUSE/v210 branch. + +However /var/lock/{subsys,lockdev} are left alone and will be created +because: + +- a bug was opened requesting /var/lock/subsys, see commit +0671c57670fc09e0cb970d081a1b523ea9c62b5b. + +- creating /var/lock/lockdev shouldn't hurt. + +[fixes: bnc#733523] +--- + tmpfiles.d/legacy.conf | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf +index 62e2ae0986..415918f407 100644 +--- a/tmpfiles.d/legacy.conf ++++ b/tmpfiles.d/legacy.conf +@@ -10,7 +10,8 @@ + # These files are considered legacy and are unnecessary on legacy-free + # systems. + +-d /run/lock 0755 root root - ++# On openSUSE, /run/lock is owned by the 'lock' group. ++d /run/lock 0775 root lock - + L /var/lock - - - - ../run/lock + + # /run/lock/subsys is used for serializing SysV service execution, and +-- +2.16.4 + diff --git a/0001-SUSE-policy-do-not-clean-tmp-by-default.patch b/0001-SUSE-policy-do-not-clean-tmp-by-default.patch new file mode 100644 index 00000000..6f37b2d6 --- /dev/null +++ b/0001-SUSE-policy-do-not-clean-tmp-by-default.patch @@ -0,0 +1,26 @@ +From b66a7b4b5aa25a1ffb4b76fe9545046dabd92c03 Mon Sep 17 00:00:00 2001 +From: Reinhard Max +Date: Fri, 19 Apr 2013 16:56:26 +0200 +Subject: [PATCH 1/1] SUSE policy: do not clean /tmp by default. + +Fix regression in the default for tmp auto-deletion (FATE#314974). +--- + tmpfiles.d/tmp.conf | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf +index fe5225d751..dedc7569e1 100644 +--- a/tmpfiles.d/tmp.conf ++++ b/tmpfiles.d/tmp.conf +@@ -8,5 +8,6 @@ + # See tmpfiles.d(5) for details + + # Clear tmp directories separately, to make them easier to override +-q /tmp 1777 root root 10d +-q /var/tmp 1777 root root 30d ++# SUSE policy: we don't clean those directories ++q /tmp 1777 root root - ++q /var/tmp 1777 root root - +-- +2.16.4 + diff --git a/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch b/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch deleted file mode 100644 index 553fd89f..00000000 --- a/0001-logind-keep-backward-compatibility-with-UserTasksMax.patch +++ /dev/null @@ -1,187 +0,0 @@ -From ce59acc7743f1897a335449b718f9ede33add394 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Tue, 6 Nov 2018 11:51:26 +0100 -Subject: [PATCH] logind: keep backward compatibility with UserTasksMax= in - logind.conf - -Since commit 284149392755f086d0a71, UserTasksMax= support has been simply -dropped. - -A generator is used to automatically create an appropriate dropin that has the -same effect. However since the snippet is generated in /run, sysadmin is -encouraged to copy it in /etc to make it persistent. - -The main advantages to use a generator are: - - - sysadmin is aware of this backward incompatible change - - - he will be the one who will fix logind.conf manually (to remove the use of - UserTasksMax=) - - - he will decide how to name the snippet and possibly merge it with an - existing one - -Expect this generator to be dropped in the future. ---- - meson.build | 8 +++ - src/login/compat-tasks-max-generator.c | 68 ++++++++++++++++++++++++++ - src/login/logind-user.c | 43 ++++++++++++++-- - 3 files changed, 114 insertions(+), 5 deletions(-) - create mode 100644 src/login/compat-tasks-max-generator.c - -diff --git a/meson.build b/meson.build -index dc6e970095..d834108f24 100644 ---- a/meson.build -+++ b/meson.build -@@ -1885,6 +1885,14 @@ if conf.get('ENABLE_LOGIND') == 1 - endif - endif - -+ executable('logind-compat-tasks-max-generator', -+ 'src/login/compat-tasks-max-generator.c', -+ include_directories : includes, -+ link_with : [libshared, liblogind_core], -+ install_rpath : rootlibexecdir, -+ install : true, -+ install_dir : systemgeneratordir) -+ - executable('systemd-user-runtime-dir', - user_runtime_dir_sources, - include_directories : includes, -diff --git a/src/login/compat-tasks-max-generator.c b/src/login/compat-tasks-max-generator.c -new file mode 100644 -index 0000000000..964d0596fb ---- /dev/null -+++ b/src/login/compat-tasks-max-generator.c -@@ -0,0 +1,68 @@ -+#include -+#include -+#include -+ -+#include "alloc-util.h" -+#include "dropin.h" -+#include "logind.h" -+#include "path-util.h" -+ -+static const char *arg_dest = "/tmp"; -+ -+static int read_manager_configuration(uint64_t *user_tasks_max) { -+ Manager m = {}; -+ int r; -+ -+ manager_reset_config(&m); -+ m.user_tasks_max = 0; -+ -+ r = manager_parse_config_file(&m); -+ if (r < 0) -+ return log_warning_errno(r, "Failed to parse logind.conf: %m"); -+ -+ if (m.user_tasks_max == 0) -+ return 0; -+ -+ *user_tasks_max = m.user_tasks_max; -+ return 1; -+} -+ -+int main(int argc, char *argv[]) { -+ _cleanup_free_ char *p = NULL; -+ uint64_t user_tasks_max; -+ int r = 0; -+ -+ if (argc > 1 && argc != 4) { -+ log_error("This program takes three or no arguments."); -+ return EXIT_FAILURE; -+ } -+ -+ if (argc > 1) -+ arg_dest = argv[1]; -+ -+ log_set_prohibit_ipc(true); -+ log_set_target(LOG_TARGET_AUTO); -+ log_parse_environment(); -+ log_open(); -+ -+ umask(0022); -+ -+ r = read_manager_configuration(&user_tasks_max); -+ if (r == 0) -+ return EXIT_SUCCESS; -+ if (r < 0) -+ return EXIT_FAILURE; -+ -+ p = path_join(arg_dest, "user-.slice.d", "50-limits.conf"); -+ if (!p) -+ return EXIT_FAILURE; -+ -+ log_warning("Creating %s to keep compability\n" -+ "Consider copying the snippet in /etc/systemd/system/user-.slice.d/\n", p); -+ -+ r = write_drop_in_format(arg_dest, "user-.slice", 50, "limits", -+ "# Automatically generated by logind-compat-tasks-max-generator\n\n" -+ "[Slice]\nTasksMax=%" PRIu64, user_tasks_max); -+ -+ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; -+} -diff --git a/src/login/logind-user.c b/src/login/logind-user.c -index 045b6f0e17..1c19d6512b 100644 ---- a/src/login/logind-user.c -+++ b/src/login/logind-user.c -@@ -847,17 +847,50 @@ int config_parse_compat_user_tasks_max( - void *data, - void *userdata) { - -+ uint64_t *m = data; -+ uint64_t k; -+ int r; -+ - assert(filename); - assert(lvalue); - assert(rvalue); - assert(data); - -- log_syntax(unit, LOG_NOTICE, filename, line, 0, -+ log_syntax(unit, LOG_WARNING, filename, line, 0, - "Support for option %s= has been removed.", - lvalue); -- log_info("Hint: try creating /etc/systemd/system/user-.slice.d/50-limits.conf with:\n" -- " [Slice]\n" -- " TasksMax=%s", -- rvalue); -+ -+ if (isempty(rvalue)) { -+ *m = system_tasks_max_scale(DEFAULT_USER_TASKS_MAX_PERCENTAGE, 100U); -+ return 0; -+ } -+ -+ if (streq(rvalue, "infinity")) { -+ *m = CGROUP_LIMIT_MAX; -+ return 0; -+ } -+ -+ /* Try to parse as percentage */ -+ r = parse_percent(rvalue); -+ if (r >= 0) -+ k = system_tasks_max_scale(r, 100U); -+ else { -+ -+ /* If the passed argument was not a percentage, or out of range, parse as byte size */ -+ -+ r = safe_atou64(rvalue, &k); -+ if (r < 0) { -+ log_syntax(unit, LOG_ERR, filename, line, r, "Failed to parse tasks maximum, ignoring: %s", rvalue); -+ return 0; -+ } -+ } -+ -+ if (k <= 0 || k >= UINT64_MAX) { -+ log_syntax(unit, LOG_ERR, filename, line, 0, "Tasks maximum out of range, ignoring: %s", rvalue); -+ return 0; -+ } -+ -+ *m = k; -+ - return 0; - } --- -2.21.0 - diff --git a/systemd-mini.changes b/systemd-mini.changes index 7bf8c925..f9874710 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,76 @@ +------------------------------------------------------------------- +Tue Jan 14 14:21:40 UTC 2020 - Franck Bui + +- Temporarily restore /sbin/{udevd,udevadm) obsolete symlinks + + They're restored until YaST stop using them (see boo#1160890) + +------------------------------------------------------------------- +Tue Jan 14 13:56:31 UTC 2020 - Franck Bui + +- Import commit 8254b8d9646f3e0f5f8057d1ffb5d6c20f079aaa (merge v244.1) + + 639dc9f4bf network: set ipv6 mtu after link-up or device mtu change + cbced49daa man: fix typo in net-naming-scheme man page + 7dd04c99b0 network: tc: drop unused element + bf4b7d07ba man: fix typos (#14304) + 1ba2e7a730 ipv4ll: do not reset conflict counter on restart + 49806bb310 macro: avoid subtraction overflow in ALIGN_POWER2() + c4c1600689 test-network: add a test case for SendOption= + 6f15b45949 network: fix segfault in parsing SendOption= + 2e531b830d seccomp: real syscall numbers are >= 0 + f7616ed52b network: fix copy and paste mistake + e8b53300c4 network: do not drop foreign config if interface is in initialized state + 00f05813bf seccomp: mmap test results depend on kernel/libseccomp/glibc + 4de1909e61 seccomp: use per arch shmat_syscall + d83010521d seccomp: ensure rules are loaded in seccomp_memory_deny_write_execute + 2c6568221a seccomp: fix multiplexed system calls + bcf0aa02bf Fix typo (duplicate "or") + 96d7083c54 network: if /sys is rw, then udev should be around + e874419902 nspawn: do not fail if udev is not running + 29c9144655 Create parent directories when creating systemd-private subdirs + 9cbb8b5254 network: do not return error but return UINT64_MAX if speed meter is disabled + c08429ae33 core: swap priority can be negative + f25c0be335 networkctl: fix to show BSSID + 65fd2fce59 systemctl: enhance message about kexec missing kernel + bdd0af5f81 Fixup typo in NEWS + +------------------------------------------------------------------- +Wed Dec 11 17:20:04 UTC 2019 - Franck Bui + +- Manually set system-uid-max and system-gid-max to 499 + + It used to be detected automatically by meson but it's been broken + by the migration of login.defs from /etc to /usr/etc. + +------------------------------------------------------------------- +Wed Dec 11 17:01:57 UTC 2019 - Franck Bui + +- Import commit d8f6a204858bff68b8e0e7be86b418c36087ab2e + + 6c5e492a65 cryptsetup: umount encrypted devices before detaching it during shutdown + +------------------------------------------------------------------- +Thu Dec 5 14:00:03 UTC 2019 - Franck Bui + +- Upgrade to v244 (commit 090da85161ceb1ba0b4c208963c7156a8fdf10c6) + + See https://github.com/openSUSE/systemd/blob/SUSE/v244/NEWS for + details. + + Legacy and obsolete symlinks have been finally dropped. + + Dropped 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch. + Users were notified about the deprecation of UserTasksMax option and + how to move to the new mechanism. The dropin replacement for + UserTasksMax is therefore no more generated but its use still + produces a warning. + + Added 0001-SUSE-policy-do-not-clean-tmp-by-default.patch and + 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch. + These patches were extracted from the git repo because it's not + clear where the SUSE tmpfiles specificities should be located. + ------------------------------------------------------------------- Tue Dec 3 16:56:31 UTC 2019 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 770c21a4..43d27e94 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.225.gdbb1d4734d +%define suse_version +suse.58.g8254b8d964 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 243 +Version: 244 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -166,7 +166,8 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch +Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch +Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -480,6 +481,8 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Drootprefix=/usr \ -Dsplit-usr=true \ -Dsplit-bin=true \ + -Dsystem-uid-max=499 \ + -Dsystem-gid-max=499 \ -Dpamlibdir=/%{_lib}/security \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ @@ -556,11 +559,10 @@ rm %{buildroot}%{_sbindir}/resolvconf rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif -# FIXME: these symlinks should die. -mkdir -p %{buildroot}/{sbin,lib,bin} +# FIXME: These obsolete symlinks are still needed by YaST so let's +# keep them until boo#1160890 is fixed. +mkdir -p %{buildroot}/sbin ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm -ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password -ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd %if %{with sysvcompat} @@ -583,7 +585,8 @@ for s in %{S:200}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-} done -ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd +# Legacy sysvinit tools +mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt @@ -642,9 +645,6 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.* %endif -# legacy link -ln -s /usr/lib/udev %{buildroot}/lib/udev - # Create the /var/log/journal directory to change the volatile journal # to a persistent one mkdir -p %{buildroot}%{_localstatedir}/log/journal/ @@ -1004,9 +1004,6 @@ fi %files %defattr(-,root,root) %license LICENSE* -/bin/systemd -/bin/systemd-ask-password -/bin/systemctl %{_bindir}/busctl %{_bindir}/bootctl %{_bindir}/hostnamectl @@ -1315,15 +1312,14 @@ fi %defattr(-,root,root) /sbin/udevd /sbin/udevadm -# keep for compatibility -%ghost /lib/udev %{_bindir}/udevadm %{_bindir}/systemd-hwdb %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id -%{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/cdrom_id +%{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe +%{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %ghost %{_prefix}/lib/udev/compat-symlink-generation @@ -1501,9 +1497,8 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%{_prefix}/lib/systemd/network/80-container-host0.network -%{_prefix}/lib/systemd/network/80-container-ve.network -%{_prefix}/lib/systemd/network/80-container-vz.network +%{_prefix}/lib/systemd/network/*.network +%{_prefix}/lib/systemd/network/*.network.example %endif %if %{with resolved} %{_bindir}/resolvectl diff --git a/systemd-v243+suse.225.gdbb1d4734d.tar.xz b/systemd-v243+suse.225.gdbb1d4734d.tar.xz deleted file mode 100644 index 17eae932..00000000 --- a/systemd-v243+suse.225.gdbb1d4734d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:75e337763ce116e5e9125f6cd96c015ad29416f47c9bfe063f25478b532569d0 -size 5619504 diff --git a/systemd-v244+suse.58.g8254b8d964.tar.xz b/systemd-v244+suse.58.g8254b8d964.tar.xz new file mode 100644 index 00000000..cf95da8c --- /dev/null +++ b/systemd-v244+suse.58.g8254b8d964.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a1347645929f05fcc785b2f4531456eb50c6916d5f15a88cfe6fb57845ed1103 +size 5761288 diff --git a/systemd.changes b/systemd.changes index 7bf8c925..f9874710 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,76 @@ +------------------------------------------------------------------- +Tue Jan 14 14:21:40 UTC 2020 - Franck Bui + +- Temporarily restore /sbin/{udevd,udevadm) obsolete symlinks + + They're restored until YaST stop using them (see boo#1160890) + +------------------------------------------------------------------- +Tue Jan 14 13:56:31 UTC 2020 - Franck Bui + +- Import commit 8254b8d9646f3e0f5f8057d1ffb5d6c20f079aaa (merge v244.1) + + 639dc9f4bf network: set ipv6 mtu after link-up or device mtu change + cbced49daa man: fix typo in net-naming-scheme man page + 7dd04c99b0 network: tc: drop unused element + bf4b7d07ba man: fix typos (#14304) + 1ba2e7a730 ipv4ll: do not reset conflict counter on restart + 49806bb310 macro: avoid subtraction overflow in ALIGN_POWER2() + c4c1600689 test-network: add a test case for SendOption= + 6f15b45949 network: fix segfault in parsing SendOption= + 2e531b830d seccomp: real syscall numbers are >= 0 + f7616ed52b network: fix copy and paste mistake + e8b53300c4 network: do not drop foreign config if interface is in initialized state + 00f05813bf seccomp: mmap test results depend on kernel/libseccomp/glibc + 4de1909e61 seccomp: use per arch shmat_syscall + d83010521d seccomp: ensure rules are loaded in seccomp_memory_deny_write_execute + 2c6568221a seccomp: fix multiplexed system calls + bcf0aa02bf Fix typo (duplicate "or") + 96d7083c54 network: if /sys is rw, then udev should be around + e874419902 nspawn: do not fail if udev is not running + 29c9144655 Create parent directories when creating systemd-private subdirs + 9cbb8b5254 network: do not return error but return UINT64_MAX if speed meter is disabled + c08429ae33 core: swap priority can be negative + f25c0be335 networkctl: fix to show BSSID + 65fd2fce59 systemctl: enhance message about kexec missing kernel + bdd0af5f81 Fixup typo in NEWS + +------------------------------------------------------------------- +Wed Dec 11 17:20:04 UTC 2019 - Franck Bui + +- Manually set system-uid-max and system-gid-max to 499 + + It used to be detected automatically by meson but it's been broken + by the migration of login.defs from /etc to /usr/etc. + +------------------------------------------------------------------- +Wed Dec 11 17:01:57 UTC 2019 - Franck Bui + +- Import commit d8f6a204858bff68b8e0e7be86b418c36087ab2e + + 6c5e492a65 cryptsetup: umount encrypted devices before detaching it during shutdown + +------------------------------------------------------------------- +Thu Dec 5 14:00:03 UTC 2019 - Franck Bui + +- Upgrade to v244 (commit 090da85161ceb1ba0b4c208963c7156a8fdf10c6) + + See https://github.com/openSUSE/systemd/blob/SUSE/v244/NEWS for + details. + + Legacy and obsolete symlinks have been finally dropped. + + Dropped 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch. + Users were notified about the deprecation of UserTasksMax option and + how to move to the new mechanism. The dropin replacement for + UserTasksMax is therefore no more generated but its use still + produces a warning. + + Added 0001-SUSE-policy-do-not-clean-tmp-by-default.patch and + 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch. + These patches were extracted from the git repo because it's not + clear where the SUSE tmpfiles specificities should be located. + ------------------------------------------------------------------- Tue Dec 3 16:56:31 UTC 2019 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 335a6bda..2a1d8c3a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.225.gdbb1d4734d +%define suse_version +suse.58.g8254b8d964 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 243 +Version: 244 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -164,7 +164,8 @@ Source200: scripts-udev-convert-lib-udev-path.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch2: 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch +Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch +Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -478,6 +479,8 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Drootprefix=/usr \ -Dsplit-usr=true \ -Dsplit-bin=true \ + -Dsystem-uid-max=499 \ + -Dsystem-gid-max=499 \ -Dpamlibdir=/%{_lib}/security \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ @@ -554,11 +557,10 @@ rm %{buildroot}%{_sbindir}/resolvconf rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif -# FIXME: these symlinks should die. -mkdir -p %{buildroot}/{sbin,lib,bin} +# FIXME: These obsolete symlinks are still needed by YaST so let's +# keep them until boo#1160890 is fixed. +mkdir -p %{buildroot}/sbin ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm -ln -sf %{_bindir}/systemd-ask-password %{buildroot}/bin/systemd-ask-password -ln -sf %{_bindir}/systemctl %{buildroot}/bin/systemctl ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd %if %{with sysvcompat} @@ -581,7 +583,8 @@ for s in %{S:200}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-} done -ln -s ../usr/lib/systemd/systemd %{buildroot}/bin/systemd +# Legacy sysvinit tools +mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt @@ -640,9 +643,6 @@ rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.* %endif -# legacy link -ln -s /usr/lib/udev %{buildroot}/lib/udev - # Create the /var/log/journal directory to change the volatile journal # to a persistent one mkdir -p %{buildroot}%{_localstatedir}/log/journal/ @@ -1002,9 +1002,6 @@ fi %files %defattr(-,root,root) %license LICENSE* -/bin/systemd -/bin/systemd-ask-password -/bin/systemctl %{_bindir}/busctl %{_bindir}/bootctl %{_bindir}/hostnamectl @@ -1313,15 +1310,14 @@ fi %defattr(-,root,root) /sbin/udevd /sbin/udevadm -# keep for compatibility -%ghost /lib/udev %{_bindir}/udevadm %{_bindir}/systemd-hwdb %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id -%{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/cdrom_id +%{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe +%{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %ghost %{_prefix}/lib/udev/compat-symlink-generation @@ -1499,9 +1495,8 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%{_prefix}/lib/systemd/network/80-container-host0.network -%{_prefix}/lib/systemd/network/80-container-ve.network -%{_prefix}/lib/systemd/network/80-container-vz.network +%{_prefix}/lib/systemd/network/*.network +%{_prefix}/lib/systemd/network/*.network.example %endif %if %{with resolved} %{_bindir}/resolvectl From fbe3de5990d32b2efea85e454fbbb192f7c9164f6c9f28a83840be9abbb56cdf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 11 Feb 2020 21:16:47 +0000 Subject: [PATCH 046/124] Accepting request 772626 from Base:System OBS-URL: https://build.opensuse.org/request/show/772626 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=304 --- scripts-udev-convert-lib-udev-path.sh | 92 ------------------------ systemd-mini.changes | 39 ++++++++++ systemd-mini.spec | 25 +++---- systemd-v244+suse.138.gf8adabc2b1.tar.xz | 3 + systemd-v244+suse.58.g8254b8d964.tar.xz | 3 - systemd.changes | 39 ++++++++++ systemd.spec | 25 +++---- 7 files changed, 107 insertions(+), 119 deletions(-) delete mode 100644 scripts-udev-convert-lib-udev-path.sh create mode 100644 systemd-v244+suse.138.gf8adabc2b1.tar.xz delete mode 100644 systemd-v244+suse.58.g8254b8d964.tar.xz diff --git a/scripts-udev-convert-lib-udev-path.sh b/scripts-udev-convert-lib-udev-path.sh deleted file mode 100644 index 1463f787..00000000 --- a/scripts-udev-convert-lib-udev-path.sh +++ /dev/null @@ -1,92 +0,0 @@ -#! /bin/bash -# -# When upgrading from systems predating systemd (SLE11, openSUSE -# 12.x), udev libexec directory was changed from /lib/udev to -# /usr/lib/udev. Some customer scripts might still rely on the old -# path, therefore try to create a symlink that preserves the old path -# (see bsc#1050152). -# -# This script is supposed to be called from the %posttrans scection of -# the udev package. -# -convert_lib_udev_path () { - local failed=/bin/false - - # Sanity check: /usr/lib/udev must exist at that point since - # the new udev package should have been installed. - if ! test -d /usr/lib/udev; then - echo >&2 "/usr/lib/udev does not exist, refusing to create" - echo >&2 "/lib/udev compat symlink." - return 1 - fi - - # If the symlink is missing it probably means that we're - # upgrading and the old /lib/udev path was removed as it was - # empty at the time the old version of udev was uninstalled. - if ! test -e /lib/udev; then - echo "Creating /lib/udev -> /usr/lib/udev symlink." - ln -s /usr/lib/udev /lib/udev - return - fi - - # If a symlink already exists, simply assume that we already - # did the job. IOW we're just doing a simple update of - # systemd/udev (not upgrading). - if test -L /lib/udev; then - return - fi - - # Sanity check: refuse to deal with anything but a directory. - if ! test -d /lib/udev; then - echo >&2 "/lib/udev is not either a directory nor a symlink !" - echo >&2 "It won't be converted into a symlink to /usr/lib/udev." - echo >&2 "Please create it manually." - return 1 - fi - - # /lib/udev exists and is still a directory (probably not - # empty otherwise it would have been removed when the old - # version of udev was uninstalled), we try to merge its - # content with the new location and if it fails we warn the - # user and let him sort this out. - shopt -s globstar - for f in /lib/udev/**; do - if test -d "$f"; then - continue - fi - if test -e /usr/"$f"; then - echo >&2 "Failed to migrate '$f' to /usr/lib/udev because it already exists." - failed=/bin/true - continue - fi - - echo "Migrating '$f' in /usr/lib/udev" - if ! cp -a --parents "$f" /usr; then - echo >&2 "Failed to move '$f' in /usr/lib/udev." - failed=/bin/true - continue - fi - rm "$f" - done - shopt -u globstar - - if ! $failed; then - rm -fr /lib/udev && - ln -s ../usr/lib/udev /lib/udev && - echo "The content of /lib/udev has been moved in /usr/lib/udev successfully" && - echo "and /lib/udev is now a symlink pointing to /usr/lib/udev." && - echo "Please note /lib/udev is deprecated and shouldn't be used by" && - echo "new scripts/applications anymore." || - failed=/bin/true - fi - - if $failed; then - echo >&2 "Converting /lib/udev into a symlink pointing to /usr/lib/udev was not" - echo >&2 "possible due to previous error(s)." - echo >&2 "Please fix them and then create the symlink with:" - echo >&2 " 'ln -s ../usr/lib/udev /lib/udev'." - return 1 - fi -} - -convert_lib_udev_path diff --git a/systemd-mini.changes b/systemd-mini.changes index f9874710..490955b2 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Thu Feb 6 14:15:01 UTC 2020 - Franck Bui + +- Import commit f8adabc2b1f3e3ad150e7a3bfa88341eda5a8a57 (merge v244.2) + + 77c04ce5c2 hwdb: update to v245-rc1 + b4eb884824 Fix typo in function name + e2d4cb9843 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it + 83bfc0d8dd sd-bus: introduce API for re-enqueuing incoming messages + 5926f9f172 polkit: use structured initialization + 0697d0d972 polkit: on async pk requests, re-validate action/details + 2589995acd polkit: reuse some common bus message appending code + 5b2442d5c3 bus-polkit: rename return error parameter to ret_error + 0a19ff7004 shared: split out polkit stuff from bus-util.c → bus-polkit.c + 1325dfb577 test: adapt to the new capsh format + 3538fafb47 meson: update efi path detection to gnu-efi-3.0.11 + 3034855a5b presets: "disable" all passive targets by default + c2e3046819 shared/sysctl-util: normalize repeated slashes or dots to a single value + 6f4364046f dhcp6: do not use T1 and T2 longer than one provided by the lease + 0ed6cda28d network: fix implicit type conversion warning by GCC-10 + f6a5c02d26 bootspec: parse random-seed-mode line in loader.conf + ddc5dca8a7 sd-boot: fix typo + 2bbbe9ae41 test: Synchronize journal before reading from it + 072485d661 sd-bus: fix introspection bug in signal parameter names + 80af3cf5e3 efi: fix build. + [...] + +------------------------------------------------------------------- +Mon Feb 3 14:52:51 UTC 2020 - Franck Bui + +- Use suse.pool.ntp.org server pool on SLE (jsc#SLE-7683) + +------------------------------------------------------------------- +Tue Jan 21 16:01:09 UTC 2020 - Franck Bui + +- Drop scripts-udev-convert-lib-udev-path.sh + + Nobody should need it these days. + ------------------------------------------------------------------- Tue Jan 14 14:21:40 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 43d27e94..3bda3fe4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.58.g8254b8d964 +%define suse_version +suse.138.gf8adabc2b1 %bcond_with gnuefi %if 0%{?bootstrap} @@ -54,7 +54,7 @@ %bcond_with parentpathid Name: systemd-mini -Url: http://www.freedesktop.org/wiki/Software/systemd +URL: http://www.freedesktop.org/wiki/Software/systemd Version: 244 Release: 0 Summary: A System and Session Manager @@ -158,7 +158,6 @@ Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh -Source200: scripts-udev-convert-lib-udev-path.sh # Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the @@ -239,7 +238,7 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only Group: System/Kernel -Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware Requires(post): sed Requires(post): coreutils @@ -472,7 +471,11 @@ systemd-journal-remote, and systemd-journal-upload. %autopatch -p1 %build -opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) +%if 0%{?is_opensuse} +ntp_servers=({0..3}.opensuse.pool.ntp.org) +%else +ntp_servers=({0..3}.suse.pool.ntp.org) +%endif # keep split-usr until all packages have moved their systemd rules to /usr %meson \ @@ -488,7 +491,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ - -Dntp-servers="${opensuse_ntp_servers[*]}" \ + -Dntp-servers="${ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ @@ -581,9 +584,6 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -for s in %{S:200}; do - install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-} -done # Legacy sysvinit tools mkdir -p %{buildroot}/sbin @@ -868,7 +868,6 @@ systemctl daemon-reload || : %posttrans -n udev%{?mini} %regenerate_initrd_posttrans -%{_prefix}/lib/udev/scripts/convert-lib-udev-path.sh || : %post -n libudev%{?mini}1 -p /sbin/ldconfig %post -n libsystemd0%{?mini} -p /sbin/ldconfig @@ -1169,9 +1168,11 @@ fi %config(noreplace) %{_sysconfdir}/systemd/user.conf %dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system.d %dir %{_datadir}/dbus-1/system-services +%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -1201,6 +1202,7 @@ fi %exclude %{_datadir}/systemd/gatewayd %endif +%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service @@ -1330,7 +1332,6 @@ fi %exclude %{_udevrulesdir}/99-systemd.rules %{_udevrulesdir}/*.rules %{_udevhwdbdir}/ -%{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin diff --git a/systemd-v244+suse.138.gf8adabc2b1.tar.xz b/systemd-v244+suse.138.gf8adabc2b1.tar.xz new file mode 100644 index 00000000..39fec5db --- /dev/null +++ b/systemd-v244+suse.138.gf8adabc2b1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c7c4ae099d4a421225778043d0ce9bb9f3d3a59186eb7da173e5f35edbc218c5 +size 5784940 diff --git a/systemd-v244+suse.58.g8254b8d964.tar.xz b/systemd-v244+suse.58.g8254b8d964.tar.xz deleted file mode 100644 index cf95da8c..00000000 --- a/systemd-v244+suse.58.g8254b8d964.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a1347645929f05fcc785b2f4531456eb50c6916d5f15a88cfe6fb57845ed1103 -size 5761288 diff --git a/systemd.changes b/systemd.changes index f9874710..490955b2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Thu Feb 6 14:15:01 UTC 2020 - Franck Bui + +- Import commit f8adabc2b1f3e3ad150e7a3bfa88341eda5a8a57 (merge v244.2) + + 77c04ce5c2 hwdb: update to v245-rc1 + b4eb884824 Fix typo in function name + e2d4cb9843 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it + 83bfc0d8dd sd-bus: introduce API for re-enqueuing incoming messages + 5926f9f172 polkit: use structured initialization + 0697d0d972 polkit: on async pk requests, re-validate action/details + 2589995acd polkit: reuse some common bus message appending code + 5b2442d5c3 bus-polkit: rename return error parameter to ret_error + 0a19ff7004 shared: split out polkit stuff from bus-util.c → bus-polkit.c + 1325dfb577 test: adapt to the new capsh format + 3538fafb47 meson: update efi path detection to gnu-efi-3.0.11 + 3034855a5b presets: "disable" all passive targets by default + c2e3046819 shared/sysctl-util: normalize repeated slashes or dots to a single value + 6f4364046f dhcp6: do not use T1 and T2 longer than one provided by the lease + 0ed6cda28d network: fix implicit type conversion warning by GCC-10 + f6a5c02d26 bootspec: parse random-seed-mode line in loader.conf + ddc5dca8a7 sd-boot: fix typo + 2bbbe9ae41 test: Synchronize journal before reading from it + 072485d661 sd-bus: fix introspection bug in signal parameter names + 80af3cf5e3 efi: fix build. + [...] + +------------------------------------------------------------------- +Mon Feb 3 14:52:51 UTC 2020 - Franck Bui + +- Use suse.pool.ntp.org server pool on SLE (jsc#SLE-7683) + +------------------------------------------------------------------- +Tue Jan 21 16:01:09 UTC 2020 - Franck Bui + +- Drop scripts-udev-convert-lib-udev-path.sh + + Nobody should need it these days. + ------------------------------------------------------------------- Tue Jan 14 14:21:40 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 2a1d8c3a..e464f4ff 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.58.g8254b8d964 +%define suse_version +suse.138.gf8adabc2b1 %bcond_with gnuefi %if 0%{?bootstrap} @@ -52,7 +52,7 @@ %bcond_with parentpathid Name: systemd -Url: http://www.freedesktop.org/wiki/Software/systemd +URL: http://www.freedesktop.org/wiki/Software/systemd Version: 244 Release: 0 Summary: A System and Session Manager @@ -156,7 +156,6 @@ Source14: kbd-model-map.legacy Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh -Source200: scripts-udev-convert-lib-udev-path.sh # Patches listed in here are put in quarantine. Normally all # changes must go to upstream first and then are cherry-picked in the @@ -237,7 +236,7 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only Group: System/Kernel -Url: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware Requires(post): sed Requires(post): coreutils @@ -470,7 +469,11 @@ systemd-journal-remote, and systemd-journal-upload. %autopatch -p1 %build -opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) +%if 0%{?is_opensuse} +ntp_servers=({0..3}.opensuse.pool.ntp.org) +%else +ntp_servers=({0..3}.suse.pool.ntp.org) +%endif # keep split-usr until all packages have moved their systemd rules to /usr %meson \ @@ -486,7 +489,7 @@ opensuse_ntp_servers=({0..3}.opensuse.pool.ntp.org) -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ - -Dntp-servers="${opensuse_ntp_servers[*]}" \ + -Dntp-servers="${ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ @@ -579,9 +582,6 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -for s in %{S:200}; do - install -m0755 -D $s %{buildroot}%{_prefix}/lib/udev/scripts/${s#*/scripts-udev-} -done # Legacy sysvinit tools mkdir -p %{buildroot}/sbin @@ -866,7 +866,6 @@ systemctl daemon-reload || : %posttrans -n udev%{?mini} %regenerate_initrd_posttrans -%{_prefix}/lib/udev/scripts/convert-lib-udev-path.sh || : %post -n libudev%{?mini}1 -p /sbin/ldconfig %post -n libsystemd0%{?mini} -p /sbin/ldconfig @@ -1167,9 +1166,11 @@ fi %config(noreplace) %{_sysconfdir}/systemd/user.conf %dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system.d %dir %{_datadir}/dbus-1/system-services +%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf @@ -1199,6 +1200,7 @@ fi %exclude %{_datadir}/systemd/gatewayd %endif +%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service @@ -1328,7 +1330,6 @@ fi %exclude %{_udevrulesdir}/99-systemd.rules %{_udevrulesdir}/*.rules %{_udevhwdbdir}/ -%{_prefix}/lib/udev/scripts/ %dir %{_sysconfdir}/udev/ %dir %{_sysconfdir}/udev/rules.d/ %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin From 4c170d51ecb65a6cec464ad1db41b96ac87e62389e6e6049403f0d199793e828 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 6 Mar 2020 20:23:57 +0000 Subject: [PATCH 047/124] Accepting request 781205 from Base:System OBS-URL: https://build.opensuse.org/request/show/781205 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=305 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ systemd.changes | 6 ++++++ systemd.spec | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 96 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 490955b2..d82f8db4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 19 17:24:35 UTC 2020 - Ludwig Nussel + +- move html documentation to sparate package to save space +- move networkd and resolved binaries into correct subpackage + ------------------------------------------------------------------- Thu Feb 6 14:15:01 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 3bda3fe4..8bca5950 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -178,6 +178,19 @@ maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. +%if !0%{?bootstrap} +%package doc +Summary: HTML documentation for systemd +License: LGPL-2.1-or-later +Group: Documentation/Other +Supplements: (systemd and patterns-base-documentation) + +%description doc +The HTML documenation for systemd + +# /bootstrap +%endif + %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later @@ -1076,6 +1089,16 @@ fi %exclude %{_unitdir}/systemd-importd.service %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif +%if %{with networkd} +%exclude %{_prefix}/lib/systemd/systemd-network-generator +%exclude %{_prefix}/lib/systemd/systemd-networkd +%exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online +%exclude %{_unitdir}/systemd-networkd.service +%exclude %{_unitdir}/systemd-networkd.socket +%exclude %{_unitdir}/systemd-networkd-wait-online.service +%exclude %{_prefix}/lib/systemd/systemd-resolved +%exclude %{_unitdir}/systemd-resolved.service +%endif %if %{with portabled} %exclude %{_prefix}/lib/systemd/systemd-portabled %exclude %{_prefix}/lib/systemd/portable @@ -1249,7 +1272,9 @@ fi %exclude %{_mandir}/man*/systemd-portabled* %endif %endif + %{_docdir}/systemd +%exclude %{_docdir}/systemd/html %{_udevrulesdir}/70-uaccess.rules %{_udevrulesdir}/71-seat.rules @@ -1274,6 +1299,15 @@ fi %{_datadir}/zsh/site-functions/* %{_datadir}/pkgconfig/systemd.pc +%if ! 0%{?bootstrap} +%files doc +%defattr(-,root,root,-) +%dir %{_docdir}/systemd +%{_docdir}/systemd/html + +# /bootstrap +%endif + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd.so @@ -1500,6 +1534,14 @@ fi %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %{_prefix}/lib/systemd/network/*.network %{_prefix}/lib/systemd/network/*.network.example +%{_prefix}/lib/systemd/systemd-network-generator +%{_prefix}/lib/systemd/systemd-networkd +%{_prefix}/lib/systemd/systemd-networkd-wait-online +%{_unitdir}/systemd-networkd.service +%{_unitdir}/systemd-networkd.socket +%{_unitdir}/systemd-networkd-wait-online.service +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl diff --git a/systemd.changes b/systemd.changes index 490955b2..d82f8db4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed Feb 19 17:24:35 UTC 2020 - Ludwig Nussel + +- move html documentation to sparate package to save space +- move networkd and resolved binaries into correct subpackage + ------------------------------------------------------------------- Thu Feb 6 14:15:01 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index e464f4ff..2e36aa55 100644 --- a/systemd.spec +++ b/systemd.spec @@ -176,6 +176,19 @@ maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. +%if !0%{?bootstrap} +%package doc +Summary: HTML documentation for systemd +License: LGPL-2.1-or-later +Group: Documentation/Other +Supplements: (systemd and patterns-base-documentation) + +%description doc +The HTML documenation for systemd + +# /bootstrap +%endif + %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later @@ -1074,6 +1087,16 @@ fi %exclude %{_unitdir}/systemd-importd.service %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif +%if %{with networkd} +%exclude %{_prefix}/lib/systemd/systemd-network-generator +%exclude %{_prefix}/lib/systemd/systemd-networkd +%exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online +%exclude %{_unitdir}/systemd-networkd.service +%exclude %{_unitdir}/systemd-networkd.socket +%exclude %{_unitdir}/systemd-networkd-wait-online.service +%exclude %{_prefix}/lib/systemd/systemd-resolved +%exclude %{_unitdir}/systemd-resolved.service +%endif %if %{with portabled} %exclude %{_prefix}/lib/systemd/systemd-portabled %exclude %{_prefix}/lib/systemd/portable @@ -1247,7 +1270,9 @@ fi %exclude %{_mandir}/man*/systemd-portabled* %endif %endif + %{_docdir}/systemd +%exclude %{_docdir}/systemd/html %{_udevrulesdir}/70-uaccess.rules %{_udevrulesdir}/71-seat.rules @@ -1272,6 +1297,15 @@ fi %{_datadir}/zsh/site-functions/* %{_datadir}/pkgconfig/systemd.pc +%if ! 0%{?bootstrap} +%files doc +%defattr(-,root,root,-) +%dir %{_docdir}/systemd +%{_docdir}/systemd/html + +# /bootstrap +%endif + %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd.so @@ -1498,6 +1532,14 @@ fi %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %{_prefix}/lib/systemd/network/*.network %{_prefix}/lib/systemd/network/*.network.example +%{_prefix}/lib/systemd/systemd-network-generator +%{_prefix}/lib/systemd/systemd-networkd +%{_prefix}/lib/systemd/systemd-networkd-wait-online +%{_unitdir}/systemd-networkd.service +%{_unitdir}/systemd-networkd.socket +%{_unitdir}/systemd-networkd-wait-online.service +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl From fa9b776f47ad90a7d63ad6964eb1f798b98a03e70537f262b272f88e03db67c6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 17 Apr 2020 22:29:56 +0000 Subject: [PATCH 048/124] Accepting request 794369 from Base:System OBS-URL: https://build.opensuse.org/request/show/794369 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=306 --- ...-mark-as-redundant-if-deps-are-relev.patch | 155 ++++++++++++++++++ ...of-udev-path_id_compat-builtin-with-.patch | 27 +++ systemd-mini.changes | 64 ++++++++ systemd-mini.spec | 14 +- systemd-v244+suse.138.gf8adabc2b1.tar.xz | 3 - systemd-v245+suse.83.gc5aa158173.tar.xz | 3 + systemd.changes | 64 ++++++++ systemd.spec | 14 +- 8 files changed, 337 insertions(+), 7 deletions(-) create mode 100644 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch create mode 100644 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch delete mode 100644 systemd-v244+suse.138.gf8adabc2b1.tar.xz create mode 100644 systemd-v245+suse.83.gc5aa158173.tar.xz diff --git a/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch b/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch new file mode 100644 index 00000000..8208646f --- /dev/null +++ b/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch @@ -0,0 +1,155 @@ +From a9906d1f4aeeaa39a2d57563d23cb7cdd9283bf8 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Wed, 18 Mar 2020 16:18:46 +0100 +Subject: [PATCH 1/1] Revert "job: Don't mark as redundant if deps are + relevant" + +This reverts commit 097537f07a2fab3cb73aef7bc59f2a66aa93f533, which involves a +significant behavior change which at least impacts plymouth [1] and some of the +services shipped by systemd (systemd-vconsole-setup.service). + +Of course some other units shipped by other packages might rely on the old +behavior [2], which makes me wonder why this patch wasn't simply reverted until +the situation gets clarified, at least that what the author of the change +thinks too [3]. + +[1] https://bugzilla.redhat.com/show_bug.cgi?id=1807771 +[2] https://github.com/systemd/systemd/issues/15091#issuecomment-598238061 +[3] https://github.com/systemd/systemd/pull/14086#issuecomment-598600479 +--- + src/core/job.c | 51 +++++++------------------------------------------- + src/core/job.h | 3 +-- + src/core/transaction.c | 8 ++++---- + 3 files changed, 12 insertions(+), 50 deletions(-) + +diff --git a/src/core/job.c b/src/core/job.c +index 9fe30359df..8610496109 100644 +--- a/src/core/job.c ++++ b/src/core/job.c +@@ -383,62 +383,25 @@ JobType job_type_lookup_merge(JobType a, JobType b) { + return job_merging_table[(a - 1) * a / 2 + b]; + } + +-bool job_later_link_matters(Job *j, JobType type, unsigned generation) { +- JobDependency *l; +- +- assert(j); +- +- j->generation = generation; +- +- LIST_FOREACH(subject, l, j->subject_list) { +- UnitActiveState state = _UNIT_ACTIVE_STATE_INVALID; +- +- /* Have we seen this before? */ +- if (l->object->generation == generation) +- continue; +- +- state = unit_active_state(l->object->unit); +- switch (type) { +- +- case JOB_START: +- return IN_SET(state, UNIT_INACTIVE, UNIT_FAILED) || +- job_later_link_matters(l->object, type, generation); +- +- case JOB_STOP: +- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING) || +- job_later_link_matters(l->object, type, generation); +- +- default: +- assert_not_reached("Invalid job type"); +- } +- } +- +- return false; +-} +- +-bool job_is_redundant(Job *j, unsigned generation) { +- +- assert(j); +- +- UnitActiveState state = unit_active_state(j->unit); +- switch (j->type) { ++bool job_type_is_redundant(JobType a, UnitActiveState b) { ++ switch (a) { + + case JOB_START: +- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING) && !job_later_link_matters(j, JOB_START, generation); ++ return IN_SET(b, UNIT_ACTIVE, UNIT_RELOADING); + + case JOB_STOP: +- return IN_SET(state, UNIT_INACTIVE, UNIT_FAILED) && !job_later_link_matters(j, JOB_STOP, generation); ++ return IN_SET(b, UNIT_INACTIVE, UNIT_FAILED); + + case JOB_VERIFY_ACTIVE: +- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING); ++ return IN_SET(b, UNIT_ACTIVE, UNIT_RELOADING); + + case JOB_RELOAD: + return +- state == UNIT_RELOADING; ++ b == UNIT_RELOADING; + + case JOB_RESTART: + return +- state == UNIT_ACTIVATING; ++ b == UNIT_ACTIVATING; + + case JOB_NOP: + return true; +diff --git a/src/core/job.h b/src/core/job.h +index 02b057ee06..03ad640618 100644 +--- a/src/core/job.h ++++ b/src/core/job.h +@@ -196,8 +196,7 @@ _pure_ static inline bool job_type_is_superset(JobType a, JobType b) { + return a == job_type_lookup_merge(a, b); + } + +-bool job_later_link_matters(Job *j, JobType type, unsigned generation); +-bool job_is_redundant(Job *j, unsigned generation); ++bool job_type_is_redundant(JobType a, UnitActiveState b) _pure_; + + /* Collapses a state-dependent job type into a simpler type by observing + * the state of the unit which it is going to be applied to. */ +diff --git a/src/core/transaction.c b/src/core/transaction.c +index 49f43e0327..6dc4e95beb 100644 +--- a/src/core/transaction.c ++++ b/src/core/transaction.c +@@ -279,7 +279,7 @@ static int transaction_merge_jobs(Transaction *tr, sd_bus_error *e) { + return 0; + } + +-static void transaction_drop_redundant(Transaction *tr, unsigned generation) { ++static void transaction_drop_redundant(Transaction *tr) { + bool again; + + /* Goes through the transaction and removes all jobs of the units whose jobs are all noops. If not +@@ -299,7 +299,7 @@ static void transaction_drop_redundant(Transaction *tr, unsigned generation) { + + LIST_FOREACH(transaction, k, j) + if (tr->anchor_job == k || +- !job_is_redundant(k, generation) || ++ !job_type_is_redundant(k->type, unit_active_state(k->unit)) || + (k->unit->job && job_type_is_conflicting(k->type, k->unit->job->type))) { + keep = true; + break; +@@ -732,7 +732,7 @@ int transaction_activate( + transaction_minimize_impact(tr); + + /* Third step: Drop redundant jobs */ +- transaction_drop_redundant(tr, generation++); ++ transaction_drop_redundant(tr); + + for (;;) { + /* Fourth step: Let's remove unneeded jobs that might +@@ -774,7 +774,7 @@ int transaction_activate( + } + + /* Eights step: Drop redundant jobs again, if the merging now allows us to drop more. */ +- transaction_drop_redundant(tr, generation++); ++ transaction_drop_redundant(tr); + + /* Ninth step: check whether we can actually apply this */ + r = transaction_is_destructive(tr, mode, e); +-- +2.16.4 + diff --git a/0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch b/0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch new file mode 100644 index 00000000..eec892b1 --- /dev/null +++ b/0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch @@ -0,0 +1,27 @@ +From 525cbb666e260770ad191d06dac0ab79e341bbe2 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Mon, 6 Apr 2020 11:50:29 +0200 +Subject: [PATCH 1/1] meson: fix build of udev 'path_id_compat' builtin with + meson 0.54 + +Since meson 0.54, branch compats/udev-compat-symlinks needs this fix but it +should be applied while merging compats/udev-compat-symlinks branch. +--- + src/udev/compat/meson.build | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/udev/compat/meson.build b/src/udev/compat/meson.build +index 3d683c7ce9..18df75222d 100644 +--- a/src/udev/compat/meson.build ++++ b/src/udev/compat/meson.build +@@ -4,7 +4,6 @@ foreach prog : ['path_id_compat.c'] + prog, + include_directories : includes, + c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], +- link_with : [libudev_internal], + link_with : [libudev_static], + install_rpath : udev_rpath, + install : true, +-- +2.16.4 + diff --git a/systemd-mini.changes b/systemd-mini.changes index d82f8db4..c744640f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Wed Apr 15 19:06:27 UTC 2020 - Franck Bui + +- Switch back to the hybrid hierarchy + + Unfortunately Kubernetes and runc are not yet ready for + cgroupsv2. Let's reconsider the unified hierarchy in a couple of + months. + +------------------------------------------------------------------- +Mon Apr 6 12:42:01 UTC 2020 - Franck Bui + +- Import commit c5aa158173ced05201182d1cc18632a25cf43b94 (merge v245.4) + +------------------------------------------------------------------- +Mon Apr 6 10:02:33 UTC 2020 - Franck Bui + +- Add 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch + +------------------------------------------------------------------- +Thu Mar 19 09:32:41 UTC 2020 - Franck Bui + +- Import commit 31f82b39c811b4f731c80c2c2e7c56a0ca924a5b (merge v245.2) + + d1d3f2aa15 docs: Add syntax for templated units to systemd.preset man page + 3c69813c69 man: add a tiny bit of markup + bf595e788c home: fix segfault when parsing arguments in PAM module + e110f4dacb test: wait a bit after starting the test service + e8df08cfdb fix journalctl regression (#15099) + eb3a38cc23 NEWS: add late note about job trimming issue + 405f0fcfdd systemctl: hide the 'glyph' column when --no-legend is requested + 1c7de81f89 format-table: allow hiding a specific column + b7f2308bda core: transition to FINAL_SIGTERM state after ExecStopPost= + 2867dfbf70 journalctl: show duplicate entries if they are from the same file (#14898) + [...] + +------------------------------------------------------------------- +Wed Mar 18 14:09:57 UTC 2020 - Franck Bui + +- Upgrade to v245 (commit 74e2e834b4282c9bbdc12014f6ccf8d86e542b8d) + + See https://github.com/openSUSE/systemd/blob/SUSE/v245/NEWS for + details. + + The new tools provided by systemd repart, userdb, homed, fdisk, + pwquality, p11kit feature have been disabled for now as they require + reviews first. + + Default to the "unified" cgroup hierarchy. Indeed most prominent + users of cgroup (such as libvirt, kubic) should be ready for such + change. It's still possible to switch back to the old "hybrid" + hierarchy by passing "systemd.unified_cgroup_hierarchy=0" option to + the kernel command line though. + + Added 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch: + upstream commit 097537f07a2fab3cb73aef7bc59f2a66aa93f533 has been + reverted for now on as it introduced a behavior change which has + impacted plymouth at least. + +------------------------------------------------------------------- +Fri Mar 13 13:15:10 UTC 2020 - Elisei Roca + +- add systemd-network-generator.service file together with systemd-network-generator binary + ------------------------------------------------------------------- Wed Feb 19 17:24:35 UTC 2020 - Ludwig Nussel diff --git a/systemd-mini.spec b/systemd-mini.spec index 8bca5950..df5cbc16 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.138.gf8adabc2b1 +%define suse_version +suse.83.gc5aa158173 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 244 +Version: 245 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -167,6 +167,8 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # merged by upstream. Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch +Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +Patch4: 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -514,6 +516,12 @@ ntp_servers=({0..3}.suse.pool.ntp.org) -Dima=false \ -Delfutils=auto \ -Dpstore=false \ + -Drepart=false \ + -Duserdb=false \ + -Dhomed=false \ + -Dfdisk=false \ + -Dpwquality=false \ + -Dp11kit=false \ %if ! 0%{?bootstrap} -Dman=true \ -Dhtml=true \ @@ -1093,6 +1101,7 @@ fi %exclude %{_prefix}/lib/systemd/systemd-network-generator %exclude %{_prefix}/lib/systemd/systemd-networkd %exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online +%exclude %{_unitdir}/systemd-network-generator.service %exclude %{_unitdir}/systemd-networkd.service %exclude %{_unitdir}/systemd-networkd.socket %exclude %{_unitdir}/systemd-networkd-wait-online.service @@ -1537,6 +1546,7 @@ fi %{_prefix}/lib/systemd/systemd-network-generator %{_prefix}/lib/systemd/systemd-networkd %{_prefix}/lib/systemd/systemd-networkd-wait-online +%{_unitdir}/systemd-network-generator.service %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service diff --git a/systemd-v244+suse.138.gf8adabc2b1.tar.xz b/systemd-v244+suse.138.gf8adabc2b1.tar.xz deleted file mode 100644 index 39fec5db..00000000 --- a/systemd-v244+suse.138.gf8adabc2b1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c7c4ae099d4a421225778043d0ce9bb9f3d3a59186eb7da173e5f35edbc218c5 -size 5784940 diff --git a/systemd-v245+suse.83.gc5aa158173.tar.xz b/systemd-v245+suse.83.gc5aa158173.tar.xz new file mode 100644 index 00000000..87332152 --- /dev/null +++ b/systemd-v245+suse.83.gc5aa158173.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3b009a26844f93454787168fceccca97ab585f628ec937bbc4be501d6c6ab3f8 +size 6156740 diff --git a/systemd.changes b/systemd.changes index d82f8db4..c744640f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,67 @@ +------------------------------------------------------------------- +Wed Apr 15 19:06:27 UTC 2020 - Franck Bui + +- Switch back to the hybrid hierarchy + + Unfortunately Kubernetes and runc are not yet ready for + cgroupsv2. Let's reconsider the unified hierarchy in a couple of + months. + +------------------------------------------------------------------- +Mon Apr 6 12:42:01 UTC 2020 - Franck Bui + +- Import commit c5aa158173ced05201182d1cc18632a25cf43b94 (merge v245.4) + +------------------------------------------------------------------- +Mon Apr 6 10:02:33 UTC 2020 - Franck Bui + +- Add 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch + +------------------------------------------------------------------- +Thu Mar 19 09:32:41 UTC 2020 - Franck Bui + +- Import commit 31f82b39c811b4f731c80c2c2e7c56a0ca924a5b (merge v245.2) + + d1d3f2aa15 docs: Add syntax for templated units to systemd.preset man page + 3c69813c69 man: add a tiny bit of markup + bf595e788c home: fix segfault when parsing arguments in PAM module + e110f4dacb test: wait a bit after starting the test service + e8df08cfdb fix journalctl regression (#15099) + eb3a38cc23 NEWS: add late note about job trimming issue + 405f0fcfdd systemctl: hide the 'glyph' column when --no-legend is requested + 1c7de81f89 format-table: allow hiding a specific column + b7f2308bda core: transition to FINAL_SIGTERM state after ExecStopPost= + 2867dfbf70 journalctl: show duplicate entries if they are from the same file (#14898) + [...] + +------------------------------------------------------------------- +Wed Mar 18 14:09:57 UTC 2020 - Franck Bui + +- Upgrade to v245 (commit 74e2e834b4282c9bbdc12014f6ccf8d86e542b8d) + + See https://github.com/openSUSE/systemd/blob/SUSE/v245/NEWS for + details. + + The new tools provided by systemd repart, userdb, homed, fdisk, + pwquality, p11kit feature have been disabled for now as they require + reviews first. + + Default to the "unified" cgroup hierarchy. Indeed most prominent + users of cgroup (such as libvirt, kubic) should be ready for such + change. It's still possible to switch back to the old "hybrid" + hierarchy by passing "systemd.unified_cgroup_hierarchy=0" option to + the kernel command line though. + + Added 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch: + upstream commit 097537f07a2fab3cb73aef7bc59f2a66aa93f533 has been + reverted for now on as it introduced a behavior change which has + impacted plymouth at least. + +------------------------------------------------------------------- +Fri Mar 13 13:15:10 UTC 2020 - Elisei Roca + +- add systemd-network-generator.service file together with systemd-network-generator binary + ------------------------------------------------------------------- Wed Feb 19 17:24:35 UTC 2020 - Ludwig Nussel diff --git a/systemd.spec b/systemd.spec index 2e36aa55..293d7fef 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.138.gf8adabc2b1 +%define suse_version +suse.83.gc5aa158173 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 244 +Version: 245 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -165,6 +165,8 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # merged by upstream. Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch +Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +Patch4: 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -512,6 +514,12 @@ ntp_servers=({0..3}.suse.pool.ntp.org) -Dima=false \ -Delfutils=auto \ -Dpstore=false \ + -Drepart=false \ + -Duserdb=false \ + -Dhomed=false \ + -Dfdisk=false \ + -Dpwquality=false \ + -Dp11kit=false \ %if ! 0%{?bootstrap} -Dman=true \ -Dhtml=true \ @@ -1091,6 +1099,7 @@ fi %exclude %{_prefix}/lib/systemd/systemd-network-generator %exclude %{_prefix}/lib/systemd/systemd-networkd %exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online +%exclude %{_unitdir}/systemd-network-generator.service %exclude %{_unitdir}/systemd-networkd.service %exclude %{_unitdir}/systemd-networkd.socket %exclude %{_unitdir}/systemd-networkd-wait-online.service @@ -1535,6 +1544,7 @@ fi %{_prefix}/lib/systemd/systemd-network-generator %{_prefix}/lib/systemd/systemd-networkd %{_prefix}/lib/systemd/systemd-networkd-wait-online +%{_unitdir}/systemd-network-generator.service %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service From 815d358fde5387334762706d9fec5badbe188b31c37f9dc4ca99a6d4e4d05117 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 25 Apr 2020 18:16:51 +0000 Subject: [PATCH 049/124] Accepting request 796797 from Base:System OBS-URL: https://build.opensuse.org/request/show/796797 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=307 --- ...of-udev-path_id_compat-builtin-with-.patch | 27 ------------------- systemd-mini.changes | 27 +++++++++++++++++++ systemd-mini.spec | 4 +-- systemd-v245+suse.117.g08cd65ac38.tar.xz | 3 +++ systemd-v245+suse.83.gc5aa158173.tar.xz | 3 --- systemd.changes | 27 +++++++++++++++++++ systemd.spec | 4 +-- 7 files changed, 59 insertions(+), 36 deletions(-) delete mode 100644 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch create mode 100644 systemd-v245+suse.117.g08cd65ac38.tar.xz delete mode 100644 systemd-v245+suse.83.gc5aa158173.tar.xz diff --git a/0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch b/0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch deleted file mode 100644 index eec892b1..00000000 --- a/0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 525cbb666e260770ad191d06dac0ab79e341bbe2 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Mon, 6 Apr 2020 11:50:29 +0200 -Subject: [PATCH 1/1] meson: fix build of udev 'path_id_compat' builtin with - meson 0.54 - -Since meson 0.54, branch compats/udev-compat-symlinks needs this fix but it -should be applied while merging compats/udev-compat-symlinks branch. ---- - src/udev/compat/meson.build | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/src/udev/compat/meson.build b/src/udev/compat/meson.build -index 3d683c7ce9..18df75222d 100644 ---- a/src/udev/compat/meson.build -+++ b/src/udev/compat/meson.build -@@ -4,7 +4,6 @@ foreach prog : ['path_id_compat.c'] - prog, - include_directories : includes, - c_args : ['-DLOG_REALM=LOG_REALM_UDEV'], -- link_with : [libudev_internal], - link_with : [libudev_static], - install_rpath : udev_rpath, - install : true, --- -2.16.4 - diff --git a/systemd-mini.changes b/systemd-mini.changes index c744640f..3a6a38af 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Fri Apr 24 07:38:48 UTC 2020 - Franck Bui + +- Drop %tmpfiles_create portables.conf from %post of networkd sub-package + + It was probably mistakenly added because systemd-portable served as + template for systemd-network. + +------------------------------------------------------------------- +Thu Apr 23 14:17:31 UTC 2020 - Franck Bui + +- Import commit 08cd65ac385c884ed6e4bd71128a0796f56ecd17 (include merge of v245.5) + + 1ceedf8535 meson: fix build of udev 'path_id_compat' builtin with meson 0.54 + e61569d4a9 pid1: by default make user units inherit their umask from the user manager (bsc#1162698) + 64fdacd5f1 user-util: rework how we validate user names (bsc#1170272) + [...] + +------------------------------------------------------------------- +Thu Apr 23 14:00:42 UTC 2020 - Franck Bui + +- Drop 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch + + It's been merged in 'openSUSE-Factory' branch otherwise this branch + won't build anymore since meson has been upgraded to version 0.54 in + Factory. + ------------------------------------------------------------------- Wed Apr 15 19:06:27 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index df5cbc16..c34ec20d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.83.gc5aa158173 +%define suse_version +suse.117.g08cd65ac38 %bcond_with gnuefi %if 0%{?bootstrap} @@ -168,7 +168,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch -Patch4: 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -976,7 +975,6 @@ fi %endif %post network -%tmpfiles_create portables.conf %if %{with networkd} %service_add_post systemd-networkd.service %service_add_post systemd-networkd-wait-online.service diff --git a/systemd-v245+suse.117.g08cd65ac38.tar.xz b/systemd-v245+suse.117.g08cd65ac38.tar.xz new file mode 100644 index 00000000..0eaa637a --- /dev/null +++ b/systemd-v245+suse.117.g08cd65ac38.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c015d9db3328696f69f9d051f71b859b84963dd7090eddafb209728224afd426 +size 6171008 diff --git a/systemd-v245+suse.83.gc5aa158173.tar.xz b/systemd-v245+suse.83.gc5aa158173.tar.xz deleted file mode 100644 index 87332152..00000000 --- a/systemd-v245+suse.83.gc5aa158173.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3b009a26844f93454787168fceccca97ab585f628ec937bbc4be501d6c6ab3f8 -size 6156740 diff --git a/systemd.changes b/systemd.changes index c744640f..3a6a38af 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Fri Apr 24 07:38:48 UTC 2020 - Franck Bui + +- Drop %tmpfiles_create portables.conf from %post of networkd sub-package + + It was probably mistakenly added because systemd-portable served as + template for systemd-network. + +------------------------------------------------------------------- +Thu Apr 23 14:17:31 UTC 2020 - Franck Bui + +- Import commit 08cd65ac385c884ed6e4bd71128a0796f56ecd17 (include merge of v245.5) + + 1ceedf8535 meson: fix build of udev 'path_id_compat' builtin with meson 0.54 + e61569d4a9 pid1: by default make user units inherit their umask from the user manager (bsc#1162698) + 64fdacd5f1 user-util: rework how we validate user names (bsc#1170272) + [...] + +------------------------------------------------------------------- +Thu Apr 23 14:00:42 UTC 2020 - Franck Bui + +- Drop 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch + + It's been merged in 'openSUSE-Factory' branch otherwise this branch + won't build anymore since meson has been upgraded to version 0.54 in + Factory. + ------------------------------------------------------------------- Wed Apr 15 19:06:27 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 293d7fef..917aee96 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.83.gc5aa158173 +%define suse_version +suse.117.g08cd65ac38 %bcond_with gnuefi %if 0%{?bootstrap} @@ -166,7 +166,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch -Patch4: 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -974,7 +973,6 @@ fi %endif %post network -%tmpfiles_create portables.conf %if %{with networkd} %service_add_post systemd-networkd.service %service_add_post systemd-networkd-wait-online.service From e1ea380ccf9d275d65cbfe2e185be2b96c3138390c361487765c2bf195f5691f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 27 Apr 2020 21:31:03 +0000 Subject: [PATCH 050/124] Accepting request 798264 from Base:System OBS-URL: https://build.opensuse.org/request/show/798264 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=308 --- systemd-mini.changes | 3 +++ systemd.changes | 3 +++ 2 files changed, 6 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 3a6a38af..ad86ea9d 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -16,6 +16,9 @@ Thu Apr 23 14:17:31 UTC 2020 - Franck Bui 64fdacd5f1 user-util: rework how we validate user names (bsc#1170272) [...] + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/c5aa158173ced05201182d1cc18632a25cf43b94...08cd65ac385c884ed6e4bd71128a0796f56ecd17 + ------------------------------------------------------------------- Thu Apr 23 14:00:42 UTC 2020 - Franck Bui diff --git a/systemd.changes b/systemd.changes index 3a6a38af..ad86ea9d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -16,6 +16,9 @@ Thu Apr 23 14:17:31 UTC 2020 - Franck Bui 64fdacd5f1 user-util: rework how we validate user names (bsc#1170272) [...] + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/c5aa158173ced05201182d1cc18632a25cf43b94...08cd65ac385c884ed6e4bd71128a0796f56ecd17 + ------------------------------------------------------------------- Thu Apr 23 14:00:42 UTC 2020 - Franck Bui From 43dfa52de9e17a942cf0dc620394babc18c07bc105e624f6888bf446da3674ef Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 29 Apr 2020 18:42:06 +0000 Subject: [PATCH 051/124] Accepting request 798578 from Base:System OBS-URL: https://build.opensuse.org/request/show/798578 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=309 --- ...lock-group-to-follow-openSUSE-policy.patch | 38 ----------------- ...E-policy-do-not-clean-tmp-by-default.patch | 26 ------------ systemd-mini.changes | 31 ++++++++++++++ systemd-mini.spec | 42 ++++++++++++++----- systemd.changes | 31 ++++++++++++++ systemd.spec | 42 ++++++++++++++----- tmpfiles-suse.conf | 15 +++++++ 7 files changed, 139 insertions(+), 86 deletions(-) delete mode 100644 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch delete mode 100644 0001-SUSE-policy-do-not-clean-tmp-by-default.patch create mode 100644 tmpfiles-suse.conf diff --git a/0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch b/0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch deleted file mode 100644 index 66eeece9..00000000 --- a/0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch +++ /dev/null @@ -1,38 +0,0 @@ -From ca2788b478d763e49d2463378272d9fef2ef1bf3 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Mon, 9 May 2016 16:10:21 +0200 -Subject: [PATCH 1/1] Fix /run/lock group to follow openSUSE policy - -This is a partial import of commit -88013cabb939e4bd7347ce324c9eb9c1a45582de part of SUSE/v210 branch. - -However /var/lock/{subsys,lockdev} are left alone and will be created -because: - -- a bug was opened requesting /var/lock/subsys, see commit -0671c57670fc09e0cb970d081a1b523ea9c62b5b. - -- creating /var/lock/lockdev shouldn't hurt. - -[fixes: bnc#733523] ---- - tmpfiles.d/legacy.conf | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/tmpfiles.d/legacy.conf b/tmpfiles.d/legacy.conf -index 62e2ae0986..415918f407 100644 ---- a/tmpfiles.d/legacy.conf -+++ b/tmpfiles.d/legacy.conf -@@ -10,7 +10,8 @@ - # These files are considered legacy and are unnecessary on legacy-free - # systems. - --d /run/lock 0755 root root - -+# On openSUSE, /run/lock is owned by the 'lock' group. -+d /run/lock 0775 root lock - - L /var/lock - - - - ../run/lock - - # /run/lock/subsys is used for serializing SysV service execution, and --- -2.16.4 - diff --git a/0001-SUSE-policy-do-not-clean-tmp-by-default.patch b/0001-SUSE-policy-do-not-clean-tmp-by-default.patch deleted file mode 100644 index 6f37b2d6..00000000 --- a/0001-SUSE-policy-do-not-clean-tmp-by-default.patch +++ /dev/null @@ -1,26 +0,0 @@ -From b66a7b4b5aa25a1ffb4b76fe9545046dabd92c03 Mon Sep 17 00:00:00 2001 -From: Reinhard Max -Date: Fri, 19 Apr 2013 16:56:26 +0200 -Subject: [PATCH 1/1] SUSE policy: do not clean /tmp by default. - -Fix regression in the default for tmp auto-deletion (FATE#314974). ---- - tmpfiles.d/tmp.conf | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tmpfiles.d/tmp.conf b/tmpfiles.d/tmp.conf -index fe5225d751..dedc7569e1 100644 ---- a/tmpfiles.d/tmp.conf -+++ b/tmpfiles.d/tmp.conf -@@ -8,5 +8,6 @@ - # See tmpfiles.d(5) for details - - # Clear tmp directories separately, to make them easier to override --q /tmp 1777 root root 10d --q /var/tmp 1777 root root 30d -+# SUSE policy: we don't clean those directories -+q /tmp 1777 root root - -+q /var/tmp 1777 root root - --- -2.16.4 - diff --git a/systemd-mini.changes b/systemd-mini.changes index ad86ea9d..2f5136ec 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Apr 27 15:45:50 UTC 2020 - Franck Bui + +- Drop legacy /sbin/{udevd,udevadm) symlinks hopefully for good + + Since boo#1160890 has been fixed since a couple of months now. + +------------------------------------------------------------------- +Mon Apr 27 14:50:36 UTC 2020 - Franck Bui + +- Drop content of /usr/share/factory/ (bsc#1170146) + + systemd ships several files in /usr/share/factory/etc that are + copied to /etc in case those files are missing there. Unfortunately + the content does not match the openSUSE defaults. + +------------------------------------------------------------------- +Mon Apr 27 14:33:35 UTC 2020 - Franck Bui + +- Drop most of the tmpfiles that deal with generic paths (bsc#1078466) + + They are problematic because some of them conflict with SUSE + defaults. Therefore it seems better to let the revelant packages + owning these paths to provide their own definitions instead. + + Meanwhile we still keep the homeless definitions in suse.conf until + a better place is found for them. + + Drop 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch + Drop 0001-SUSE-policy-do-not-clean-tmp-by-default.patch + ------------------------------------------------------------------- Fri Apr 24 07:38:48 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index c34ec20d..5644b36f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -151,6 +151,7 @@ Source2: systemd-user Source3: systemd-sysv-convert Source4: systemd-sysv-install %endif +Source5: tmpfiles-suse.conf Source6: baselibs.conf Source11: after-local.service Source14: kbd-model-map.legacy @@ -165,9 +166,7 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch -Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch -Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -582,12 +581,6 @@ rm %{buildroot}%{_sbindir}/resolvconf rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif -# FIXME: These obsolete symlinks are still needed by YaST so let's -# keep them until boo#1160890 is fixed. -mkdir -p %{buildroot}/sbin -ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm -ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd - %if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -741,6 +734,35 @@ rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset +# The tmpfiles dealing with the generic paths is pretty messy +# currently because: +# +# 1. filesystem package wants to define the generic paths and some of +# them conflict with the definition given by systemd in var.conf, +# see bsc#1078466. +# +# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros +# (fate#314974) which conflict with tmp.conf. +# +# 3. There're also legacy.conf which defines various legacy paths +# which either don't match the SUSE defaults or don't look needed +# at all. +# +# 4. And to finish, we don't want the part in etc.conf which imports +# default upstream files in empty /etc, see below. +# +# To keep things simple, we remove all these tmpfiles config files but +# still keep the remaining paths that still don't have a better home +# in suse.conf. +rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf +install -m 644 %{S:5} %{buildroot}%{_tmpfilesdir}/suse.conf + +# The content of the files shipped by systemd doesn't match the +# defaults used by SUSE. Don't ship those files but leave the decision +# to use the mechanism to the individual packages that actually +# consume those configs (like glibc or pam), see bsc#1170146. +rm -fr %{buildroot}%{_datadir}/factory/* + # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored # though, i.e. not overwritten; needed as long as YaST uses console @@ -1353,8 +1375,6 @@ fi %files -n udev%{?mini} %defattr(-,root,root) -/sbin/udevd -/sbin/udevadm %{_bindir}/udevadm %{_bindir}/systemd-hwdb %dir %{_prefix}/lib/udev/ diff --git a/systemd.changes b/systemd.changes index ad86ea9d..2f5136ec 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Mon Apr 27 15:45:50 UTC 2020 - Franck Bui + +- Drop legacy /sbin/{udevd,udevadm) symlinks hopefully for good + + Since boo#1160890 has been fixed since a couple of months now. + +------------------------------------------------------------------- +Mon Apr 27 14:50:36 UTC 2020 - Franck Bui + +- Drop content of /usr/share/factory/ (bsc#1170146) + + systemd ships several files in /usr/share/factory/etc that are + copied to /etc in case those files are missing there. Unfortunately + the content does not match the openSUSE defaults. + +------------------------------------------------------------------- +Mon Apr 27 14:33:35 UTC 2020 - Franck Bui + +- Drop most of the tmpfiles that deal with generic paths (bsc#1078466) + + They are problematic because some of them conflict with SUSE + defaults. Therefore it seems better to let the revelant packages + owning these paths to provide their own definitions instead. + + Meanwhile we still keep the homeless definitions in suse.conf until + a better place is found for them. + + Drop 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch + Drop 0001-SUSE-policy-do-not-clean-tmp-by-default.patch + ------------------------------------------------------------------- Fri Apr 24 07:38:48 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 917aee96..efefdb63 100644 --- a/systemd.spec +++ b/systemd.spec @@ -149,6 +149,7 @@ Source2: systemd-user Source3: systemd-sysv-convert Source4: systemd-sysv-install %endif +Source5: tmpfiles-suse.conf Source6: baselibs.conf Source11: after-local.service Source14: kbd-model-map.legacy @@ -163,9 +164,7 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-SUSE-policy-do-not-clean-tmp-by-default.patch -Patch2: 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch -Patch3: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -580,12 +579,6 @@ rm %{buildroot}%{_sbindir}/resolvconf rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif -# FIXME: These obsolete symlinks are still needed by YaST so let's -# keep them until boo#1160890 is fixed. -mkdir -p %{buildroot}/sbin -ln -sf %{_bindir}/udevadm %{buildroot}/sbin/udevadm -ln -sf %{_prefix}/lib/systemd/systemd-udevd %{buildroot}/sbin/udevd - %if %{with sysvcompat} mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated @@ -739,6 +732,35 @@ rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset +# The tmpfiles dealing with the generic paths is pretty messy +# currently because: +# +# 1. filesystem package wants to define the generic paths and some of +# them conflict with the definition given by systemd in var.conf, +# see bsc#1078466. +# +# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros +# (fate#314974) which conflict with tmp.conf. +# +# 3. There're also legacy.conf which defines various legacy paths +# which either don't match the SUSE defaults or don't look needed +# at all. +# +# 4. And to finish, we don't want the part in etc.conf which imports +# default upstream files in empty /etc, see below. +# +# To keep things simple, we remove all these tmpfiles config files but +# still keep the remaining paths that still don't have a better home +# in suse.conf. +rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf +install -m 644 %{S:5} %{buildroot}%{_tmpfilesdir}/suse.conf + +# The content of the files shipped by systemd doesn't match the +# defaults used by SUSE. Don't ship those files but leave the decision +# to use the mechanism to the individual packages that actually +# consume those configs (like glibc or pam), see bsc#1170146. +rm -fr %{buildroot}%{_datadir}/factory/* + # Add entries for xkeyboard-config converted keymaps; mappings, which # already exist in original systemd mapping table are being ignored # though, i.e. not overwritten; needed as long as YaST uses console @@ -1351,8 +1373,6 @@ fi %files -n udev%{?mini} %defattr(-,root,root) -/sbin/udevd -/sbin/udevadm %{_bindir}/udevadm %{_bindir}/systemd-hwdb %dir %{_prefix}/lib/udev/ diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf new file mode 100644 index 00000000..885e852c --- /dev/null +++ b/tmpfiles-suse.conf @@ -0,0 +1,15 @@ +# +# See tmpfiles.d(5) for details +# +# Type Path Mode User Group Age Argument + +# Legacy symlink. Maybe should be owned by util-linux ? +L+ /etc/mtab - - - - ../proc/self/mounts + +# FIXME: Might be moved to lockded. +d /run/lock 0775 root lock - + +# FIXME: Should these one be moved to shadow ? +f /var/log/wtmp 0664 root utmp - +f /var/log/btmp 0660 root utmp - +f /var/log/lastlog 0664 root utmp - From d21471adebd05b69f3177bf2865c012e75f79854aaf9bfa417e3b95e29eb5112 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 11 Jun 2020 12:37:13 +0000 Subject: [PATCH 052/124] Accepting request 809898 from Base:System OBS-URL: https://build.opensuse.org/request/show/809898 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=310 --- systemd-mini-rpmlintrc | 1 + systemd-mini.changes | 19 +++++++++++++++++++ systemd-mini.spec | 3 ++- systemd-rpmlintrc | 1 + systemd-v245+suse.117.g08cd65ac38.tar.xz | 3 --- systemd-v245+suse.122.ga6d31d1a02.tar.xz | 3 +++ systemd.changes | 19 +++++++++++++++++++ systemd.spec | 3 ++- 8 files changed, 47 insertions(+), 5 deletions(-) delete mode 100644 systemd-v245+suse.117.g08cd65ac38.tar.xz create mode 100644 systemd-v245+suse.122.ga6d31d1a02.tar.xz diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index a2cefb37..9bc3777f 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -29,3 +29,4 @@ addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") addFilter(".*shlib-policy-missing-suffix.*") addFilter(".*suse-missing-rclink.*") +addFilter("env-script-interpreter") diff --git a/systemd-mini.changes b/systemd-mini.changes index 2f5136ec..c85941eb 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu May 28 09:30:33 UTC 2020 - Franck Bui + +- Import commit a6d31d1a02c2718a064bbbc40d003668acf72769 + + bb6e2f7906 pid1: update manager settings on reload too (bsc#1163109) + e9e8907b06 watchdog: reduce watchdog pings in timeout interval + 385a8f9846 udev: rename the persistent link for ATA devices (bsc#1164538) + 66018a12ae tmpfiles: remove unnecessary assert (bsc#1171145) + +------------------------------------------------------------------- +Mon May 25 08:47:22 UTC 2020 - Franck Bui + +- Disable bump of /proc/sys/fs/nr-open + + Hopefully a _temporary_ workaround until bsc#1165351 is fixed + otherwise user instances crashes the system is using NIS (and the + nscd cache is empty). + ------------------------------------------------------------------- Mon Apr 27 15:45:50 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 5644b36f..5f5aca7f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.117.g08cd65ac38 +%define suse_version +suse.122.ga6d31d1a02 %bcond_with gnuefi %if 0%{?bootstrap} @@ -506,6 +506,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org) -Ddefault-kill-user-processes=false \ -Dntp-servers="${ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ + -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ -Dselinux=auto \ diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index a2cefb37..9bc3777f 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -29,3 +29,4 @@ addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") addFilter(".*shlib-policy-missing-suffix.*") addFilter(".*suse-missing-rclink.*") +addFilter("env-script-interpreter") diff --git a/systemd-v245+suse.117.g08cd65ac38.tar.xz b/systemd-v245+suse.117.g08cd65ac38.tar.xz deleted file mode 100644 index 0eaa637a..00000000 --- a/systemd-v245+suse.117.g08cd65ac38.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c015d9db3328696f69f9d051f71b859b84963dd7090eddafb209728224afd426 -size 6171008 diff --git a/systemd-v245+suse.122.ga6d31d1a02.tar.xz b/systemd-v245+suse.122.ga6d31d1a02.tar.xz new file mode 100644 index 00000000..879f9814 --- /dev/null +++ b/systemd-v245+suse.122.ga6d31d1a02.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:edf10c3da62bb0cd6dcff78c0e836f79cb0ed65fb6b9ea5cdbbd12514a702025 +size 6173184 diff --git a/systemd.changes b/systemd.changes index 2f5136ec..c85941eb 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu May 28 09:30:33 UTC 2020 - Franck Bui + +- Import commit a6d31d1a02c2718a064bbbc40d003668acf72769 + + bb6e2f7906 pid1: update manager settings on reload too (bsc#1163109) + e9e8907b06 watchdog: reduce watchdog pings in timeout interval + 385a8f9846 udev: rename the persistent link for ATA devices (bsc#1164538) + 66018a12ae tmpfiles: remove unnecessary assert (bsc#1171145) + +------------------------------------------------------------------- +Mon May 25 08:47:22 UTC 2020 - Franck Bui + +- Disable bump of /proc/sys/fs/nr-open + + Hopefully a _temporary_ workaround until bsc#1165351 is fixed + otherwise user instances crashes the system is using NIS (and the + nscd cache is empty). + ------------------------------------------------------------------- Mon Apr 27 15:45:50 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index efefdb63..0e2921e5 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.117.g08cd65ac38 +%define suse_version +suse.122.ga6d31d1a02 %bcond_with gnuefi %if 0%{?bootstrap} @@ -504,6 +504,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org) -Ddefault-kill-user-processes=false \ -Dntp-servers="${ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ + -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ -Dselinux=auto \ From 9ff341ce06ba4da120a9bff5e1d8bfe8ddcfe758851a45e56955e95cf8cf10a5 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 24 Jun 2020 13:47:45 +0000 Subject: [PATCH 053/124] Accepting request 815935 from Base:System OBS-URL: https://build.opensuse.org/request/show/815935 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=311 --- systemd-mini.changes | 39 ++++++++++++++ systemd-mini.spec | 62 ++++++++++++----------- systemd-v245+suse.122.ga6d31d1a02.tar.xz | 3 -- systemd-v245.6+suse.48.gb12cd8b89b.tar.xz | 3 ++ systemd.changes | 39 ++++++++++++++ systemd.spec | 62 ++++++++++++----------- 6 files changed, 145 insertions(+), 63 deletions(-) delete mode 100644 systemd-v245+suse.122.ga6d31d1a02.tar.xz create mode 100644 systemd-v245.6+suse.48.gb12cd8b89b.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index c85941eb..ca453cf5 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Fri Jun 19 09:59:29 UTC 2020 - Franck Bui + +- Include in the package version the stable minor (if any). + + Also update the version shown by various command such as 'systemctl + --version' to show the stable number. + +------------------------------------------------------------------- +Wed Jun 17 18:54:11 UTC 2020 - Franck Bui + +- Don't restart udevd sockets during package update + + Otherwise we might miss kernel events as the daemon need to be + stopped as well. + +------------------------------------------------------------------- +Wed Jun 17 09:03:40 UTC 2020 - Franck Bui + +- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932 + +------------------------------------------------------------------- +Thu Jun 4 15:29:03 UTC 2020 - matthias.gerstner@suse.com + +- no longer explicitly package setgid directory /var/log/journal (bsc#1172550). + The bit will be set during %post by way of the systemd-tmpfiles invocation. + This avoids a conflict with the permissions package and an rpmlint error + popping up. + +------------------------------------------------------------------- +Fri May 29 14:32:41 UTC 2020 - Franck Bui + +- Fix build when resolved is disabled + + While at it sort the build conditionals. + ------------------------------------------------------------------- Thu May 28 09:30:33 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 5f5aca7f..09fa9f68 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,36 +26,36 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.122.ga6d31d1a02 +%define suse_version +suse.48.gb12cd8b89b %bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump -%bcond_with sysvcompat -%bcond_with machined %bcond_with importd +%bcond_with journal_remote +%bcond_with machined %bcond_with networkd %bcond_with portabled %bcond_with resolved -%bcond_with journal_remote +%bcond_with sysvcompat %else %bcond_without coredump -%bcond_without sysvcompat -%bcond_without machined -%bcond_without importd -%bcond_without networkd -%bcond_without portabled -%bcond_without resolved -%bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif +%bcond_without importd +%bcond_without journal_remote +%bcond_without machined +%bcond_without networkd +%bcond_without portabled +%bcond_without resolved +%bcond_without sysvcompat %endif %bcond_with parentpathid Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245 +Version: 245.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -492,7 +492,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org) # keep split-usr until all packages have moved their systemd rules to /usr %meson \ - -Dversion-tag=%{suse_version} \ + -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ @@ -861,15 +861,18 @@ fi # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -# Migrate i18n settings that could be previously configured in -# /etc/sysconfig but now is defined only in the systemd official -# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done -# only once usually during package updates but might be also needed -# during installations when we upgrade from a distro using SysV init. -test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { +# Migrate old i18n settings previously configured in /etc/sysconfig to +# the new locations used by systemd (/etc/locale.conf, +# /etc/vconsole.conf, ...). Recent versions of systemd parse the new +# locations only. +# +# This is needed both at package updates and package installations +# because we might be upgrading from a system which was running SysV +# init (systemd package is being installed). +if ! test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done; then %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : -} +fi %postun %systemd_postun @@ -900,13 +903,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -systemctl daemon-reload || : -# On package update: the restart of the socket units will probably -# fail as the daemon is most likely running. It's not really an issue -# since we restart systemd-udevd right after and that will pull in the -# socket units again. We should be informed at that time if something -# really went wrong the first time we started the socket units. -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null +# Restarting udevd sockets means also stopping the daemon. But we +# don't want the sockets and the daemon to be inactive at the same +# time because we might loose new events sent by the kernel during the +# package update otherwise. Hence we accept the fact that the socket +# properties might not be updated. They are unlikely changed anyway. %systemd_postun_with_restart systemd-udevd.service %posttrans -n udev%{?mini} @@ -1499,7 +1500,8 @@ fi %files logger %defattr(-,root,root) -%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ +# package without explicit setgid bit / attrs (see bsc#1172550) +%dir %{_localstatedir}/log/journal/ %doc %{_localstatedir}/log/README %files -n nss-myhostname @@ -1569,8 +1571,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -%{_prefix}/lib/systemd/systemd-resolved -%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl @@ -1580,6 +1580,8 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy %{_prefix}/lib/systemd/resolv.conf +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %endif diff --git a/systemd-v245+suse.122.ga6d31d1a02.tar.xz b/systemd-v245+suse.122.ga6d31d1a02.tar.xz deleted file mode 100644 index 879f9814..00000000 --- a/systemd-v245+suse.122.ga6d31d1a02.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:edf10c3da62bb0cd6dcff78c0e836f79cb0ed65fb6b9ea5cdbbd12514a702025 -size 6173184 diff --git a/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz b/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz new file mode 100644 index 00000000..5f55a69c --- /dev/null +++ b/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:cc34032d49edabf9df4d2342063084b79040abbebcb56fc417449d0e08f2815e +size 6175556 diff --git a/systemd.changes b/systemd.changes index c85941eb..ca453cf5 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Fri Jun 19 09:59:29 UTC 2020 - Franck Bui + +- Include in the package version the stable minor (if any). + + Also update the version shown by various command such as 'systemctl + --version' to show the stable number. + +------------------------------------------------------------------- +Wed Jun 17 18:54:11 UTC 2020 - Franck Bui + +- Don't restart udevd sockets during package update + + Otherwise we might miss kernel events as the daemon need to be + stopped as well. + +------------------------------------------------------------------- +Wed Jun 17 09:03:40 UTC 2020 - Franck Bui + +- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932 + +------------------------------------------------------------------- +Thu Jun 4 15:29:03 UTC 2020 - matthias.gerstner@suse.com + +- no longer explicitly package setgid directory /var/log/journal (bsc#1172550). + The bit will be set during %post by way of the systemd-tmpfiles invocation. + This avoids a conflict with the permissions package and an rpmlint error + popping up. + +------------------------------------------------------------------- +Fri May 29 14:32:41 UTC 2020 - Franck Bui + +- Fix build when resolved is disabled + + While at it sort the build conditionals. + ------------------------------------------------------------------- Thu May 28 09:30:33 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 0e2921e5..2fce83cf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,36 +24,36 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.122.ga6d31d1a02 +%define suse_version +suse.48.gb12cd8b89b %bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump -%bcond_with sysvcompat -%bcond_with machined %bcond_with importd +%bcond_with journal_remote +%bcond_with machined %bcond_with networkd %bcond_with portabled %bcond_with resolved -%bcond_with journal_remote +%bcond_with sysvcompat %else %bcond_without coredump -%bcond_without sysvcompat -%bcond_without machined -%bcond_without importd -%bcond_without networkd -%bcond_without portabled -%bcond_without resolved -%bcond_without journal_remote %ifarch %{ix86} x86_64 %bcond_without gnuefi %endif +%bcond_without importd +%bcond_without journal_remote +%bcond_without machined +%bcond_without networkd +%bcond_without portabled +%bcond_without resolved +%bcond_without sysvcompat %endif %bcond_with parentpathid Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245 +Version: 245.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -490,7 +490,7 @@ ntp_servers=({0..3}.suse.pool.ntp.org) # keep split-usr until all packages have moved their systemd rules to /usr %meson \ - -Dversion-tag=%{suse_version} \ + -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ -Dsplit-usr=true \ @@ -859,15 +859,18 @@ fi # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -# Migrate i18n settings that could be previously configured in -# /etc/sysconfig but now is defined only in the systemd official -# places (/etc/locale.conf, /etc/vconsole.conf, etc...). This is done -# only once usually during package updates but might be also needed -# during installations when we upgrade from a distro using SysV init. -test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || { +# Migrate old i18n settings previously configured in /etc/sysconfig to +# the new locations used by systemd (/etc/locale.conf, +# /etc/vconsole.conf, ...). Recent versions of systemd parse the new +# locations only. +# +# This is needed both at package updates and package installations +# because we might be upgrading from a system which was running SysV +# init (systemd package is being installed). +if ! test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done; then %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : -} +fi %postun %systemd_postun @@ -898,13 +901,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -systemctl daemon-reload || : -# On package update: the restart of the socket units will probably -# fail as the daemon is most likely running. It's not really an issue -# since we restart systemd-udevd right after and that will pull in the -# socket units again. We should be informed at that time if something -# really went wrong the first time we started the socket units. -%systemd_postun_with_restart systemd-udevd-{control,kernel}.socket 2>/dev/null +# Restarting udevd sockets means also stopping the daemon. But we +# don't want the sockets and the daemon to be inactive at the same +# time because we might loose new events sent by the kernel during the +# package update otherwise. Hence we accept the fact that the socket +# properties might not be updated. They are unlikely changed anyway. %systemd_postun_with_restart systemd-udevd.service %posttrans -n udev%{?mini} @@ -1497,7 +1498,8 @@ fi %files logger %defattr(-,root,root) -%dir %attr(2755,root,systemd-journal) %{_localstatedir}/log/journal/ +# package without explicit setgid bit / attrs (see bsc#1172550) +%dir %{_localstatedir}/log/journal/ %doc %{_localstatedir}/log/README %files -n nss-myhostname @@ -1567,8 +1569,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -%{_prefix}/lib/systemd/systemd-resolved -%{_unitdir}/systemd-resolved.service %endif %if %{with resolved} %{_bindir}/resolvectl @@ -1578,6 +1578,8 @@ fi %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy %{_prefix}/lib/systemd/resolv.conf +%{_prefix}/lib/systemd/systemd-resolved +%{_unitdir}/systemd-resolved.service %endif %endif From 9ea81e08d69f06e8ca6080c4c9c358275de2a40a4147efd65d0a570d1e1c5314 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 27 Jun 2020 21:20:59 +0000 Subject: [PATCH 054/124] Accepting request 816787 from Base:System OBS-URL: https://build.opensuse.org/request/show/816787 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=312 --- scripts-systemd-migrate-sysconfig-i18n.sh | 18 +++++++++++--- systemd-mini.changes | 26 ++++++++++++++++++++ systemd-mini.spec | 30 +++++++++++------------ systemd.changes | 26 ++++++++++++++++++++ systemd.spec | 30 +++++++++++------------ 5 files changed, 96 insertions(+), 34 deletions(-) diff --git a/scripts-systemd-migrate-sysconfig-i18n.sh b/scripts-systemd-migrate-sysconfig-i18n.sh index 02646759..432e9e74 100644 --- a/scripts-systemd-migrate-sysconfig-i18n.sh +++ b/scripts-systemd-migrate-sysconfig-i18n.sh @@ -128,8 +128,18 @@ migrate_language () { fi } -migrate_locale; rv1=$? -migrate_keyboard; rv2=$? -migrate_language; rv3=$? -test $((rv1 + rv2 + rv3)) -eq 0 +# The marker could have been incorrectly put in /usr/lib. In this case +# move it to its new place. +mv /usr/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done \ + /var/lib/systemd/i18n-migrated &>/dev/null + +if ! test -e /var/lib/systemd/i18n-migrated; then + declare -i rv=0 + + migrate_locale; rv+=$? + migrate_keyboard; rv+=$? + migrate_language; rv+=$? + + test $rv -eq 0 && touch /var/lib/systemd/i18n-migrated +fi diff --git a/systemd-mini.changes b/systemd-mini.changes index ca453cf5..0fd3cfe4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Jun 24 06:33:33 UTC 2020 - Franck Bui + +- migrate-sysconfig-i18n.sh: fix marker handling (bsc#1173229) + + The marker is used to make sure the script is run only once. Instead + of storing it in /usr, use /var which is more appropriate for such + file. + + Also make it owned by systemd package. + +------------------------------------------------------------------- +Tue Jun 23 13:29:18 UTC 2020 - Franck Bui + +- Fix inconsistent file modes for some ghost files (bsc#1173227) + + Ghost files are assumed by rpm to have mode 000 by default which is + not consistent with file permissions set at runtime. + + Also /var/lib/systemd/random-seed was tracked wrongly as a + directory. + + Also don't track (ghost) /etc/systemd/system/runlevel*.target + aliases since we're not supposed to track units or aliases user + might define/override. + ------------------------------------------------------------------- Fri Jun 19 09:59:29 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 09fa9f68..3506747e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -672,10 +672,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog -# Create ghost databases -touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database -touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin - # Make sure the NTP units dir exists mkdir -p %{buildroot}%{_ntpunitsdir} @@ -724,8 +720,16 @@ EOF install -m 644 %{S:11} %{buildroot}%{_unitdir}/ ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/ +# ghost directories with default permissions. mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/backlight -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed + +# ghost files with default permisssions. +touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf +touch %{buildroot}%{_sysconfdir}/vconsole.conf +touch %{buildroot}%{_sysconfdir}/locale.conf +touch %{buildroot}%{_sysconfdir}/machine-info +touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database +touch %{buildroot}%{_localstatedir}/lib/systemd/i18n-migrated %fdupes -s %{buildroot}%{_mandir} @@ -869,10 +873,9 @@ fi # This is needed both at package updates and package installations # because we might be upgrading from a system which was running SysV # init (systemd package is being installed). -if ! test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done; then - %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && - touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : -fi +# +# It's run only once. +%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : %postun %systemd_postun @@ -1242,12 +1245,8 @@ fi %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf -%ghost %config(noreplace) %{_sysconfdir}/machine-id %ghost %config(noreplace) %{_sysconfdir}/machine-info -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel3.target -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target +%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id %{_datadir}/systemd %{_datadir}/factory @@ -1319,7 +1318,8 @@ fi %endif %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight -%ghost %{_localstatedir}/lib/systemd/random-seed +%ghost %{_localstatedir}/lib/systemd/i18n-migrated +%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions diff --git a/systemd.changes b/systemd.changes index ca453cf5..0fd3cfe4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Wed Jun 24 06:33:33 UTC 2020 - Franck Bui + +- migrate-sysconfig-i18n.sh: fix marker handling (bsc#1173229) + + The marker is used to make sure the script is run only once. Instead + of storing it in /usr, use /var which is more appropriate for such + file. + + Also make it owned by systemd package. + +------------------------------------------------------------------- +Tue Jun 23 13:29:18 UTC 2020 - Franck Bui + +- Fix inconsistent file modes for some ghost files (bsc#1173227) + + Ghost files are assumed by rpm to have mode 000 by default which is + not consistent with file permissions set at runtime. + + Also /var/lib/systemd/random-seed was tracked wrongly as a + directory. + + Also don't track (ghost) /etc/systemd/system/runlevel*.target + aliases since we're not supposed to track units or aliases user + might define/override. + ------------------------------------------------------------------- Fri Jun 19 09:59:29 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 2fce83cf..c96ca5e2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -670,10 +670,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog -# Create ghost databases -touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database -touch %{buildroot}%{_sysconfdir}/udev/hwdb.bin - # Make sure the NTP units dir exists mkdir -p %{buildroot}%{_ntpunitsdir} @@ -722,8 +718,16 @@ EOF install -m 644 %{S:11} %{buildroot}%{_unitdir}/ ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/ +# ghost directories with default permissions. mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/backlight -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/random-seed + +# ghost files with default permisssions. +touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf +touch %{buildroot}%{_sysconfdir}/vconsole.conf +touch %{buildroot}%{_sysconfdir}/locale.conf +touch %{buildroot}%{_sysconfdir}/machine-info +touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database +touch %{buildroot}%{_localstatedir}/lib/systemd/i18n-migrated %fdupes -s %{buildroot}%{_mandir} @@ -867,10 +871,9 @@ fi # This is needed both at package updates and package installations # because we might be upgrading from a system which was running SysV # init (systemd package is being installed). -if ! test -e %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done; then - %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh && - touch %{_prefix}/lib/systemd/scripts/.migrate-sysconfig-i18n.sh~done || : -fi +# +# It's run only once. +%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : %postun %systemd_postun @@ -1240,12 +1243,8 @@ fi %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf -%ghost %config(noreplace) %{_sysconfdir}/machine-id %ghost %config(noreplace) %{_sysconfdir}/machine-info -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel2.target -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel3.target -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target -%ghost %config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.target +%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id %{_datadir}/systemd %{_datadir}/factory @@ -1317,7 +1316,8 @@ fi %endif %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/backlight -%ghost %{_localstatedir}/lib/systemd/random-seed +%ghost %{_localstatedir}/lib/systemd/i18n-migrated +%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions From 22df5a332abb6472d4b2417dd77ec3279ebcb27b4e91b6e4d6bbb3b483e59f0b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 6 Aug 2020 08:38:21 +0000 Subject: [PATCH 055/124] Accepting request 823438 from Base:System OBS-URL: https://build.opensuse.org/request/show/823438 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=313 --- systemd-mini.changes | 5 +++++ systemd-mini.spec | 6 ------ systemd.changes | 5 +++++ systemd.spec | 6 ------ 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 0fd3cfe4..c66c0306 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 28 13:38:09 UTC 2020 - Richard Brown + +- Restore default upstream tmp.mount (/tmp as tmpfs) behaviour (boo#1173461) + ------------------------------------------------------------------- Wed Jun 24 06:33:33 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 3506747e..8c1676f9 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -617,12 +617,6 @@ rm -f %{buildroot}/etc/systemd/system/default.target # Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ -# Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs -# by default on SUSE distros. We still keep a copy in /var for those -# who want to switch to tmpfs: it's still can be copied in /etc. -rm %{buildroot}/%{_unitdir}/local-fs.target.wants/tmp.mount -mv %{buildroot}/%{_unitdir}/tmp.mount %{buildroot}/%{_datadir}/systemd/ - # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path diff --git a/systemd.changes b/systemd.changes index 0fd3cfe4..c80f6f6f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Jul 28 13:38:09 UTC 2020 - Richard Brown + +- Restore default upstream tmp.mount (/tmp as tmpfs) behaviour (boo#1173461) + ------------------------------------------------------------------- Wed Jun 24 06:33:33 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index c96ca5e2..39003f7d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -615,12 +615,6 @@ rm -f %{buildroot}/etc/systemd/system/default.target # Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ -# Remove tmp.mount from the unit search path as /tmp doesn't use tmpfs -# by default on SUSE distros. We still keep a copy in /var for those -# who want to switch to tmpfs: it's still can be copied in /etc. -rm %{buildroot}/%{_unitdir}/local-fs.target.wants/tmp.mount -mv %{buildroot}/%{_unitdir}/tmp.mount %{buildroot}/%{_datadir}/systemd/ - # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path From 41d1bc257a86823a1453a8fca4a10d82b30e056b2fb1c56b08f4bfc1dac08ac8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 23 Aug 2020 07:20:30 +0000 Subject: [PATCH 056/124] Accepting request 828165 from Base:System OBS-URL: https://build.opensuse.org/request/show/828165 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=314 --- ...-mark-as-redundant-if-deps-are-relev.patch | 155 ------------------ systemd-mini.changes | 17 +- systemd-mini.spec | 5 +- systemd-v245.6+suse.48.gb12cd8b89b.tar.xz | 3 - systemd-v245.7+suse.49.g6d6d92930a.tar.xz | 3 + systemd.changes | 15 ++ systemd.spec | 5 +- 7 files changed, 38 insertions(+), 165 deletions(-) delete mode 100644 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch delete mode 100644 systemd-v245.6+suse.48.gb12cd8b89b.tar.xz create mode 100644 systemd-v245.7+suse.49.g6d6d92930a.tar.xz diff --git a/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch b/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch deleted file mode 100644 index 8208646f..00000000 --- a/0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch +++ /dev/null @@ -1,155 +0,0 @@ -From a9906d1f4aeeaa39a2d57563d23cb7cdd9283bf8 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Wed, 18 Mar 2020 16:18:46 +0100 -Subject: [PATCH 1/1] Revert "job: Don't mark as redundant if deps are - relevant" - -This reverts commit 097537f07a2fab3cb73aef7bc59f2a66aa93f533, which involves a -significant behavior change which at least impacts plymouth [1] and some of the -services shipped by systemd (systemd-vconsole-setup.service). - -Of course some other units shipped by other packages might rely on the old -behavior [2], which makes me wonder why this patch wasn't simply reverted until -the situation gets clarified, at least that what the author of the change -thinks too [3]. - -[1] https://bugzilla.redhat.com/show_bug.cgi?id=1807771 -[2] https://github.com/systemd/systemd/issues/15091#issuecomment-598238061 -[3] https://github.com/systemd/systemd/pull/14086#issuecomment-598600479 ---- - src/core/job.c | 51 +++++++------------------------------------------- - src/core/job.h | 3 +-- - src/core/transaction.c | 8 ++++---- - 3 files changed, 12 insertions(+), 50 deletions(-) - -diff --git a/src/core/job.c b/src/core/job.c -index 9fe30359df..8610496109 100644 ---- a/src/core/job.c -+++ b/src/core/job.c -@@ -383,62 +383,25 @@ JobType job_type_lookup_merge(JobType a, JobType b) { - return job_merging_table[(a - 1) * a / 2 + b]; - } - --bool job_later_link_matters(Job *j, JobType type, unsigned generation) { -- JobDependency *l; -- -- assert(j); -- -- j->generation = generation; -- -- LIST_FOREACH(subject, l, j->subject_list) { -- UnitActiveState state = _UNIT_ACTIVE_STATE_INVALID; -- -- /* Have we seen this before? */ -- if (l->object->generation == generation) -- continue; -- -- state = unit_active_state(l->object->unit); -- switch (type) { -- -- case JOB_START: -- return IN_SET(state, UNIT_INACTIVE, UNIT_FAILED) || -- job_later_link_matters(l->object, type, generation); -- -- case JOB_STOP: -- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING) || -- job_later_link_matters(l->object, type, generation); -- -- default: -- assert_not_reached("Invalid job type"); -- } -- } -- -- return false; --} -- --bool job_is_redundant(Job *j, unsigned generation) { -- -- assert(j); -- -- UnitActiveState state = unit_active_state(j->unit); -- switch (j->type) { -+bool job_type_is_redundant(JobType a, UnitActiveState b) { -+ switch (a) { - - case JOB_START: -- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING) && !job_later_link_matters(j, JOB_START, generation); -+ return IN_SET(b, UNIT_ACTIVE, UNIT_RELOADING); - - case JOB_STOP: -- return IN_SET(state, UNIT_INACTIVE, UNIT_FAILED) && !job_later_link_matters(j, JOB_STOP, generation); -+ return IN_SET(b, UNIT_INACTIVE, UNIT_FAILED); - - case JOB_VERIFY_ACTIVE: -- return IN_SET(state, UNIT_ACTIVE, UNIT_RELOADING); -+ return IN_SET(b, UNIT_ACTIVE, UNIT_RELOADING); - - case JOB_RELOAD: - return -- state == UNIT_RELOADING; -+ b == UNIT_RELOADING; - - case JOB_RESTART: - return -- state == UNIT_ACTIVATING; -+ b == UNIT_ACTIVATING; - - case JOB_NOP: - return true; -diff --git a/src/core/job.h b/src/core/job.h -index 02b057ee06..03ad640618 100644 ---- a/src/core/job.h -+++ b/src/core/job.h -@@ -196,8 +196,7 @@ _pure_ static inline bool job_type_is_superset(JobType a, JobType b) { - return a == job_type_lookup_merge(a, b); - } - --bool job_later_link_matters(Job *j, JobType type, unsigned generation); --bool job_is_redundant(Job *j, unsigned generation); -+bool job_type_is_redundant(JobType a, UnitActiveState b) _pure_; - - /* Collapses a state-dependent job type into a simpler type by observing - * the state of the unit which it is going to be applied to. */ -diff --git a/src/core/transaction.c b/src/core/transaction.c -index 49f43e0327..6dc4e95beb 100644 ---- a/src/core/transaction.c -+++ b/src/core/transaction.c -@@ -279,7 +279,7 @@ static int transaction_merge_jobs(Transaction *tr, sd_bus_error *e) { - return 0; - } - --static void transaction_drop_redundant(Transaction *tr, unsigned generation) { -+static void transaction_drop_redundant(Transaction *tr) { - bool again; - - /* Goes through the transaction and removes all jobs of the units whose jobs are all noops. If not -@@ -299,7 +299,7 @@ static void transaction_drop_redundant(Transaction *tr, unsigned generation) { - - LIST_FOREACH(transaction, k, j) - if (tr->anchor_job == k || -- !job_is_redundant(k, generation) || -+ !job_type_is_redundant(k->type, unit_active_state(k->unit)) || - (k->unit->job && job_type_is_conflicting(k->type, k->unit->job->type))) { - keep = true; - break; -@@ -732,7 +732,7 @@ int transaction_activate( - transaction_minimize_impact(tr); - - /* Third step: Drop redundant jobs */ -- transaction_drop_redundant(tr, generation++); -+ transaction_drop_redundant(tr); - - for (;;) { - /* Fourth step: Let's remove unneeded jobs that might -@@ -774,7 +774,7 @@ int transaction_activate( - } - - /* Eights step: Drop redundant jobs again, if the merging now allows us to drop more. */ -- transaction_drop_redundant(tr, generation++); -+ transaction_drop_redundant(tr); - - /* Ninth step: check whether we can actually apply this */ - r = transaction_is_destructive(tr, mode, e); --- -2.16.4 - diff --git a/systemd-mini.changes b/systemd-mini.changes index c66c0306..6d682aa4 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,7 +1,22 @@ +------------------------------------------------------------------- +Thu Aug 20 10:24:37 UTC 2020 - Franck Bui + +- Import commit 6d6d92930acad63f9b9029c305a672c32c550d2d (include merge of v245.7) + + 797ad47d3e vconsole-setup: downgrade log message when setting font fails on dummy console (bsc#1172195 bsc#1173539) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/b12cd8b89b4bccfcf972b47153a2b01cd7775932...6d6d92930acad63f9b9029c305a672c32c550d2d + +- Drop 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch + + Upstream finally reverted it and it's part of both v245.7 and master. + ------------------------------------------------------------------- Tue Jul 28 13:38:09 UTC 2020 - Richard Brown -- Restore default upstream tmp.mount (/tmp as tmpfs) behaviour (boo#1173461) +- Restore default upstream tmp.mount (/tmp as tmpfs) behaviour (boo#1173461) ------------------------------------------------------------------- Wed Jun 24 06:33:33 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 8c1676f9..2f2981e6 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.48.gb12cd8b89b +%define suse_version +suse.49.g6d6d92930a %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245.6 +Version: 245.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -166,7 +166,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB diff --git a/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz b/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz deleted file mode 100644 index 5f55a69c..00000000 --- a/systemd-v245.6+suse.48.gb12cd8b89b.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:cc34032d49edabf9df4d2342063084b79040abbebcb56fc417449d0e08f2815e -size 6175556 diff --git a/systemd-v245.7+suse.49.g6d6d92930a.tar.xz b/systemd-v245.7+suse.49.g6d6d92930a.tar.xz new file mode 100644 index 00000000..1d62bee5 --- /dev/null +++ b/systemd-v245.7+suse.49.g6d6d92930a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:309ed00d37594c68875d38be600ae9b51614a2958af6c5b73d0d5bad5ece96e3 +size 6302108 diff --git a/systemd.changes b/systemd.changes index c80f6f6f..6d682aa4 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Thu Aug 20 10:24:37 UTC 2020 - Franck Bui + +- Import commit 6d6d92930acad63f9b9029c305a672c32c550d2d (include merge of v245.7) + + 797ad47d3e vconsole-setup: downgrade log message when setting font fails on dummy console (bsc#1172195 bsc#1173539) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/b12cd8b89b4bccfcf972b47153a2b01cd7775932...6d6d92930acad63f9b9029c305a672c32c550d2d + +- Drop 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch + + Upstream finally reverted it and it's part of both v245.7 and master. + ------------------------------------------------------------------- Tue Jul 28 13:38:09 UTC 2020 - Richard Brown diff --git a/systemd.spec b/systemd.spec index 39003f7d..12d84734 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.48.gb12cd8b89b +%define suse_version +suse.49.g6d6d92930a %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245.6 +Version: 245.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -164,7 +164,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh # broken in upstream and need an urgent fix. Even in this case, the # patches are temporary and should be removed as soon as a fix is # merged by upstream. -Patch1: 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch %description Systemd is a system and service manager, compatible with SysV and LSB From cf0713e8c1c2700c53f6d4c262095584e949874f9f3c37d4c547e9dd97d3e57e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 31 Aug 2020 15:14:56 +0000 Subject: [PATCH 057/124] Accepting request 830355 from Base:System OBS-URL: https://build.opensuse.org/request/show/830355 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=315 --- systemd-mini.changes | 27 +++++++++++++++++++++++ systemd-mini.spec | 17 +++++++------- systemd-v245.7+suse.49.g6d6d92930a.tar.xz | 3 --- systemd-v245.7+suse.51.ga4e393eecb.tar.xz | 3 +++ systemd.changes | 27 +++++++++++++++++++++++ systemd.spec | 17 +++++++------- 6 files changed, 75 insertions(+), 19 deletions(-) delete mode 100644 systemd-v245.7+suse.49.g6d6d92930a.tar.xz create mode 100644 systemd-v245.7+suse.51.ga4e393eecb.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 6d682aa4..5ac5e11c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt + +- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779) + +------------------------------------------------------------------- +Wed Aug 26 09:46:46 UTC 2020 - Franck Bui + +- Import commit a4e393eecb9dbe140a6c7d57419c291d786155cf + + d8e3bd4e22 Revert "core: don't send SIGKILL to user@.service immediatly during shutdown" + +------------------------------------------------------------------- +Tue Aug 25 14:32:16 UTC 2020 - Franck Bui + +- Drop requirement on 'sysvinit-tools' + + It was used to workaround bug #886599 by explicitly calling + vhangup(8) from getty@.service so when this service was stopped a + virtually hangup on the specified terminal when were stopped to give + the shell a few seconds to save its history. + + But this workaround was dropped since it had no effect (SLE12-GM was + released with it but was still suffering from the bug) and was + replaced by commit e9db43d5910717a108, which was released from v226 + and backported to SLE12/SLE12-SP1. + ------------------------------------------------------------------- Thu Aug 20 10:24:37 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 2f2981e6..406e052f 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.49.g6d6d92930a +%define suse_version +suse.51.ga4e393eecb %bcond_with gnuefi %if 0%{?bootstrap} @@ -123,7 +123,6 @@ Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-presets-branding -Requires: sysvinit-tools Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) @@ -787,12 +786,7 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map # a %pre that needs to be run during the build. systemd is one of them # so keep the section even if it's empty. %pre -if [ $1 -gt 1 ] ; then - case "$(systemctl show -pFragmentPath tmp.mount)" in - FragmentPath=/usr/lib/systemd/system/tmp.mount) - ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || : - esac -fi +: %post # Make /etc/machine-id an empty file during package installation. On @@ -870,6 +864,13 @@ fi # It's run only once. %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : +# Previous versions had tmp.mount moved to /usr/share/systemd/tmp.mount. +# It could be symlinked into /etc to make /tmp a tmpfs. The file does not exist anymore, +# so migrate the link to the new location. +if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then + ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount +fi + %postun %systemd_postun # Avoid restarting logind until fixed upstream (issue #1163) diff --git a/systemd-v245.7+suse.49.g6d6d92930a.tar.xz b/systemd-v245.7+suse.49.g6d6d92930a.tar.xz deleted file mode 100644 index 1d62bee5..00000000 --- a/systemd-v245.7+suse.49.g6d6d92930a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:309ed00d37594c68875d38be600ae9b51614a2958af6c5b73d0d5bad5ece96e3 -size 6302108 diff --git a/systemd-v245.7+suse.51.ga4e393eecb.tar.xz b/systemd-v245.7+suse.51.ga4e393eecb.tar.xz new file mode 100644 index 00000000..815e59f1 --- /dev/null +++ b/systemd-v245.7+suse.51.ga4e393eecb.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e0cce0a5990f8ddc03e1dcdb1af7f20331e3e885596710f8a68563882c50d31e +size 6301856 diff --git a/systemd.changes b/systemd.changes index 6d682aa4..5ac5e11c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt + +- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779) + +------------------------------------------------------------------- +Wed Aug 26 09:46:46 UTC 2020 - Franck Bui + +- Import commit a4e393eecb9dbe140a6c7d57419c291d786155cf + + d8e3bd4e22 Revert "core: don't send SIGKILL to user@.service immediatly during shutdown" + +------------------------------------------------------------------- +Tue Aug 25 14:32:16 UTC 2020 - Franck Bui + +- Drop requirement on 'sysvinit-tools' + + It was used to workaround bug #886599 by explicitly calling + vhangup(8) from getty@.service so when this service was stopped a + virtually hangup on the specified terminal when were stopped to give + the shell a few seconds to save its history. + + But this workaround was dropped since it had no effect (SLE12-GM was + released with it but was still suffering from the bug) and was + replaced by commit e9db43d5910717a108, which was released from v226 + and backported to SLE12/SLE12-SP1. + ------------------------------------------------------------------- Thu Aug 20 10:24:37 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 12d84734..2d9078cb 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.49.g6d6d92930a +%define suse_version +suse.51.ga4e393eecb %bcond_with gnuefi %if 0%{?bootstrap} @@ -121,7 +121,6 @@ Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-presets-branding -Requires: sysvinit-tools Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) @@ -785,12 +784,7 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map # a %pre that needs to be run during the build. systemd is one of them # so keep the section even if it's empty. %pre -if [ $1 -gt 1 ] ; then - case "$(systemctl show -pFragmentPath tmp.mount)" in - FragmentPath=/usr/lib/systemd/system/tmp.mount) - ln -sf %{_datadir}/systemd/tmp.mount /etc/systemd/system/ || : - esac -fi +: %post # Make /etc/machine-id an empty file during package installation. On @@ -868,6 +862,13 @@ fi # It's run only once. %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : +# Previous versions had tmp.mount moved to /usr/share/systemd/tmp.mount. +# It could be symlinked into /etc to make /tmp a tmpfs. The file does not exist anymore, +# so migrate the link to the new location. +if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then + ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount +fi + %postun %systemd_postun # Avoid restarting logind until fixed upstream (issue #1163) From f34966767e1df50e30d0de5ed9209290532ae46d67e330b617570129ae673e40 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 Sep 2020 12:35:38 +0000 Subject: [PATCH 058/124] Accepting request 834932 from Base:System OBS-URL: https://build.opensuse.org/request/show/834932 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=316 --- ...and-var-lock-bind-mount-if-they-aren.patch | 80 +++++++++++ ...ering-startup-for-etc-init.d-boot.lo.patch | 27 ++++ ...-part-from-etc-hostname-when-setting.patch | 43 ++++++ ...-exclude-statements-based-on-file-ow.patch | 124 ++++++++++++++++++ ...ult-symlinks-for-primary-cd_dvd-driv.patch | 29 ++++ ...dd-back-support-for-SysV-scripts-for.patch | 123 +++++++++++++++++ ...twork.service-an-alias-of-systemd-ne.patch | 29 ++++ ...ranslate-Required-Start-into-a-Wants.patch | 73 +++++++++++ ...ole-specificities-weirdness-for-s390.patch | 60 +++++++++ ...sion-keyring-per-system-sevice-entir.patch | 45 +++++++ ...e-etc-resolv.conf-symlink-at-runtime.patch | 53 ++++++++ systemd-mini.changes | 72 ++++++++++ systemd-mini.spec | 73 +++++++++-- systemd-v245.7+suse.51.ga4e393eecb.tar.xz | 3 - systemd-v246.4+suse.20.gf1344d5b7f.tar.xz | 3 + systemd.changes | 72 ++++++++++ systemd.spec | 73 +++++++++-- 17 files changed, 953 insertions(+), 29 deletions(-) create mode 100644 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch create mode 100644 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch create mode 100644 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch create mode 100644 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch create mode 100644 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch create mode 100644 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch create mode 100644 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch create mode 100644 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch create mode 100644 0009-pid1-handle-console-specificities-weirdness-for-s390.patch create mode 100644 0011-core-disable-session-keyring-per-system-sevice-entir.patch create mode 100644 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch delete mode 100644 systemd-v245.7+suse.51.ga4e393eecb.tar.xz create mode 100644 systemd-v246.4+suse.20.gf1344d5b7f.tar.xz diff --git a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch new file mode 100644 index 00000000..dfc696e1 --- /dev/null +++ b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch @@ -0,0 +1,80 @@ +From f98af900e625b15862f9173a5c55662d4cee7356 Mon Sep 17 00:00:00 2001 +From: Frederic Crozat +Date: Mon, 29 Oct 2012 13:01:20 +0000 +Subject: [PATCH 01/12] restore /var/run and /var/lock bind mount if they + aren't symlink + +--- + units/meson.build | 2 ++ + units/var-lock.mount | 19 +++++++++++++++++++ + units/var-run.mount | 19 +++++++++++++++++++ + 3 files changed, 40 insertions(+) + create mode 100644 units/var-lock.mount + create mode 100644 units/var-run.mount + +diff --git a/units/meson.build b/units/meson.build +index 275daad3f4..dadc9432ef 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -150,6 +150,8 @@ units = [ + ['umount.target', ''], + ['usb-gadget.target', ''], + ['user.slice', ''], ++ ['var-run.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'], ++ ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'], + ['var-lib-machines.mount', 'ENABLE_MACHINED', + 'remote-fs.target.wants/ machines.target.wants/'], + ] +diff --git a/units/var-lock.mount b/units/var-lock.mount +new file mode 100644 +index 0000000000..07277adac3 +--- /dev/null ++++ b/units/var-lock.mount +@@ -0,0 +1,19 @@ ++# This file is part of systemd. ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=Lock Directory ++Before=local-fs.target ++# skip mounting if the directory does not exist or is a symlink ++ConditionPathIsDirectory=/var/lock ++ConditionPathIsSymbolicLink=!/var/lock ++ ++[Mount] ++What=/run/lock ++Where=/var/lock ++Type=bind ++Options=bind +diff --git a/units/var-run.mount b/units/var-run.mount +new file mode 100644 +index 0000000000..ab4da424c9 +--- /dev/null ++++ b/units/var-run.mount +@@ -0,0 +1,19 @@ ++# This file is part of systemd. ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=Runtime Directory ++Before=local-fs.target ++# skip mounting if the directory does not exist or is a symlink ++ConditionPathIsDirectory=/var/run ++ConditionPathIsSymbolicLink=!/var/run ++ ++[Mount] ++What=/run ++Where=/var/run ++Type=bind ++Options=bind +-- +2.26.2 + diff --git a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch new file mode 100644 index 00000000..352b252c --- /dev/null +++ b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch @@ -0,0 +1,27 @@ +From 59f2eadb29ac38803fd32fe52f1403343a7d74ac Mon Sep 17 00:00:00 2001 +From: Thomas Blume +Date: Tue, 25 Mar 2014 13:08:56 +0000 +Subject: [PATCH 02/12] rc-local: fix ordering startup for + /etc/init.d/boot.local + +[tblume: fixes bnc#869142] +--- + units/rc-local.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/units/rc-local.service.in b/units/rc-local.service.in +index 78ce69e0ae..0bcea82bed 100644 +--- a/units/rc-local.service.in ++++ b/units/rc-local.service.in +@@ -13,7 +13,7 @@ + Description=@RC_LOCAL_SCRIPT_PATH_START@ Compatibility + Documentation=man:systemd-rc-local-generator(8) + ConditionFileIsExecutable=@RC_LOCAL_SCRIPT_PATH_START@ +-After=network.target ++After=basic.target + + [Service] + Type=forking +-- +2.26.2 + diff --git a/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch new file mode 100644 index 00000000..5e9a1dfd --- /dev/null +++ b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch @@ -0,0 +1,43 @@ +From f299a8180f1db0680b454c0e37696891361e3067 Mon Sep 17 00:00:00 2001 +From: Frederic Crozat +Date: Tue, 28 May 2013 15:17:35 +0200 +Subject: [PATCH 03/12] strip the domain part from /etc/hostname when setting + system host name + +[fbui: fixes bnc#820213] +[fbui: forwardported from bfd2462b8ddec591d953841ab22bb30bdc6f9085] +[fbui: adjust context and make sure that strip of the domain name is + only done when setting the system host name. Therefore it's + still possible to pass an FQDN to hostnamectl] +[fbui: I'm still not sure that it was the right thing to do. Other + possibility was to fix the installer to create a correct + /etc/hostname file. Need to investigate...] +--- + src/core/hostname-setup.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c +index 6d047db838..1acc0c998b 100644 +--- a/src/core/hostname-setup.c ++++ b/src/core/hostname-setup.c +@@ -39,8 +39,16 @@ int hostname_setup(void) { + enoent = true; + else + log_warning_errno(r, "Failed to read configured hostname: %m"); +- } else ++ } else { ++ char *domain; ++ ++ /* SUSE: strip the domain name */ ++ domain = strchr(b, '.'); ++ if (domain) ++ *domain = '\0'; ++ + hn = b; ++ } + } + + if (isempty(hn)) { +-- +2.26.2 + diff --git a/0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch b/0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch new file mode 100644 index 00000000..570f2c91 --- /dev/null +++ b/0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch @@ -0,0 +1,124 @@ +From b46d43bf980afe13cfff39fc2876aed10f33db1d Mon Sep 17 00:00:00 2001 +From: Thomas Blume +Date: Thu, 14 Apr 2016 15:42:02 +0200 +Subject: [PATCH 04/12] tmpfiles: support exclude statements based on file + ownership + +SUSE supported tmpfile cleanups based on file ownership before systemd. +So this feature needs to be available in systemd. +This was part of fate#314974 + +[tblume: suse-only patch ported from SLES12-SP1 commit e769a63907ae4b] +[tblume: part of fate#314974] +--- + man/tmpfiles.d.xml | 4 +++- + src/tmpfiles/tmpfiles.c | 49 ++++++++++++++++++++++++++++++++--------- + 2 files changed, 42 insertions(+), 11 deletions(-) + +diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml +index b9e9eee96c..b90ae01345 100644 +--- a/man/tmpfiles.d.xml ++++ b/man/tmpfiles.d.xml +@@ -605,7 +605,9 @@ w- /proc/sys/vm/swappiness - - - - 10 + suffixed by a newline. For C, specifies the source file or directory. For t + and T, determines extended attributes to be set. For a and + A, determines ACL attributes to be set. For h and H, +- determines the file attributes to set. Ignored for all other lines. ++ determines the file attributes to set. For x and X a comma separated list ++ of usernames. If given, only paths belonging to these users will be excluded during directory cleanup. Ignored ++ for all other lines. + + This field can contain specifiers, see below. + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 2404e36bf2..349653c786 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -14,6 +14,8 @@ + #include + #include + #include ++#include ++#include + + #include "sd-path.h" + +@@ -505,6 +507,7 @@ static int dir_cleanup( + struct stat s; + usec_t age; + _cleanup_free_ char *sub_path = NULL; ++ Item *found; + + if (dot_or_dot_dot(dent->d_name)) + continue; +@@ -546,15 +549,41 @@ static int dir_cleanup( + goto finish; + } + +- /* Is there an item configured for this path? */ +- if (ordered_hashmap_get(items, sub_path)) { +- log_debug("Ignoring \"%s\": a separate entry exists.", sub_path); +- continue; +- } ++ /* evaluate username arguments in ignore statements */ ++ found = find_glob(globs, sub_path); + +- if (find_glob(globs, sub_path)) { +- log_debug("Ignoring \"%s\": a separate glob exists.", sub_path); +- continue; ++ if (i->type == CREATE_DIRECTORY && found && found->argument) { ++ struct passwd *pw; ++ char *userfound = NULL, *args = strdup(found->argument); ++ bool match = false; ++ ++ while ((userfound = strsep(&args, ","))) { ++ pw = getpwnam(userfound); ++ ++ if (pw) { ++ if (s.st_uid == pw->pw_uid) { ++ match = true; ++ break; ++ } ++ } ++ } ++ ++ if (match) { ++ log_debug("Ignoring \"%s\" of user \"%s\".", sub_path, pw->pw_name); ++ match=false; ++ continue; ++ } ++ } else { ++ /* Is there an item configured for this path? */ ++ if (ordered_hashmap_get(items, sub_path)) { ++ log_debug("Ignoring \"%s\": a separate entry exists.", sub_path); ++ continue; ++ } ++ ++ if (found) { ++ log_debug("Ignoring \"%s\": a separate glob exists.", sub_path); ++ continue; ++ } + } + + if (S_ISDIR(s.st_mode)) { +@@ -2637,8 +2666,6 @@ static int parse_line( + case EMPTY_DIRECTORY: + case TRUNCATE_DIRECTORY: + case CREATE_FIFO: +- case IGNORE_PATH: +- case IGNORE_DIRECTORY_PATH: + case REMOVE_PATH: + case RECURSIVE_REMOVE_PATH: + case ADJUST_MODE: +@@ -2649,6 +2676,8 @@ static int parse_line( + + break; + ++ case IGNORE_PATH: ++ case IGNORE_DIRECTORY_PATH: + case CREATE_FILE: + case TRUNCATE_FILE: + break; +-- +2.26.2 + diff --git a/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch b/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch new file mode 100644 index 00000000..b37a8acc --- /dev/null +++ b/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch @@ -0,0 +1,29 @@ +From 8e95d5534e9a577529ac49aaec610e6ceefec0b9 Mon Sep 17 00:00:00 2001 +From: Robert Milasan +Date: Sat, 12 Jul 2014 14:20:36 +0200 +Subject: [PATCH 05/12] 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 + diff --git a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch new file mode 100644 index 00000000..53c44ddd --- /dev/null +++ b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch @@ -0,0 +1,123 @@ +From f9521480d5dc5af747fecc9adc4c617e473e5494 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 26 May 2016 08:59:41 +0200 +Subject: [PATCH 06/12] sysv-generator: add (back) support for SysV scripts for + the early boot + +For the record, the upstream support was removed by commit +3cdebc217c42c8529086f2965319b6a48eaaeabe. + +The sysv-generator has some weirdos: for example a service at the rc0 +runlevel won't be started during shutdown since it will get both +"WantedBy=poweroff.target" and "Conflicts=shutdown.target". + +Anyways what's the current patch implements the following: + + - a symlink /etc/init.d/boot.d/S??boot.foo will add + "WantedBy/Before=sysinit.target" constraints and make sure that the + default dependencies added by systemd are turned off. + + - a symlink /etc/init.d/boot.d/K??boot.foo will add + "Conflicts/Before=shutdown.target" so "foo" service will be stopped + like any other regular services. If this symlink is not installed + however, "foo" will be stopped lately during the systemd killing + spree. + +This is a forward-port of commit 29db8537e1ca10796797d9854d1 in SP1. + +[Since v232] + +Support for S* symlinks in runlevel 0 or 6 has been completely and silently +removed by 788d2b088b13a2444b9eb2ea82c0cc57d9f0980f. Since it was already +broken as pointed out above, this probably wasn't really used and therefore +no one will really care. So let's drop it too. + +However this has the side effect to make the support of early sysv scripts more +difficult. To make things easy, the support of K* symlinks in boot.d/ has been +removed too: this is probably not used (anymore) (at least intentionally). + +The consequence is that early sysv services are stopped during shutdown at +the same time as 'normal' services. +--- + src/sysv-generator/sysv-generator.c | 23 +++++++++++++++++++++++ + 1 file changed, 23 insertions(+) + +diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c +index a2c72d1009..1c01008967 100644 +--- a/src/sysv-generator/sysv-generator.c ++++ b/src/sysv-generator/sysv-generator.c +@@ -31,6 +31,9 @@ static const struct { + const char *path; + const char *target; + } rcnd_table[] = { ++ /* SUSE style boot.d */ ++ { "boot.d", SPECIAL_SYSINIT_TARGET }, ++ + /* Standard SysV runlevels for start-up */ + { "rc1.d", SPECIAL_RESCUE_TARGET }, + { "rc2.d", SPECIAL_MULTI_USER_TARGET }, +@@ -57,6 +60,7 @@ typedef struct SysvStub { + bool has_lsb; + bool reload; + bool loaded; ++ bool early; + } SysvStub; + + static void free_sysvstub(SysvStub *s) { +@@ -147,6 +151,12 @@ static int generate_unit_file(SysvStub *s) { + fprintf(f, "Description=%s\n", t); + } + ++ if (s->early) { ++ fprintf(f, "DefaultDependencies=no\n"); ++ fprintf(f, "Conflicts=%s\n", SPECIAL_SHUTDOWN_TARGET); ++ fprintf(f, "Before=%s\n", SPECIAL_SHUTDOWN_TARGET); ++ } ++ + STRV_FOREACH(p, s->before) + fprintf(f, "Before=%s\n", *p); + STRV_FOREACH(p, s->after) +@@ -213,6 +223,10 @@ static char *sysv_translate_name(const char *name) { + _cleanup_free_ char *c = NULL; + char *res; + ++ if (startswith(name, "boot.")) ++ /* Drop SuSE-style boot. prefix */ ++ name += 5; ++ + c = strdup(name); + if (!c) + return NULL; +@@ -289,6 +303,11 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, + return 1; + } + ++ /* Strip "boot." prefix from file name for comparison (Suse specific) */ ++ e = startswith(filename, "boot."); ++ if (e) ++ filename += 5; ++ + /* Strip ".sh" suffix from file name for comparison */ + filename_no_sh = strdupa(filename); + e = endswith(filename_no_sh, ".sh"); +@@ -676,6 +695,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { + if (other->sysv_start_priority < 0) + continue; + ++ if (s->early != other->early) ++ continue; ++ + /* If both units have modern headers we don't care + * about the priorities */ + if (s->has_lsb && other->has_lsb) +@@ -800,6 +822,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { + .sysv_start_priority = -1, + .name = TAKE_PTR(name), + .path = TAKE_PTR(fpath), ++ .early = !!startswith(de->d_name, "boot."), + }; + + r = hashmap_put(all_services, service->name, service); +-- +2.26.2 + diff --git a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch new file mode 100644 index 00000000..c4fd62e1 --- /dev/null +++ b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -0,0 +1,29 @@ +From 0adc3f402aeeadd73a0977ca6a1bc65d3d4201c1 Mon Sep 17 00:00:00 2001 +From: Pawel Wieczorkiewicz +Date: Tue, 2 Jun 2015 13:33:24 +0000 +Subject: [PATCH 07/12] networkd: make network.service an alias of + systemd-networkd.service + +NetworkManager and wicked does this already. This is needed by yast2 +and other parts of the system. + +[fixes boo#933092] +--- + units/systemd-networkd.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in +index 2673146841..083a35b912 100644 +--- a/units/systemd-networkd.service.in ++++ b/units/systemd-networkd.service.in +@@ -50,6 +50,7 @@ User=systemd-network + + [Install] + WantedBy=multi-user.target ++Alias=network.service + Also=systemd-networkd.socket + Alias=dbus-org.freedesktop.network1.service + +-- +2.26.2 + diff --git a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch new file mode 100644 index 00000000..d21fea50 --- /dev/null +++ b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch @@ -0,0 +1,73 @@ +From a32292849ca2837f99d6801da26b8d8e401831c4 Mon Sep 17 00:00:00 2001 +From: Thomas Blume +Date: Wed, 4 May 2016 17:40:04 +0200 +Subject: [PATCH 08/12] sysv-generator: translate "Required-Start" into a + "Wants" dependency + +[tblume: Port of SLES12SP1 patch 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch] + +[fbui: this is needed probably because insserv's behavior has been + sadly changed since SLE11: it now doesn't failed if a + dependency listed by Required-Start is missing.] + +[fbui: according to Werner "This should fix bnc#858864 and + bnc#857204." (see Base:System changelog)] +--- + src/sysv-generator/sysv-generator.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c +index 1c01008967..7a58be9287 100644 +--- a/src/sysv-generator/sysv-generator.c ++++ b/src/sysv-generator/sysv-generator.c +@@ -258,6 +258,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, + "remote_fs", SPECIAL_REMOTE_FS_TARGET, + "syslog", NULL, + "time", SPECIAL_TIME_SYNC_TARGET, ++ "all", SPECIAL_DEFAULT_TARGET, + }; + + const char *filename; +@@ -272,6 +273,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, + + filename = basename(s->path); + ++ n = *name == '+' ? ++name : name; + n = *name == '$' ? name + 1 : name; + + for (i = 0; i < ELEMENTSOF(table); i += 2) { +@@ -408,7 +410,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text + + for (;;) { + _cleanup_free_ char *word = NULL, *m = NULL; +- bool is_before; ++ bool is_before, is_wanted; + + r = extract_first_word(&text, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RELAX); + if (r < 0) +@@ -421,6 +423,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text + continue; + + is_before = startswith_no_case(full_text, "X-Start-Before:"); ++ is_wanted = startswith_no_case(full_text, "Required-Start:"); + + if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET) && !is_before) { + /* the network-online target is special, as it needs to be actively pulled in */ +@@ -429,8 +432,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text + return log_oom(); + + r = strv_extend(&s->wants, m); +- } else ++ } else { + r = strv_extend(is_before ? &s->before : &s->after, m); ++ ++ if (is_wanted) ++ r = strv_extend(&s->wants, m); ++ } ++ + if (r < 0) + return log_oom(); + } +-- +2.26.2 + diff --git a/0009-pid1-handle-console-specificities-weirdness-for-s390.patch b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch new file mode 100644 index 00000000..e4984478 --- /dev/null +++ b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch @@ -0,0 +1,60 @@ +From 7fc80ccccaa6f7b98af8bcd899a97d561777ff94 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Fri, 10 Jun 2016 15:19:57 +0200 +Subject: [PATCH 09/12] pid1: handle console specificities/weirdness for s390 + arch + +The 3270 console on S/390 can do color but not the 3215 console. + +Partial forward port of +0001-On_s390_con3270_disable_ANSI_colour_esc.patch from SLE12-SP1. A +bunch of the previous code has been dropped since some changes +imported from upsteam made them uneeded. + +The remaining bits are probably hackish but at least they are now +minimal. + +It was an attempt to address bnc#860937. And yes turning the console +color mode off by passing $TERM=dumb via the kernel command line would +have been much more easier and enough. + +This is actually implemented by recent systemd. There's also another +command line option: systemd.log_color=off. + +See also a short discussion which happened on @systemd-maintainers +whose $subject is "[PATCH] support conmode setting on command line". + +[ fbui: fixes bsc#860937 ] +--- + src/basic/terminal-util.c | 15 ++++++++++++++- + 1 file changed, 14 insertions(+), 1 deletion(-) + +diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c +index 6cacde90ba..1a03902acc 100644 +--- a/src/basic/terminal-util.c ++++ b/src/basic/terminal-util.c +@@ -780,7 +780,20 @@ bool tty_is_vc_resolve(const char *tty) { + } + + const char *default_term_for_tty(const char *tty) { +- return tty && tty_is_vc_resolve(tty) ? "linux" : "vt220"; ++ if (tty && tty_is_vc_resolve(tty)) ++ return "linux"; ++ ++#if defined (__s390__) || defined (__s390x__) ++ if (tty && tty_is_console(tty)) { ++ _cleanup_free_ char *mode = NULL; ++ ++ /* Simply return "dumb" in case of OOM. */ ++ (void) proc_cmdline_get_key("conmode", 0, &mode); ++ (void) proc_cmdline_value_missing("conmode", mode); ++ return streq_ptr(mode, "3270") ? "ibm327x" : "dumb"; ++ } ++#endif ++ return "vt220"; + } + + int fd_columns(int fd) { +-- +2.26.2 + diff --git a/0011-core-disable-session-keyring-per-system-sevice-entir.patch b/0011-core-disable-session-keyring-per-system-sevice-entir.patch new file mode 100644 index 00000000..a3e1fac1 --- /dev/null +++ b/0011-core-disable-session-keyring-per-system-sevice-entir.patch @@ -0,0 +1,45 @@ +From e5b3d1d00bbdbcb168889699c462bf01b58062a5 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 6 Jul 2017 15:48:10 +0200 +Subject: [PATCH 11/12] core: disable session keyring per system sevice + entirely for now + +Until PAM module "pam_keyinit" is fully integrated in SUSE's PAM stack, this +feature has to be disabled. + +openSUSE is still not ready for enabling the keyring stuff (see +bsc#1081947). Some services got fixed (sshd, getty@.service) but some still +haven't (xdm, login, ...) + +So leave it disabled again otherwise different users might end up using the +same session keyring - the one created for the service used for logging in +(sshd, getty@.service, xdm, etc...) + +The integration of pam_keyinit is tracked here: +https://bugzilla.opensuse.org/show_bug.cgi?id=1081947 + +See also: +https://github.com/systemd/systemd/pull/6286 + +[fbui: fixes boo#1045886] +--- + src/core/execute.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/core/execute.c b/src/core/execute.c +index 2a4840a3a9..aefd4eaff1 100644 +--- a/src/core/execute.c ++++ b/src/core/execute.c +@@ -2779,6 +2779,9 @@ static int setup_keyring( + assert(context); + assert(p); + ++ /* SUSE: pam_keyinit is still not fully integrated to SUSE's PAM stack... */ ++ return 0; ++ + /* Let's set up a new per-service "session" kernel keyring for each system service. This has the benefit that + * each service runs with its own keyring shared among all processes of the service, but with no hook-up beyond + * that scope, and in particular no link to the per-UID keyring. If we don't do this the keyring will be +-- +2.26.2 + diff --git a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch new file mode 100644 index 00000000..a687aaa0 --- /dev/null +++ b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -0,0 +1,53 @@ +From 90d84a96aca84b39f6aabda048703dc7c0e79ef4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Fri, 11 Mar 2016 17:06:17 -0500 +Subject: [PATCH 12/12] resolved: create /etc/resolv.conf symlink at runtime + +If the symlink doesn't exists, and we are being started, let's +create it to provie name resolution. + +If it exists, do nothing. In particular, if it is a broken symlink, +we cannot really know if the administator configured it to point to +a location used by some service that hasn't started yet, so we +don't touch it in that case either. + +https://bugzilla.redhat.com/show_bug.cgi?id=1313085 +--- + src/resolve/resolved.c | 6 ++++++ + tmpfiles.d/etc.conf.m4 | 3 --- + 2 files changed, 6 insertions(+), 3 deletions(-) + +diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c +index 16477f28d6..3922804039 100644 +--- a/src/resolve/resolved.c ++++ b/src/resolve/resolved.c +@@ -53,6 +53,12 @@ static int run(int argc, char *argv[]) { + if (r < 0) + return log_error_errno(r, "Cannot resolve user name %s: %m", user); + ++ /* As we're root, we can create /etc/resolv.conf symlink if it doesn't exist already */ ++ r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); ++ if (r < 0 && errno != EEXIST) ++ log_warning_errno(errno, ++ "Could not create /etc/resolv.conf symlink: %m"); ++ + /* As we're root, we can create the directory where resolv.conf will live */ + r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid, MKDIR_WARN_MODE); + if (r < 0) +diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 +index f82e0b82ce..66a777bdb2 100644 +--- a/tmpfiles.d/etc.conf.m4 ++++ b/tmpfiles.d/etc.conf.m4 +@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts + m4_ifdef(`HAVE_SMACK_RUN_LABEL', + t /etc/mtab - - - - security.SMACK64=_ + )m4_dnl +-m4_ifdef(`ENABLE_RESOLVE', +-L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf +-)m4_dnl + C! /etc/nsswitch.conf - - - - + m4_ifdef(`HAVE_PAM', + C! /etc/pam.d - - - - +-- +2.26.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 5ac5e11c..0932d62e 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Wed Sep 16 14:07:56 UTC 2020 - Franck Bui + +- Drop 0001-udev-temporarly-restore-the-creation-a-few-symlinks-.patch + + linuxrc has already been fixed. + +------------------------------------------------------------------- +Wed Sep 16 13:42:04 UTC 2020 - Franck Bui + +- Add 0001-udev-temporarly-restore-the-creation-a-few-symlinks-.patch + + A temporary patch until the installer environment is updated to + create some of the symlinks that udevd used to create during its + startup but now udevd relies on the init system to do so. + +------------------------------------------------------------------- +Thu Sep 10 12:59:54 UTC 2020 - Franck Bui + +- Rework how we prevent journald from both enabling auditd and + recording audit messages + + journald.conf gained a new setting Audit= to control whether + journald enables audit during the boot process. So let's use it and + make sure it's disabled by default by shipping a drop-in that + overrides upstream default. + + Also we used to patch systemd to prevent journald from reading the + audit messages. There's still no way for downstream to configure + that properly (we would need to mask systemd-journald-audit.socket + meaning shipping a symlink in /etc) but I think dropping + systemd-journald-audit.socket from the package is a nicer way to do + that as some users might choose to reenable this setting (by + reintroducing the socket unit in /etc). + +------------------------------------------------------------------- +Thu Sep 10 09:02:13 UTC 2020 - Franck Bui + +- Enable audit support (bsc#1175883) + + Enabling audit support in systemd will only make PID1 (and some of + its services) to generate some audit records for certain events. But + it doesn't affect journald, which has been prevented from recording + audit messages in the journal (SUSE specific behavior). + +------------------------------------------------------------------- +Wed Sep 2 10:14:10 UTC 2020 - Franck Bui + +- Upgrade to v246.4 (commit f1344d5b7f31e98aedb01e606f41d74d3caaf446) + + See https://github.com/openSUSE/systemd/blob/SUSE/v246/NEWS for + details. + + Now that the number of SUSE specific patches has been shrinked and + is pretty low (12 at the time of this writing), they are no more + tracked by the git repo and are now handled at the package + level. Hence It is easier to maintain and identify them. This + effectively means that SUSE/v246 will contain upstream commits only. + + Added 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch + Added 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch + Added 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch + Added 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch + Added 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch + Added 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch + Added 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch + Added 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch + Added 0009-pid1-handle-console-specificities-weirdness-for-s390.patch + Added 0010-journald-disable-audit-support-completely-from-the-j.patch + Added 0011-core-disable-session-keyring-per-system-sevice-entir.patch + Added 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + ------------------------------------------------------------------- Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt diff --git a/systemd-mini.spec b/systemd-mini.spec index 406e052f..f7f696ea 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.51.ga4e393eecb +%define suse_version +suse.20.gf1344d5b7f %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245.7 +Version: 246.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -71,6 +71,7 @@ BuildRequires: polkit # python is only required for generating systemd.directives.xml BuildRequires: python3-base BuildRequires: python3-lxml +BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(liblz4) @@ -159,12 +160,28 @@ Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh -# Patches listed in here are put in quarantine. Normally all -# changes must go to upstream first and then are cherry-picked in the -# SUSE git repository. But in very few cases, some stuff might be -# broken in upstream and need an urgent fix. Even in this case, the -# patches are temporary and should be removed as soon as a fix is -# merged by upstream. +# Patches listed below are SUSE specific and should be kept at its +# minimum. We try hard to push our changes to upstream but sometimes +# they are only relevant for SUSE distros. Special rewards for those +# who will manage to get rid of one of them ! +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 +Patch4: 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch +Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch +Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch +Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +Patch9: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch +Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.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 +# repository. But in very few cases, some stuff might be broken in +# upstream and need an urgent fix. Even in this case, the patches are +# temporary and should be removed as soon as a fix is merged by +# upstream. %description Systemd is a system and service manager, compatible with SysV and LSB @@ -604,8 +621,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff +%if %{with sysvcompat} ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel +%endif # Make sure we don't ship static enablement symlinks in /etc during # installation, presets should be honoured instead. @@ -778,6 +797,19 @@ fi # which may still be used by yast. cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +# Create a drop-in to prevent journald from starting auditd during +# boot (bsc#984034). +mkdir -p %{buildroot}%{_prefix}/lib/systemd/journald.conf.d +cat >%{buildroot}%{_prefix}/lib/systemd/journald.conf.d/20-suse-defaults.conf </usr/lib/udev/compat-symlink-generation + echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation fi %post -n udev%{?mini} @@ -1218,6 +1259,8 @@ fi %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf +%{_prefix}/lib/systemd/journald.conf.d/ + %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system.d @@ -1273,7 +1316,7 @@ fi %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* -%{_mandir}/man8/systemd-[a-gik-tv]* +%{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* @@ -1350,15 +1393,19 @@ fi /sbin/halt /sbin/shutdown /sbin/poweroff +%if %{with sysvcompat} /sbin/telinit /sbin/runlevel +%endif %{_sbindir}/init %{_sbindir}/reboot %{_sbindir}/halt %{_sbindir}/shutdown %{_sbindir}/poweroff +%if %{with sysvcompat} %{_sbindir}/telinit %{_sbindir}/runlevel +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/init.1* %{_mandir}/man8/halt.8* diff --git a/systemd-v245.7+suse.51.ga4e393eecb.tar.xz b/systemd-v245.7+suse.51.ga4e393eecb.tar.xz deleted file mode 100644 index 815e59f1..00000000 --- a/systemd-v245.7+suse.51.ga4e393eecb.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e0cce0a5990f8ddc03e1dcdb1af7f20331e3e885596710f8a68563882c50d31e -size 6301856 diff --git a/systemd-v246.4+suse.20.gf1344d5b7f.tar.xz b/systemd-v246.4+suse.20.gf1344d5b7f.tar.xz new file mode 100644 index 00000000..56657747 --- /dev/null +++ b/systemd-v246.4+suse.20.gf1344d5b7f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:707b0dca1d9dd0fa8c8858090b5e14d9741bacda2c4d0a1745707b57b395b254 +size 6548244 diff --git a/systemd.changes b/systemd.changes index 5ac5e11c..0932d62e 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,75 @@ +------------------------------------------------------------------- +Wed Sep 16 14:07:56 UTC 2020 - Franck Bui + +- Drop 0001-udev-temporarly-restore-the-creation-a-few-symlinks-.patch + + linuxrc has already been fixed. + +------------------------------------------------------------------- +Wed Sep 16 13:42:04 UTC 2020 - Franck Bui + +- Add 0001-udev-temporarly-restore-the-creation-a-few-symlinks-.patch + + A temporary patch until the installer environment is updated to + create some of the symlinks that udevd used to create during its + startup but now udevd relies on the init system to do so. + +------------------------------------------------------------------- +Thu Sep 10 12:59:54 UTC 2020 - Franck Bui + +- Rework how we prevent journald from both enabling auditd and + recording audit messages + + journald.conf gained a new setting Audit= to control whether + journald enables audit during the boot process. So let's use it and + make sure it's disabled by default by shipping a drop-in that + overrides upstream default. + + Also we used to patch systemd to prevent journald from reading the + audit messages. There's still no way for downstream to configure + that properly (we would need to mask systemd-journald-audit.socket + meaning shipping a symlink in /etc) but I think dropping + systemd-journald-audit.socket from the package is a nicer way to do + that as some users might choose to reenable this setting (by + reintroducing the socket unit in /etc). + +------------------------------------------------------------------- +Thu Sep 10 09:02:13 UTC 2020 - Franck Bui + +- Enable audit support (bsc#1175883) + + Enabling audit support in systemd will only make PID1 (and some of + its services) to generate some audit records for certain events. But + it doesn't affect journald, which has been prevented from recording + audit messages in the journal (SUSE specific behavior). + +------------------------------------------------------------------- +Wed Sep 2 10:14:10 UTC 2020 - Franck Bui + +- Upgrade to v246.4 (commit f1344d5b7f31e98aedb01e606f41d74d3caaf446) + + See https://github.com/openSUSE/systemd/blob/SUSE/v246/NEWS for + details. + + Now that the number of SUSE specific patches has been shrinked and + is pretty low (12 at the time of this writing), they are no more + tracked by the git repo and are now handled at the package + level. Hence It is easier to maintain and identify them. This + effectively means that SUSE/v246 will contain upstream commits only. + + Added 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch + Added 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch + Added 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch + Added 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch + Added 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch + Added 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch + Added 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch + Added 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch + Added 0009-pid1-handle-console-specificities-weirdness-for-s390.patch + Added 0010-journald-disable-audit-support-completely-from-the-j.patch + Added 0011-core-disable-session-keyring-per-system-sevice-entir.patch + Added 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + ------------------------------------------------------------------- Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt diff --git a/systemd.spec b/systemd.spec index 2d9078cb..bd35fc30 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.51.ga4e393eecb +%define suse_version +suse.20.gf1344d5b7f %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 245.7 +Version: 246.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -69,6 +69,7 @@ BuildRequires: polkit # python is only required for generating systemd.directives.xml BuildRequires: python3-base BuildRequires: python3-lxml +BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(liblz4) @@ -157,12 +158,28 @@ Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh -# Patches listed in here are put in quarantine. Normally all -# changes must go to upstream first and then are cherry-picked in the -# SUSE git repository. But in very few cases, some stuff might be -# broken in upstream and need an urgent fix. Even in this case, the -# patches are temporary and should be removed as soon as a fix is -# merged by upstream. +# Patches listed below are SUSE specific and should be kept at its +# minimum. We try hard to push our changes to upstream but sometimes +# they are only relevant for SUSE distros. Special rewards for those +# who will manage to get rid of one of them ! +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 +Patch4: 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch +Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch +Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch +Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +Patch9: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch +Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.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 +# repository. But in very few cases, some stuff might be broken in +# upstream and need an urgent fix. Even in this case, the patches are +# temporary and should be removed as soon as a fix is merged by +# upstream. %description Systemd is a system and service manager, compatible with SysV and LSB @@ -602,8 +619,10 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff +%if %{with sysvcompat} ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel +%endif # Make sure we don't ship static enablement symlinks in /etc during # installation, presets should be honoured instead. @@ -776,6 +795,19 @@ fi # which may still be used by yast. cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +# Create a drop-in to prevent journald from starting auditd during +# boot (bsc#984034). +mkdir -p %{buildroot}%{_prefix}/lib/systemd/journald.conf.d +cat >%{buildroot}%{_prefix}/lib/systemd/journald.conf.d/20-suse-defaults.conf </usr/lib/udev/compat-symlink-generation + echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation fi %post -n udev%{?mini} @@ -1216,6 +1257,8 @@ fi %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf +%{_prefix}/lib/systemd/journald.conf.d/ + %dir %{_datadir}/dbus-1 %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system.d @@ -1271,7 +1314,7 @@ fi %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* -%{_mandir}/man8/systemd-[a-gik-tv]* +%{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* @@ -1348,15 +1391,19 @@ fi /sbin/halt /sbin/shutdown /sbin/poweroff +%if %{with sysvcompat} /sbin/telinit /sbin/runlevel +%endif %{_sbindir}/init %{_sbindir}/reboot %{_sbindir}/halt %{_sbindir}/shutdown %{_sbindir}/poweroff +%if %{with sysvcompat} %{_sbindir}/telinit %{_sbindir}/runlevel +%endif %if ! 0%{?bootstrap} %{_mandir}/man1/init.1* %{_mandir}/man8/halt.8* From b699d340b0921a3aee6943f8282db53eeab47deefab3c9035a9e526b6d446709 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 2 Oct 2020 15:16:52 +0000 Subject: [PATCH 059/124] Accepting request 838928 from Base:System OBS-URL: https://build.opensuse.org/request/show/838928 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=317 --- ...ering-startup-for-etc-init.d-boot.lo.patch | 11 +++--- systemd-mini.changes | 36 +++++++++++++++++++ systemd-mini.spec | 12 ++++--- systemd-v246.4+suse.20.gf1344d5b7f.tar.xz | 3 -- systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz | 3 ++ systemd.changes | 36 +++++++++++++++++++ systemd.spec | 12 ++++--- 7 files changed, 94 insertions(+), 19 deletions(-) delete mode 100644 systemd-v246.4+suse.20.gf1344d5b7f.tar.xz create mode 100644 systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz diff --git a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch index 352b252c..1e278fda 100644 --- a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch +++ b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch @@ -1,8 +1,7 @@ -From 59f2eadb29ac38803fd32fe52f1403343a7d74ac Mon Sep 17 00:00:00 2001 +From 47563b617a371680d1ec3729fa4324310ebe3710 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Tue, 25 Mar 2014 13:08:56 +0000 -Subject: [PATCH 02/12] rc-local: fix ordering startup for - /etc/init.d/boot.local +Subject: [PATCH 1/1] rc-local: fix ordering startup for /etc/init.d/boot.local [tblume: fixes bnc#869142] --- @@ -10,13 +9,13 @@ Subject: [PATCH 02/12] rc-local: fix ordering startup for 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/rc-local.service.in b/units/rc-local.service.in -index 78ce69e0ae..0bcea82bed 100644 +index d4aaaf09d4..5cd1571cc7 100644 --- a/units/rc-local.service.in +++ b/units/rc-local.service.in @@ -13,7 +13,7 @@ - Description=@RC_LOCAL_SCRIPT_PATH_START@ Compatibility + Description=@RC_LOCAL_PATH@ Compatibility Documentation=man:systemd-rc-local-generator(8) - ConditionFileIsExecutable=@RC_LOCAL_SCRIPT_PATH_START@ + ConditionFileIsExecutable=@RC_LOCAL_PATH@ -After=network.target +After=basic.target diff --git a/systemd-mini.changes b/systemd-mini.changes index 0932d62e..5ca8c312 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed Sep 30 19:09:59 UTC 2020 - Franck Bui + +- Import commit d7b5ac76dc95ddf30e707d26998e36303e9f52a7 (merge of v246.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/1cab0d44584687ace92d1df30eadf264231e3b65...d7b5ac76dc95ddf30e707d26998e36303e9f52a7 + +------------------------------------------------------------------- +Tue Sep 29 16:37:40 UTC 2020 - Franck Bui + +- Ship {/usr/lib,/etc}/systemd/network directories in the main package + + These directories can be used by both udevd and networkd. + +------------------------------------------------------------------- +Thu Sep 17 15:12:48 UTC 2020 - Franck Bui + +- Remove dangling symlink + /usr/lib/systemd/system/sockets.target.wants/systemd-journald-audit.socket + + Otherwise the build system complains. + +------------------------------------------------------------------- +Thu Sep 17 12:50:27 UTC 2020 - Franck Bui + +- Import commit 1cab0d44584687ace92d1df30eadf264231e3b65 (include v246.5) + + 304ec2c7ab fstab-generator: add 'nofail' when NFS 'bg' option is used (bsc#1176513) + 6ae277fb37 test: adapt TEST-21-SYSUSERS for SUSE + acd8bfd2cc test: adapt TEST-13-NSPAWN-SMOKE for SUSE + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/a4e393eecb9dbe140a6c7d57419c291d786155cf...1cab0d44584687ace92d1df30eadf264231e3b65 + ------------------------------------------------------------------- Wed Sep 16 14:07:56 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index f7f696ea..4623a5c4 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.20.gf1344d5b7f +%define suse_version +suse.27.gd7b5ac76dc %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.4 +Version: 246.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -605,6 +605,7 @@ install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif +mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn # Package the scripts used to fix all packaging issues. Also drop the @@ -809,6 +810,7 @@ EOF # us to prevent journald from recording audit messages in the journal # by default (bsc#1109252). rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket +rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if ! 0%{?bootstrap} %find_lang systemd @@ -1121,6 +1123,7 @@ fi %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd +%dir %{_prefix}/lib/systemd/network %dir %{_unitdir} %{_userunitdir} %if %{with coredump} @@ -1244,6 +1247,7 @@ fi %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd +%dir %{_sysconfdir}/systemd/network %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd @@ -1448,7 +1452,7 @@ fi %{_mandir}/man8/systemd-udev* %{_mandir}/man8/udev* %endif -%dir %{_prefix}/lib/systemd/system +%dir %{_unitdir} %{_prefix}/lib/systemd/systemd-udevd %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket @@ -1457,7 +1461,6 @@ fi %{_unitdir}/sysinit.target.wants/systemd-udev*.service %dir %{_unitdir}/sockets.target.wants %{_unitdir}/sockets.target.wants/systemd-udev*.socket -%dir %{_prefix}/lib/systemd/network %{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc @@ -1596,7 +1599,6 @@ fi %files network %defattr(-,root,root) %if %{with networkd} -%dir %{_sysconfdir}/systemd/network %config(noreplace) %{_sysconfdir}/systemd/networkd.conf %{_bindir}/networkctl %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf diff --git a/systemd-v246.4+suse.20.gf1344d5b7f.tar.xz b/systemd-v246.4+suse.20.gf1344d5b7f.tar.xz deleted file mode 100644 index 56657747..00000000 --- a/systemd-v246.4+suse.20.gf1344d5b7f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:707b0dca1d9dd0fa8c8858090b5e14d9741bacda2c4d0a1745707b57b395b254 -size 6548244 diff --git a/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz b/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz new file mode 100644 index 00000000..1689808c --- /dev/null +++ b/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a49af04e1d1dbadfcc869108ab16976a774dbbc379ae2226a4977f32c734a499 +size 6552824 diff --git a/systemd.changes b/systemd.changes index 0932d62e..5ca8c312 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed Sep 30 19:09:59 UTC 2020 - Franck Bui + +- Import commit d7b5ac76dc95ddf30e707d26998e36303e9f52a7 (merge of v246.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/1cab0d44584687ace92d1df30eadf264231e3b65...d7b5ac76dc95ddf30e707d26998e36303e9f52a7 + +------------------------------------------------------------------- +Tue Sep 29 16:37:40 UTC 2020 - Franck Bui + +- Ship {/usr/lib,/etc}/systemd/network directories in the main package + + These directories can be used by both udevd and networkd. + +------------------------------------------------------------------- +Thu Sep 17 15:12:48 UTC 2020 - Franck Bui + +- Remove dangling symlink + /usr/lib/systemd/system/sockets.target.wants/systemd-journald-audit.socket + + Otherwise the build system complains. + +------------------------------------------------------------------- +Thu Sep 17 12:50:27 UTC 2020 - Franck Bui + +- Import commit 1cab0d44584687ace92d1df30eadf264231e3b65 (include v246.5) + + 304ec2c7ab fstab-generator: add 'nofail' when NFS 'bg' option is used (bsc#1176513) + 6ae277fb37 test: adapt TEST-21-SYSUSERS for SUSE + acd8bfd2cc test: adapt TEST-13-NSPAWN-SMOKE for SUSE + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/a4e393eecb9dbe140a6c7d57419c291d786155cf...1cab0d44584687ace92d1df30eadf264231e3b65 + ------------------------------------------------------------------- Wed Sep 16 14:07:56 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index bd35fc30..5001f010 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.20.gf1344d5b7f +%define suse_version +suse.27.gd7b5ac76dc %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.4 +Version: 246.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -603,6 +603,7 @@ install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-conve install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif +mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn # Package the scripts used to fix all packaging issues. Also drop the @@ -807,6 +808,7 @@ EOF # us to prevent journald from recording audit messages in the journal # by default (bsc#1109252). rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket +rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if ! 0%{?bootstrap} %find_lang systemd @@ -1119,6 +1121,7 @@ fi %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %dir %{_prefix}/lib/systemd +%dir %{_prefix}/lib/systemd/network %dir %{_unitdir} %{_userunitdir} %if %{with coredump} @@ -1242,6 +1245,7 @@ fi %dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd +%dir %{_sysconfdir}/systemd/network %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd @@ -1446,7 +1450,7 @@ fi %{_mandir}/man8/systemd-udev* %{_mandir}/man8/udev* %endif -%dir %{_prefix}/lib/systemd/system +%dir %{_unitdir} %{_prefix}/lib/systemd/systemd-udevd %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket @@ -1455,7 +1459,6 @@ fi %{_unitdir}/sysinit.target.wants/systemd-udev*.service %dir %{_unitdir}/sockets.target.wants %{_unitdir}/sockets.target.wants/systemd-udev*.socket -%dir %{_prefix}/lib/systemd/network %{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc @@ -1594,7 +1597,6 @@ fi %files network %defattr(-,root,root) %if %{with networkd} -%dir %{_sysconfdir}/systemd/network %config(noreplace) %{_sysconfdir}/systemd/networkd.conf %{_bindir}/networkctl %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf From ff977b3276a152eeb75b4cfe0c1459c1d637642c2ed1cabdc3e66eac1f1c4644 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 15 Oct 2020 11:46:59 +0000 Subject: [PATCH 060/124] Accepting request 841477 from Base:System OBS-URL: https://build.opensuse.org/request/show/841477 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=318 --- systemd-mini.changes | 123 ++++++++++++++++++++++++++++++++++++++++--- systemd-mini.spec | 74 +++++++------------------- systemd.changes | 123 ++++++++++++++++++++++++++++++++++++++++--- systemd.spec | 74 +++++++------------------- 4 files changed, 268 insertions(+), 126 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 5ca8c312..131a1e63 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Tue Oct 13 09:29:40 UTC 2020 - Franck Bui + +- Do not include %{release} in a few places where we explicitly mention package versions + + It's usually not a good idea especially when used with conflicts. + +------------------------------------------------------------------- +Tue Oct 13 08:50:13 UTC 2020 - Franck Bui + +- Rely on systemd-default-settings for overriding system default settings + + The new branding packages now ships the drop-ins to customize + systemd either for an openSUSE or a SLE ditro. + ------------------------------------------------------------------- Wed Sep 30 19:09:59 UTC 2020 - Franck Bui @@ -342,6 +357,12 @@ Wed Mar 18 14:09:57 UTC 2020 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v245/NEWS for details. + This includes the following bug fixes: + + - upstream commit 7f56982289275ce84e20f0554475864953e6aaab (CVE-2020-1712) + - upstream commit 66a19d85a533b15ed32f4066ec880b5a8c06babd (bsc#1157315) + - upstream commit 7f56982289275ce84e20f0554475864953e6aaab (bsc#1162108) + The new tools provided by systemd repart, userdb, homed, fdisk, pwquality, p11kit feature have been disabled for now as they require reviews first. @@ -467,6 +488,15 @@ Thu Dec 5 14:00:03 UTC 2019 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v244/NEWS for details. + This includes the following bug fixes: + + - upstream commit b49e14d5f3081dfcd363d8199a14c0924ae9152f (bsc#1139459) + - upstream commit 22683674716fd0e5b016ce5a7d8fd90df5f9f9e7 (bsc#1151377) + - upstream commit faf205de3ba9a11b0ba17682123d7f3fedc7da24 (bsc#1151377) + - upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574) + - upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814) + - upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689) + Legacy and obsolete symlinks have been finally dropped. Dropped 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch. @@ -703,7 +733,17 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui - Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be) See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for - details. + details. + + This includes the following bug fixes: + + - upstream commit b2774a3ae692113e1f47a336a6c09bac9cfb49ad (CVE-2019-20386 bsc#1161436) + - upstream commit 5406c36844b35504a64e9f05fc74b8e5e5a09143 (bsc#1132400) + - upstream commit 83a32ea7b03d6707b8e5bb90a0b3a6eb868ef633 (bsc#1132721) + - upstream commit 7cc5ef5f1811c539ae7f20255c2a093f413cc64f (bsc#1172824 bsc#1142733) + - upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213) + - upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485) + - upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011) Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped from branch SUSE/v243 while we were rebasing. @@ -852,7 +892,7 @@ Tue May 14 14:27:12 UTC 2019 - Franck Bui ------------------------------------------------------------------- Mon May 13 08:46:38 UTC 2019 - Franck Bui -- Buildrequire polkit so /usr/share/polkit-1/rules.d has an owner +- Buildrequire polkit so /usr/share/polkit-1/rules.d has an owner (bsc#1145023) Otherwise the "post build checks" would complain and would force systemd to own this directory. The owner should still be "polkit" @@ -891,6 +931,16 @@ Thu May 2 13:12:23 UTC 2019 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for details. + This includes the following bug fixes: + + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (CVE-2019-3843) + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (CVE-2019-3844) + - upstream commit 37ed15d7edaf59a1fc7c9e3552cd93a83f3814ef (bsc#1124122) + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (bsc#1133506) + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (bsc#1133509) + - upstream commit 1f82f5bb4237ed5f015daf93f818e9db95e764b8 (bsc#1150595) + - upstream commit e55bdf9b6c5f72475b258a7a4585a0480551cb60 (bsc#1173422) + ------------------------------------------------------------------- Wed Apr 24 07:23:44 UTC 2019 - Franck Bui @@ -914,7 +964,7 @@ Fri Apr 12 14:13:54 UTC 2019 - Franck Bui ------------------------------------------------------------------- Tue Mar 19 16:11:44 UTC 2019 - Franck Bui -- systemd-coredump: generate a stack trace of all core dumps (bsc#1128832) +- systemd-coredump: generate a stack trace of all core dumps (bsc#1128832 jsc#SLE-5933) This stack trace is logged to the journal. @@ -956,6 +1006,20 @@ Tue Mar 5 17:51:02 UTC 2019 - Franck Bui - Upgrade to v241 (commit 15a1b4d58f1d2bc9c21c7cbab6fe63b58e48bda1) + This includes the following bug fixes: + + - upstream commit c0d76959080e3ba6534bce1c7053c750668e8b55 (bsc#1160595) + - upstream commit 7334ade4a7e103b1a01d1c8fe1ea7c7a854a1c31 (bsc#1123892) + - upstream commit c7e93c4d15019323973baf12daa76357c83892c4 (boo#1111498) + + This also includes the following bug fixes released in v240: + + - upstream commit 2675747f3cdd6f1e6236bbb2f79abfa53fb307f1 (boo#1111498) + - upstream commit 9eb0fc32d6cb63e71f2cfc1e7dd34c3ede4b48a3 (bsc#1140631) + - upstream commit 1432d2dbdfa90963272a9b581dc4b55dd3ac514f (bsc#1155574) + - upstream commit 26e35b164b8d0603629b3d394554cfa728e8c3e4 (bsc#1169488) + - upstream commit a9fc640671ef60ac949f1ace6fa687ff242fc233 (fate#325697) + ------------------------------------------------------------------- Tue Feb 19 11:08:13 UTC 2019 - Franck Bui @@ -1216,6 +1280,20 @@ Wed Oct 24 10:07:36 UTC 2018 - Franck Bui - Upgrade to v239 (commit 6d8584e7e8e5d13d2bab49b9e6f6d2ec39759978) + This includes the following bug fixes: + + - upstream commit 0722b359342d2a9f9e0d453875624387a0ba1be2 (bsc#1045723) + - upstream commit 2f2e14b251b9929e84e8b690d0187b766dfbae20 (bsc#1124122) + - upstream commit c839b729c5f7b08f6d91bf9567d0b1f91d17e0f7 (bsc#1155207) + - upstream commit 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 (bsc#1168076) + + This also includes the following bug fixes released in v238: + + - upstream commit e8a3144ec4ff332bd63644e468a98e1a7e06e7e4 (bsc#1112024) + - upstream commit 4d219f5343b1924e7c519c2c178aeb5d1a5ab924 (bsc#1123727) + - upstream commit 43b7f24b5e0dd048452112bfb344739764c58694 (bsc#1146991) + - upstream commit bf443be99565e4327f1c8c12b79d98b4c1529cf1 (bsc#1156213) + ------------------------------------------------------------------- Mon Oct 15 16:23:05 UTC 2018 - Franck Bui @@ -1256,11 +1334,11 @@ Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com ------------------------------------------------------------------- Fri Sep 28 06:05:03 UTC 2018 - Thomas.Blume@suse.com -- split off SUSE specific configuration from systemd package (fate#325478) +- split off SUSE specific udev rules from systemd package (fate#325478) * remove 60-io-scheduler.rules * remove 80-hotplug-cpu-mem.rules * remove 99-wakeup-from-idle.rules - * remove /usr/lib/modules-load.d/sg.conf + * remove /usr/lib/modules-load.d/sg.conf (see bsc#1036463 for details) these are now maintained in the new package system-tuning-common-SUSE @@ -1449,7 +1527,7 @@ Wed Mar 28 12:30:31 UTC 2018 - fbui@suse.com ------------------------------------------------------------------- Wed Mar 28 12:13:03 UTC 2018 - fbui@suse.com -- Rename the tarball +- Rename the tarball (bsc#1087323) So it's clear that it contains some additional patches on top of the upstream version. Use the commit hash in the name so the exact @@ -1585,6 +1663,37 @@ Thu Mar 1 10:13:02 UTC 2018 - fbui@suse.com level. Those rules have been rejected by upstream as they seem to be written to workaround some kernel shortcomings... + This includes the following bug fix: + + - upstream commit 3d083b2245b0b8e52f2d8ccc3e55246f41f1f544 (bsc#1102908) + + This also includes the following bug fixes released in v235: + + - upstream commit 2e64e8f46d726689a44d4084226fe3e0ea255c29 (bsc#1069239) + - upstream commit 79873bc850177050baa0c5165b119adafeebb891 (bsc#1069239) + - upstream commit 4bc5d27b942afa83cc3d95debd2ad48d42ac07a8 (bsc#1089376) + - upstream commit e9ea4526a3a3b41eced29b8d742498cc36750424 (bsc#1089693) + - upstream commit d75b31837c93dbb9b20067719026ad0fb7cdfadd (bsc#1117025) + - upstream commit 0e8856d25ab71764a279c2377ae593c0f2460d8f (bsc#1117025) + - upstream commit 048dd629c4590eefb2ebd6a316c7350ed3a6ff19 (bsc#1119971) + - upstream commit 9b32afa9f241fe8febc0a754850f1e7331caf6e3 (bsc#1126056) + - upstream commit e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af (bsc#1137053) + - upstream commit 0864d311766498563331f486909a0d950ba7de87 (bsc#1158336) + - upstream commit d60cb656fc63c24b430421764b7d0322857d34fd (bsc#1161262) + - upstream commit e2be442e791fa1150aa835c684acc6d7189de3e1 (bsc#1165011) + - upstream commit 64a36ae4b1dd23474dd7ea261381ac437b24fac2 (bsc#1172072) + - upstream commit b001ad61e91b6499897f0c977045c7608c233bfa (jsc#SLE-7687) + + - includes IP filtering feature (jsc#SLE-7743) + + This also includes the following bug fixes released in v236: + + - upstream commit b3b4ebab02395933cde554b5a5d5c363dae3920d (bsc#1083571) + - upstream commit 3e3852b3c6c61506963112fd218a86b673fc61e6 (bsc#1110445) + - upstream commit 4050e4797603d3644707d58edfd9742b5311c7cf (bsc#1124153) + - upstream commit 8cb83266062b383cdd4a57301ef559d64b491c51 (bsc#1125604) + - upstream commit 19a44dfe4525ab01caf593a9c2beada4b412910d (bsc#1156482) + ------------------------------------------------------------------- Wed Feb 28 06:53:02 UTC 2018 - Thomas.Blume@suse.com @@ -1623,7 +1732,7 @@ Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com ------------------------------------------------------------------- Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com -- Split systemd-container sub-package off +- Split systemd-container sub-package off (fate#325469) Other distros already do it and it seems a good idea to not install this stuff on new installations by default. At least diff --git a/systemd-mini.spec b/systemd-mini.spec index 4623a5c4..06ec129d 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -115,7 +115,7 @@ BuildRequires: gnu-efi %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs -Provides: systemd = %{version}-%{release} +Provides: systemd = %{version} %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -123,8 +123,9 @@ Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 +Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version}-%{release} +Requires: udev = %{version} Requires: util-linux >= 2.27.1 Requires: group(lock) Requires(post): coreutils @@ -141,7 +142,7 @@ Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Obsoletes: systemd-analyze < 201 -Provides: systemd-analyze = %{version}-%{release} +Provides: systemd-analyze = %{version} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz @@ -201,7 +202,7 @@ Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc -The HTML documenation for systemd +The HTML documentation for systemd. # /bootstrap %endif @@ -210,7 +211,7 @@ The HTML documenation for systemd Summary: Development headers for systemd License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Requires: libsystemd0%{?mini} = %{version}-%{release} +Requires: libsystemd0%{?mini} = %{version} Requires: systemd-rpm-macros %if 0%{?bootstrap} Conflicts: systemd-devel @@ -223,10 +224,10 @@ Development headers and auxiliary files for developing applications for systemd. Summary: System V init tools License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Provides: sbin_init Conflicts: otherproviders(sbin_init) -Provides: systemd-sysvinit = %{version}-%{release} +Provides: systemd-sysvinit = %{version} Provides: sysvinit:/sbin/init %description sysvinit @@ -282,7 +283,7 @@ Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} -Provides: udev = %{version}-%{release} +Provides: udev = %{version} Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap @@ -315,10 +316,10 @@ access to udev device information Summary: Development files for libudev License: LGPL-2.1-or-later Group: Development/Libraries/Other -Requires: libudev%{?mini}1 = %{version}-%{release} +Requires: libudev%{?mini}1 = %{version} %if 0%{?bootstrap} -Provides: libudev-devel = %{version}-%{release} -Conflicts: libudev1 = %{version}-%{release} +Provides: libudev-devel = %{version} +Conflicts: libudev1 = %{version} Conflicts: libudev-devel %endif @@ -331,7 +332,7 @@ dynamic library, which provides access to udev device information. Summary: Systemd tools for coredump management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -345,7 +346,7 @@ This package contains systemd-coredump, coredumpctl. Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} @@ -363,7 +364,7 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires @@ -379,7 +380,7 @@ resolver tools for resolved Summary: Systemd tools for portable services License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %systemd_requires %description portable @@ -441,7 +442,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name}-network = %{version}-%{release} +Requires: %{name}-network = %{version} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -475,7 +476,7 @@ To activate this NSS module, you will need to include it in Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -499,12 +500,6 @@ systemd-journal-remote, and systemd-journal-upload. %autopatch -p1 %build -%if 0%{?is_opensuse} -ntp_servers=({0..3}.opensuse.pool.ntp.org) -%else -ntp_servers=({0..3}.suse.pool.ntp.org) -%endif - # keep split-usr until all packages have moved their systemd rules to /usr %meson \ -Dversion-tag=%{version}%{suse_version} \ @@ -519,7 +514,6 @@ ntp_servers=({0..3}.suse.pool.ntp.org) -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ - -Dntp-servers="${ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ @@ -709,25 +703,6 @@ mkdir -p %{buildroot}%{_userpresetdir} mkdir -p %{buildroot}%{_systemd_system_env_generator_dir} mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} -# create drop-in to prevent tty1 to be cleared (bnc#804158) -mkdir %{buildroot}%{_unitdir}/getty@tty1.service.d/ -cat >%{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf <%{buildroot}%{_unitdir}/systemd-logind.service.d/nosandbox.conf <>%{buildroot}%{_datarootdir}/systemd/kbd-model-map -# Create a drop-in to prevent journald from starting auditd during -# boot (bsc#984034). -mkdir -p %{buildroot}%{_prefix}/lib/systemd/journald.conf.d -cat >%{buildroot}%{_prefix}/lib/systemd/journald.conf.d/20-suse-defaults.conf < + +- Do not include %{release} in a few places where we explicitly mention package versions + + It's usually not a good idea especially when used with conflicts. + +------------------------------------------------------------------- +Tue Oct 13 08:50:13 UTC 2020 - Franck Bui + +- Rely on systemd-default-settings for overriding system default settings + + The new branding packages now ships the drop-ins to customize + systemd either for an openSUSE or a SLE ditro. + ------------------------------------------------------------------- Wed Sep 30 19:09:59 UTC 2020 - Franck Bui @@ -342,6 +357,12 @@ Wed Mar 18 14:09:57 UTC 2020 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v245/NEWS for details. + This includes the following bug fixes: + + - upstream commit 7f56982289275ce84e20f0554475864953e6aaab (CVE-2020-1712) + - upstream commit 66a19d85a533b15ed32f4066ec880b5a8c06babd (bsc#1157315) + - upstream commit 7f56982289275ce84e20f0554475864953e6aaab (bsc#1162108) + The new tools provided by systemd repart, userdb, homed, fdisk, pwquality, p11kit feature have been disabled for now as they require reviews first. @@ -467,6 +488,15 @@ Thu Dec 5 14:00:03 UTC 2019 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v244/NEWS for details. + This includes the following bug fixes: + + - upstream commit b49e14d5f3081dfcd363d8199a14c0924ae9152f (bsc#1139459) + - upstream commit 22683674716fd0e5b016ce5a7d8fd90df5f9f9e7 (bsc#1151377) + - upstream commit faf205de3ba9a11b0ba17682123d7f3fedc7da24 (bsc#1151377) + - upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574) + - upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814) + - upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689) + Legacy and obsolete symlinks have been finally dropped. Dropped 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch. @@ -703,7 +733,17 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui - Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be) See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for - details. + details. + + This includes the following bug fixes: + + - upstream commit b2774a3ae692113e1f47a336a6c09bac9cfb49ad (CVE-2019-20386 bsc#1161436) + - upstream commit 5406c36844b35504a64e9f05fc74b8e5e5a09143 (bsc#1132400) + - upstream commit 83a32ea7b03d6707b8e5bb90a0b3a6eb868ef633 (bsc#1132721) + - upstream commit 7cc5ef5f1811c539ae7f20255c2a093f413cc64f (bsc#1172824 bsc#1142733) + - upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213) + - upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485) + - upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011) Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped from branch SUSE/v243 while we were rebasing. @@ -852,7 +892,7 @@ Tue May 14 14:27:12 UTC 2019 - Franck Bui ------------------------------------------------------------------- Mon May 13 08:46:38 UTC 2019 - Franck Bui -- Buildrequire polkit so /usr/share/polkit-1/rules.d has an owner +- Buildrequire polkit so /usr/share/polkit-1/rules.d has an owner (bsc#1145023) Otherwise the "post build checks" would complain and would force systemd to own this directory. The owner should still be "polkit" @@ -891,6 +931,16 @@ Thu May 2 13:12:23 UTC 2019 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for details. + This includes the following bug fixes: + + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (CVE-2019-3843) + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (CVE-2019-3844) + - upstream commit 37ed15d7edaf59a1fc7c9e3552cd93a83f3814ef (bsc#1124122) + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (bsc#1133506) + - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (bsc#1133509) + - upstream commit 1f82f5bb4237ed5f015daf93f818e9db95e764b8 (bsc#1150595) + - upstream commit e55bdf9b6c5f72475b258a7a4585a0480551cb60 (bsc#1173422) + ------------------------------------------------------------------- Wed Apr 24 07:23:44 UTC 2019 - Franck Bui @@ -914,7 +964,7 @@ Fri Apr 12 14:13:54 UTC 2019 - Franck Bui ------------------------------------------------------------------- Tue Mar 19 16:11:44 UTC 2019 - Franck Bui -- systemd-coredump: generate a stack trace of all core dumps (bsc#1128832) +- systemd-coredump: generate a stack trace of all core dumps (bsc#1128832 jsc#SLE-5933) This stack trace is logged to the journal. @@ -956,6 +1006,20 @@ Tue Mar 5 17:51:02 UTC 2019 - Franck Bui - Upgrade to v241 (commit 15a1b4d58f1d2bc9c21c7cbab6fe63b58e48bda1) + This includes the following bug fixes: + + - upstream commit c0d76959080e3ba6534bce1c7053c750668e8b55 (bsc#1160595) + - upstream commit 7334ade4a7e103b1a01d1c8fe1ea7c7a854a1c31 (bsc#1123892) + - upstream commit c7e93c4d15019323973baf12daa76357c83892c4 (boo#1111498) + + This also includes the following bug fixes released in v240: + + - upstream commit 2675747f3cdd6f1e6236bbb2f79abfa53fb307f1 (boo#1111498) + - upstream commit 9eb0fc32d6cb63e71f2cfc1e7dd34c3ede4b48a3 (bsc#1140631) + - upstream commit 1432d2dbdfa90963272a9b581dc4b55dd3ac514f (bsc#1155574) + - upstream commit 26e35b164b8d0603629b3d394554cfa728e8c3e4 (bsc#1169488) + - upstream commit a9fc640671ef60ac949f1ace6fa687ff242fc233 (fate#325697) + ------------------------------------------------------------------- Tue Feb 19 11:08:13 UTC 2019 - Franck Bui @@ -1216,6 +1280,20 @@ Wed Oct 24 10:07:36 UTC 2018 - Franck Bui - Upgrade to v239 (commit 6d8584e7e8e5d13d2bab49b9e6f6d2ec39759978) + This includes the following bug fixes: + + - upstream commit 0722b359342d2a9f9e0d453875624387a0ba1be2 (bsc#1045723) + - upstream commit 2f2e14b251b9929e84e8b690d0187b766dfbae20 (bsc#1124122) + - upstream commit c839b729c5f7b08f6d91bf9567d0b1f91d17e0f7 (bsc#1155207) + - upstream commit 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 (bsc#1168076) + + This also includes the following bug fixes released in v238: + + - upstream commit e8a3144ec4ff332bd63644e468a98e1a7e06e7e4 (bsc#1112024) + - upstream commit 4d219f5343b1924e7c519c2c178aeb5d1a5ab924 (bsc#1123727) + - upstream commit 43b7f24b5e0dd048452112bfb344739764c58694 (bsc#1146991) + - upstream commit bf443be99565e4327f1c8c12b79d98b4c1529cf1 (bsc#1156213) + ------------------------------------------------------------------- Mon Oct 15 16:23:05 UTC 2018 - Franck Bui @@ -1256,11 +1334,11 @@ Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com ------------------------------------------------------------------- Fri Sep 28 06:05:03 UTC 2018 - Thomas.Blume@suse.com -- split off SUSE specific configuration from systemd package (fate#325478) +- split off SUSE specific udev rules from systemd package (fate#325478) * remove 60-io-scheduler.rules * remove 80-hotplug-cpu-mem.rules * remove 99-wakeup-from-idle.rules - * remove /usr/lib/modules-load.d/sg.conf + * remove /usr/lib/modules-load.d/sg.conf (see bsc#1036463 for details) these are now maintained in the new package system-tuning-common-SUSE @@ -1449,7 +1527,7 @@ Wed Mar 28 12:30:31 UTC 2018 - fbui@suse.com ------------------------------------------------------------------- Wed Mar 28 12:13:03 UTC 2018 - fbui@suse.com -- Rename the tarball +- Rename the tarball (bsc#1087323) So it's clear that it contains some additional patches on top of the upstream version. Use the commit hash in the name so the exact @@ -1585,6 +1663,37 @@ Thu Mar 1 10:13:02 UTC 2018 - fbui@suse.com level. Those rules have been rejected by upstream as they seem to be written to workaround some kernel shortcomings... + This includes the following bug fix: + + - upstream commit 3d083b2245b0b8e52f2d8ccc3e55246f41f1f544 (bsc#1102908) + + This also includes the following bug fixes released in v235: + + - upstream commit 2e64e8f46d726689a44d4084226fe3e0ea255c29 (bsc#1069239) + - upstream commit 79873bc850177050baa0c5165b119adafeebb891 (bsc#1069239) + - upstream commit 4bc5d27b942afa83cc3d95debd2ad48d42ac07a8 (bsc#1089376) + - upstream commit e9ea4526a3a3b41eced29b8d742498cc36750424 (bsc#1089693) + - upstream commit d75b31837c93dbb9b20067719026ad0fb7cdfadd (bsc#1117025) + - upstream commit 0e8856d25ab71764a279c2377ae593c0f2460d8f (bsc#1117025) + - upstream commit 048dd629c4590eefb2ebd6a316c7350ed3a6ff19 (bsc#1119971) + - upstream commit 9b32afa9f241fe8febc0a754850f1e7331caf6e3 (bsc#1126056) + - upstream commit e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af (bsc#1137053) + - upstream commit 0864d311766498563331f486909a0d950ba7de87 (bsc#1158336) + - upstream commit d60cb656fc63c24b430421764b7d0322857d34fd (bsc#1161262) + - upstream commit e2be442e791fa1150aa835c684acc6d7189de3e1 (bsc#1165011) + - upstream commit 64a36ae4b1dd23474dd7ea261381ac437b24fac2 (bsc#1172072) + - upstream commit b001ad61e91b6499897f0c977045c7608c233bfa (jsc#SLE-7687) + + - includes IP filtering feature (jsc#SLE-7743) + + This also includes the following bug fixes released in v236: + + - upstream commit b3b4ebab02395933cde554b5a5d5c363dae3920d (bsc#1083571) + - upstream commit 3e3852b3c6c61506963112fd218a86b673fc61e6 (bsc#1110445) + - upstream commit 4050e4797603d3644707d58edfd9742b5311c7cf (bsc#1124153) + - upstream commit 8cb83266062b383cdd4a57301ef559d64b491c51 (bsc#1125604) + - upstream commit 19a44dfe4525ab01caf593a9c2beada4b412910d (bsc#1156482) + ------------------------------------------------------------------- Wed Feb 28 06:53:02 UTC 2018 - Thomas.Blume@suse.com @@ -1623,7 +1732,7 @@ Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com ------------------------------------------------------------------- Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com -- Split systemd-container sub-package off +- Split systemd-container sub-package off (fate#325469) Other distros already do it and it seems a good idea to not install this stuff on new installations by default. At least diff --git a/systemd.spec b/systemd.spec index 5001f010..c32b14c0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -113,7 +113,7 @@ BuildRequires: gnu-efi %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs -Provides: systemd = %{version}-%{release} +Provides: systemd = %{version} %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -121,8 +121,9 @@ Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 Requires: netcfg >= 11.5 +Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version}-%{release} +Requires: udev = %{version} Requires: util-linux >= 2.27.1 Requires: group(lock) Requires(post): coreutils @@ -139,7 +140,7 @@ Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Obsoletes: systemd-analyze < 201 -Provides: systemd-analyze = %{version}-%{release} +Provides: systemd-analyze = %{version} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz @@ -199,7 +200,7 @@ Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc -The HTML documenation for systemd +The HTML documentation for systemd. # /bootstrap %endif @@ -208,7 +209,7 @@ The HTML documenation for systemd Summary: Development headers for systemd License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Requires: libsystemd0%{?mini} = %{version}-%{release} +Requires: libsystemd0%{?mini} = %{version} Requires: systemd-rpm-macros %if 0%{?bootstrap} Conflicts: systemd-devel @@ -221,10 +222,10 @@ Development headers and auxiliary files for developing applications for systemd. Summary: System V init tools License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Provides: sbin_init Conflicts: otherproviders(sbin_init) -Provides: systemd-sysvinit = %{version}-%{release} +Provides: systemd-sysvinit = %{version} Provides: sysvinit:/sbin/init %description sysvinit @@ -280,7 +281,7 @@ Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} -Provides: udev = %{version}-%{release} +Provides: udev = %{version} Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap @@ -313,10 +314,10 @@ access to udev device information Summary: Development files for libudev License: LGPL-2.1-or-later Group: Development/Libraries/Other -Requires: libudev%{?mini}1 = %{version}-%{release} +Requires: libudev%{?mini}1 = %{version} %if 0%{?bootstrap} -Provides: libudev-devel = %{version}-%{release} -Conflicts: libudev1 = %{version}-%{release} +Provides: libudev-devel = %{version} +Conflicts: libudev1 = %{version} Conflicts: libudev-devel %endif @@ -329,7 +330,7 @@ dynamic library, which provides access to udev device information. Summary: Systemd tools for coredump management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -343,7 +344,7 @@ This package contains systemd-coredump, coredumpctl. Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} @@ -361,7 +362,7 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires @@ -377,7 +378,7 @@ resolver tools for resolved Summary: Systemd tools for portable services License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} %systemd_requires %description portable @@ -439,7 +440,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name}-network = %{version}-%{release} +Requires: %{name}-network = %{version} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -473,7 +474,7 @@ To activate this NSS module, you will need to include it in Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version}-%{release} +Requires: %{name} = %{version} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd @@ -497,12 +498,6 @@ systemd-journal-remote, and systemd-journal-upload. %autopatch -p1 %build -%if 0%{?is_opensuse} -ntp_servers=({0..3}.opensuse.pool.ntp.org) -%else -ntp_servers=({0..3}.suse.pool.ntp.org) -%endif - # keep split-usr until all packages have moved their systemd rules to /usr %meson \ -Dversion-tag=%{version}%{suse_version} \ @@ -517,7 +512,6 @@ ntp_servers=({0..3}.suse.pool.ntp.org) -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ -Ddefault-kill-user-processes=false \ - -Dntp-servers="${ntp_servers[*]}" \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ @@ -707,25 +701,6 @@ mkdir -p %{buildroot}%{_userpresetdir} mkdir -p %{buildroot}%{_systemd_system_env_generator_dir} mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} -# create drop-in to prevent tty1 to be cleared (bnc#804158) -mkdir %{buildroot}%{_unitdir}/getty@tty1.service.d/ -cat >%{buildroot}%{_unitdir}/getty@tty1.service.d/noclear.conf <%{buildroot}%{_unitdir}/systemd-logind.service.d/nosandbox.conf <>%{buildroot}%{_datarootdir}/systemd/kbd-model-map -# Create a drop-in to prevent journald from starting auditd during -# boot (bsc#984034). -mkdir -p %{buildroot}%{_prefix}/lib/systemd/journald.conf.d -cat >%{buildroot}%{_prefix}/lib/systemd/journald.conf.d/20-suse-defaults.conf < Date: Mon, 9 Nov 2020 12:56:30 +0000 Subject: [PATCH 061/124] Accepting request 846424 from Base:System OBS-URL: https://build.opensuse.org/request/show/846424 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=319 --- systemd-mini.changes | 69 ++++++- systemd-mini.spec | 32 ++- systemd-sysv-convert | 236 +++++++++------------- systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz | 3 - systemd-v246.6+suse.32.gfdce77ce20.tar.xz | 3 + systemd.changes | 69 ++++++- systemd.spec | 32 ++- 7 files changed, 268 insertions(+), 176 deletions(-) delete mode 100644 systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz create mode 100644 systemd-v246.6+suse.32.gfdce77ce20.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 131a1e63..063817c0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Fri Nov 6 08:34:18 UTC 2020 - Franck Bui + +- Import commit fdce77ce2067f9dd90d816bad28b51efed0b6dc1 + + 05fff5bd02 generator: use kmsg in system-level generators, journal otherwise + ecc07954de log: normalize log target condition check + d32ceea42b log: update comment + 2ebad02b60 basic/virt: Detect PowerVM hypervisor (bsc#1176800) + +------------------------------------------------------------------- +Mon Nov 2 15:17:20 UTC 2020 - Franck Bui + +- Simplify systemd-sysv-convert + + - the previous code incorrectly assumed that the sysv init scripts + were uninstalled before %post get executed. It therefore save the + enablement state in %pre and restore it in %post. Now all is done + in %post (making --save option useless) and there's no more need + to remember the enablement state. + + - "--save" option is a NOP but is still kept for backward + compatibility. + + - the previous simplifcation made /var/lib/systemd/migrated no more + used. + + - we do not search for units in /lib/systemd anymore, this shouldn't + be needed anymore these days especially since this path was only + used when systemd was introduced in openSUSE and it was never used + in SLE (checked SLE12-GA). + + - the option --show has been dropped. It's never been used even + internally. + + - the DB is populated only once even if the script was enabled at + multiple runlevels. The runlevel info was never used. A dummy + value is still added to keep the same format just in case. + +------------------------------------------------------------------- +Wed Oct 21 09:52:38 UTC 2020 - Franck Bui + +- No more need to clean the journal-upload stuff with --without=journal_remote + + Since -Dremote build option has been introduced with meson, this + workaround is no more needed. + +------------------------------------------------------------------- +Mon Oct 19 19:53:48 UTC 2020 - Franck Bui + +- Move journal-{remote,upload}.conf.5.gz man pages into systemd-journal_remote sub package + +------------------------------------------------------------------- +Mon Oct 19 18:50:38 UTC 2020 - Franck Bui + +- Explicitly list files in /usr/lib/sysusers.d shipped by the main package + + Currently only one config file is shipped in this directory and we + want to check any new files that may be added in the future. + +------------------------------------------------------------------- +Mon Oct 19 17:29:38 UTC 2020 - Franck Bui + +- Use %{_modulesloaddir}, %{_environmentdir} and %{_modprobedir} wherever appropriate + ------------------------------------------------------------------- Tue Oct 13 09:29:40 UTC 2020 - Franck Bui @@ -8,7 +73,7 @@ Tue Oct 13 09:29:40 UTC 2020 - Franck Bui ------------------------------------------------------------------- Tue Oct 13 08:50:13 UTC 2020 - Franck Bui -- Rely on systemd-default-settings for overriding system default settings +- Rely on systemd-default-settings for overriding system default settings (bsc#1172517) The new branding packages now ships the drop-ins to customize systemd either for an openSUSE or a SLE ditro. @@ -496,6 +561,7 @@ Thu Dec 5 14:00:03 UTC 2019 - Franck Bui - upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574) - upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814) - upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689) + - upstream commit bc9ecd484f1ebfe0de8b567c90f6cd867fbd5894 (bsc#1141597) Legacy and obsolete symlinks have been finally dropped. @@ -744,6 +810,7 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui - upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213) - upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485) - upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011) + - upstream commit 59c55e73eaee345e1ee67c23eace8895ed499693 (bsc#1177510) Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped from branch SUSE/v243 while we were rebasing. diff --git a/systemd-mini.spec b/systemd-mini.spec index 06ec129d..45a51d96 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.27.gd7b5ac76dc +%define suse_version +suse.32.gfdce77ce20 %bcond_with gnuefi %if 0%{?bootstrap} @@ -657,14 +657,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -# journal-upload is built if libcurl is installed which can happen -# when importd is enabled (whereas journal_remote is not). -%if ! %{with journal_remote} -rm -f %{buildroot}%{_sysconfdir}/systemd/journal-upload.conf -rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload -rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.* -%endif - # Create the /var/log/journal directory to change the volatile journal # to a persistent one mkdir -p %{buildroot}%{_localstatedir}/log/journal/ @@ -1187,18 +1179,16 @@ fi %endif %dir %{_sysconfdir}/modules-load.d -%{_prefix}/lib/modules-load.d +%{_modulesloaddir} + +%dir %{_sysusersdir} +%{_sysusersdir}/systemd.conf -%{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d %{_tmpfilesdir}/ %exclude %{_tmpfilesdir}/systemd-nspawn.conf -%if %{with journal_remote} -%exclude %{_sysusersdir}/systemd-remote.conf -%endif - -%{_prefix}/lib/environment.d/ +%{_environmentdir}/ %dir %{_binfmtdir} %dir %{_sysconfdir}/binfmt.d @@ -1241,8 +1231,8 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf # FIXME: why do we have to own this dir ? -%dir %{_prefix}/lib/modprobe.d -%{_prefix}/lib/modprobe.d/systemd.conf +%dir %{_modprobedir} +%{_modprobedir}/systemd.conf # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf @@ -1300,6 +1290,10 @@ fi %if %{with importd} %exclude %{_mandir}/man*/systemd-importd* %endif +%if %{with journal_remote} +%exclude %{_mandir}/man5/journal-remote.conf* +%exclude %{_mandir}/man5/journal-upload.conf* +%endif %if %{with portabled} %exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/systemd-portabled* @@ -1551,6 +1545,8 @@ fi %{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-upload %{_sysusersdir}/systemd-remote.conf +%{_mandir}/man5/journal-remote.conf* +%{_mandir}/man5/journal-upload.conf* %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* diff --git a/systemd-sysv-convert b/systemd-sysv-convert index 5d07c48d..8a75b941 100644 --- a/systemd-sysv-convert +++ b/systemd-sysv-convert @@ -1,146 +1,112 @@ #!/bin/bash +info() { + echo "$(basename $0): $*" +} + +warn() { + echo >&2 "$(basename $0): warning, $*" +} + +usage() { + echo >&2 "usage: $(basename $0) --apply [ ...]" +} + if [ "$UID" != "0" ]; then - echo Need to be root. + warn "need to be root, aborting" exit 1 fi -declare -A results_target - -usage() { - cat << EOF -usage: systemd-sysv-convert [-h] [--save] [--show] [--apply] - SERVICE [SERVICE ...] -EOF -} - -help() { +if [ $# -lt 2 ]; then usage - cat << EOF -Save and Restore SysV Service Runlevel Information + exit 1 +fi -positional arguments: - SERVICE Service names +database_lookup() { + local service unused -optional arguments: - -h, --help show this help message and exit - --save Save SysV runlevel information for one or more services - --show Show saved SysV runlevel information for one or more services - --apply Apply saved SysV runlevel information for one or more services - to systemd counterparts -EOF -} - -find_service() { - local service=$1 - local rcnd=$2 - - case $rcnd in - boot.d) [ -L /etc/rc.d/$rcnd/S??boot.$service ] ;; - *) [ -L /etc/rc.d/$rcnd/S??$service ] - esac -} - -lookup_database() { - local services=$@ - local service - local runlevel - local priority - - # 'priority' field is not used but is kept for backward compat - # reason. - while read service runlevel priority; do - for s in $services ; do - if [ $s == $service ]; then - results_target[$service]+=" runlevel$runlevel.target" - break - fi - done - done < /var/lib/systemd/sysv-convert/database -} - -declare -i fail=0 -case "$1" in - -h|--help) - help - exit 0 - ;; - --save) - shift - for service in $@ ; do - if [ ! -r /etc/init.d/$service ] && [ ! -r /etc/init.d/boot.$service ]; then - echo "SysV service $service does not exist, skipping" - continue - fi - for rcnd in rc2.d rc3.d rc4.d rc5.d boot.d; do - case $rcnd in - rc*.d) runlevel=${rcnd:2:1} ;; - boot.d) runlevel=3 ;; - esac - - # Write a dumb priority as it is not used. - find_service $service $rcnd && - echo "$service $runlevel 50" >>/var/lib/systemd/sysv-convert/database - done - done - ;; - --show) - shift - services=$@ - lookup_database $services - for service in $services; do - if [ -z "${results_target[$service]}" ]; then - echo "No information about service $service found." >/dev/stderr - let fail++ - continue - fi - for target in ${results_target[$service]}; do - echo "SysV service '$service' is pulled by $target" - done - done - ;; - --apply) - shift - services=$@ - for service in $services; do - if [ ! -f "/lib/systemd/system/$service.service" -a ! -f "/usr/lib/systemd/system/$service.service" ]; then - echo systemd service $service.service does not exist. >/dev/stderr - exit 1 - fi - done - - # - # The database might no have been created by a previous --save - # call. This can happen when: - # - # - we're upgrading a package which initially didn't - # have any unit file nor sysv init script and now - # start shipping one or more unit files (bsc#982303). - # - # - the sysv init service wasn't enabled at all before - # being migrated to a native unit file (bsc#982211). - # - if [ -e /var/lib/systemd/sysv-convert/database ]; then - lookup_database $services - for service in $services; do - [ -f "/lib/systemd/system/$service.service" ] && unit="/lib/systemd/system/$service.service" - [ -f "/usr/lib/systemd/system/$service.service" ] && unit="/usr/lib/systemd/system/$service.service" - - # If $service is not present in the database, - # then it simply means that the sysv init - # service was not enabled at all. - for target in ${results_target[$service]}; do - echo ln -sf $unit /etc/systemd/system/$target.wants/$service.service >/dev/stderr - mkdir -p "/etc/systemd/system/$target.wants" - /bin/ln -sf $unit /etc/systemd/system/$target.wants/$service.service - done - done + # 'priority' field is not used but is kept for backward compat reason. + while read service unused; do + if [ $service == $1 ]; then + return 0 fi - ;; - *) - usage - let fail=2 - ;; -esac + done >/var/lib/systemd/sysv-convert/database +} + +# Initialize the database. +if [ ! -e /var/lib/systemd/sysv-convert/database ]; then + touch /var/lib/systemd/sysv-convert/database +fi + +case "$1" in +--save) + # --save is kept for backward compatibility. + ;; +--apply) + shift + for service in $@; do + # For backward compat we accept the name of the + # service with or without the unit type suffix. If the + # suffix is not there, assume .service type. + case "$service" in + *.*) initscript="${service%.*}" ;; + *) initscript="$service" + service="$service.service" + esac + + # Did we already migrate this service during a previous update ? + database_lookup $initscript && + continue + + # Sanity check. + unit="/usr/lib/systemd/system/$service" + if [ ! -f "$unit" ]; then + warn "$unit not found, skipping" + continue + fi + + # Mark the service as processed to make sure we will do the migration only + # once. This is important especially for packages that keep their init + # scripts around even if they're no more used. Since the saved info won't + # be reused again we simply use an invalid runlevel and add the service + # in the db only once. + database_add $initscript -1 + + # The package is introducing new services and never has any sysv init + # scripts (bsc#982303). + if [ ! -r /etc/init.d/$initscript ] && + [ ! -r /etc/init.d/boot.$initscript ]; then + continue + fi + + for rcnd in rc2.d rc3.d rc4.d rc5.d boot.d; do + # Was the sysvinit script enabled ? (bsc#982211) + case $rcnd in + boot.d) [ -L /etc/rc.d/boot.d/S??boot.$initscript ] || continue ;; + *) [ -L /etc/rc.d/$rcnd/S??$initscript ] || continue + esac + + case $rcnd in + boot.d) runlevel=3 ;; + *) runlevel=${rcnd:2:1} + esac + + target=runlevel$runlevel.target + info "enabling $unit (wanted by $target)..." + + mkdir -p "/etc/systemd/system/$target.wants" + ln -sf $unit /etc/systemd/system/$target.wants/$service + done + done + ;; +*) + usage + exit 1 +esac diff --git a/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz b/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz deleted file mode 100644 index 1689808c..00000000 --- a/systemd-v246.6+suse.27.gd7b5ac76dc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a49af04e1d1dbadfcc869108ab16976a774dbbc379ae2226a4977f32c734a499 -size 6552824 diff --git a/systemd-v246.6+suse.32.gfdce77ce20.tar.xz b/systemd-v246.6+suse.32.gfdce77ce20.tar.xz new file mode 100644 index 00000000..8b205eb8 --- /dev/null +++ b/systemd-v246.6+suse.32.gfdce77ce20.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:004c6f73d42c28b4706a44c3da99e8c8054ed324b4e77422abdcde0a93caa757 +size 6552480 diff --git a/systemd.changes b/systemd.changes index 131a1e63..063817c0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,68 @@ +------------------------------------------------------------------- +Fri Nov 6 08:34:18 UTC 2020 - Franck Bui + +- Import commit fdce77ce2067f9dd90d816bad28b51efed0b6dc1 + + 05fff5bd02 generator: use kmsg in system-level generators, journal otherwise + ecc07954de log: normalize log target condition check + d32ceea42b log: update comment + 2ebad02b60 basic/virt: Detect PowerVM hypervisor (bsc#1176800) + +------------------------------------------------------------------- +Mon Nov 2 15:17:20 UTC 2020 - Franck Bui + +- Simplify systemd-sysv-convert + + - the previous code incorrectly assumed that the sysv init scripts + were uninstalled before %post get executed. It therefore save the + enablement state in %pre and restore it in %post. Now all is done + in %post (making --save option useless) and there's no more need + to remember the enablement state. + + - "--save" option is a NOP but is still kept for backward + compatibility. + + - the previous simplifcation made /var/lib/systemd/migrated no more + used. + + - we do not search for units in /lib/systemd anymore, this shouldn't + be needed anymore these days especially since this path was only + used when systemd was introduced in openSUSE and it was never used + in SLE (checked SLE12-GA). + + - the option --show has been dropped. It's never been used even + internally. + + - the DB is populated only once even if the script was enabled at + multiple runlevels. The runlevel info was never used. A dummy + value is still added to keep the same format just in case. + +------------------------------------------------------------------- +Wed Oct 21 09:52:38 UTC 2020 - Franck Bui + +- No more need to clean the journal-upload stuff with --without=journal_remote + + Since -Dremote build option has been introduced with meson, this + workaround is no more needed. + +------------------------------------------------------------------- +Mon Oct 19 19:53:48 UTC 2020 - Franck Bui + +- Move journal-{remote,upload}.conf.5.gz man pages into systemd-journal_remote sub package + +------------------------------------------------------------------- +Mon Oct 19 18:50:38 UTC 2020 - Franck Bui + +- Explicitly list files in /usr/lib/sysusers.d shipped by the main package + + Currently only one config file is shipped in this directory and we + want to check any new files that may be added in the future. + +------------------------------------------------------------------- +Mon Oct 19 17:29:38 UTC 2020 - Franck Bui + +- Use %{_modulesloaddir}, %{_environmentdir} and %{_modprobedir} wherever appropriate + ------------------------------------------------------------------- Tue Oct 13 09:29:40 UTC 2020 - Franck Bui @@ -8,7 +73,7 @@ Tue Oct 13 09:29:40 UTC 2020 - Franck Bui ------------------------------------------------------------------- Tue Oct 13 08:50:13 UTC 2020 - Franck Bui -- Rely on systemd-default-settings for overriding system default settings +- Rely on systemd-default-settings for overriding system default settings (bsc#1172517) The new branding packages now ships the drop-ins to customize systemd either for an openSUSE or a SLE ditro. @@ -496,6 +561,7 @@ Thu Dec 5 14:00:03 UTC 2019 - Franck Bui - upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574) - upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814) - upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689) + - upstream commit bc9ecd484f1ebfe0de8b567c90f6cd867fbd5894 (bsc#1141597) Legacy and obsolete symlinks have been finally dropped. @@ -744,6 +810,7 @@ Tue Sep 3 15:10:10 UTC 2019 - Franck Bui - upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213) - upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485) - upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011) + - upstream commit 59c55e73eaee345e1ee67c23eace8895ed499693 (bsc#1177510) Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped from branch SUSE/v243 while we were rebasing. diff --git a/systemd.spec b/systemd.spec index c32b14c0..03f5ba0f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.27.gd7b5ac76dc +%define suse_version +suse.32.gfdce77ce20 %bcond_with gnuefi %if 0%{?bootstrap} @@ -655,14 +655,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -# journal-upload is built if libcurl is installed which can happen -# when importd is enabled (whereas journal_remote is not). -%if ! %{with journal_remote} -rm -f %{buildroot}%{_sysconfdir}/systemd/journal-upload.conf -rm -f %{buildroot}%{_prefix}/lib/systemd/systemd-journal-upload -rm -f %{buildroot}%{_unitdir}/systemd-journal-upload.* -%endif - # Create the /var/log/journal directory to change the volatile journal # to a persistent one mkdir -p %{buildroot}%{_localstatedir}/log/journal/ @@ -1185,18 +1177,16 @@ fi %endif %dir %{_sysconfdir}/modules-load.d -%{_prefix}/lib/modules-load.d +%{_modulesloaddir} + +%dir %{_sysusersdir} +%{_sysusersdir}/systemd.conf -%{_sysusersdir}/ %dir %{_sysconfdir}/tmpfiles.d %{_tmpfilesdir}/ %exclude %{_tmpfilesdir}/systemd-nspawn.conf -%if %{with journal_remote} -%exclude %{_sysusersdir}/systemd-remote.conf -%endif - -%{_prefix}/lib/environment.d/ +%{_environmentdir}/ %dir %{_binfmtdir} %dir %{_sysconfdir}/binfmt.d @@ -1239,8 +1229,8 @@ fi %{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf # FIXME: why do we have to own this dir ? -%dir %{_prefix}/lib/modprobe.d -%{_prefix}/lib/modprobe.d/systemd.conf +%dir %{_modprobedir} +%{_modprobedir}/systemd.conf # Some files created at runtime. %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf @@ -1298,6 +1288,10 @@ fi %if %{with importd} %exclude %{_mandir}/man*/systemd-importd* %endif +%if %{with journal_remote} +%exclude %{_mandir}/man5/journal-remote.conf* +%exclude %{_mandir}/man5/journal-upload.conf* +%endif %if %{with portabled} %exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/systemd-portabled* @@ -1549,6 +1543,8 @@ fi %{_prefix}/lib/systemd/systemd-journal-remote %{_prefix}/lib/systemd/systemd-journal-upload %{_sysusersdir}/systemd-remote.conf +%{_mandir}/man5/journal-remote.conf* +%{_mandir}/man5/journal-upload.conf* %{_mandir}/man8/systemd-journal-gatewayd.* %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* From 21903917ecfb9dd00bed27d50aedb9bd8abfcd3ec435519b712f0fb327d9b058 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 3 Dec 2020 17:41:21 +0000 Subject: [PATCH 062/124] Accepting request 852344 from Base:System OBS-URL: https://build.opensuse.org/request/show/852344 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=320 --- systemd-mini.changes | 48 +++++++++++++++++++++++ systemd-mini.spec | 32 +++++++-------- systemd-v246.6+suse.32.gfdce77ce20.tar.xz | 3 -- systemd-v246.6+suse.45.gf6104ea5f5.tar.xz | 3 ++ systemd.changes | 48 +++++++++++++++++++++++ systemd.spec | 32 +++++++-------- 6 files changed, 131 insertions(+), 35 deletions(-) delete mode 100644 systemd-v246.6+suse.32.gfdce77ce20.tar.xz create mode 100644 systemd-v246.6+suse.45.gf6104ea5f5.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 063817c0..47b80da0 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Tue Dec 1 09:42:11 UTC 2020 - Franck Bui + +- Import commit f6104ea5f554233e34b94ffd92da8332c3bd7d8f + + 617aed9236 scope: on unified, make sure to unwatch all PIDs once they've been moved to the cgroup scope + +------------------------------------------------------------------- +Tue Nov 24 13:39:28 UTC 2020 - Franck Bui + +- Don't post-require systemd-default-settings-branding anymore + + This is actually not needed now that the branding package issues a + PID1 reloading every times it's being updated. + +------------------------------------------------------------------- +Mon Nov 23 17:20:28 UTC 2020 - Franck Bui + +- Import commit 49caf8e37aba04841e5493ccc25e7edab462d95b + + f8f7286527 units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-config.mount + e9c7158dc7 units: wait until some fs modules are entirely loaded before mounting their corresponding filesystem (bsc#1178631) + ac7ddc4201 Revert "units: skip modprobe@.service if the unit appears to be already loaded" + 17310a1d19 core: serialize u->pids until the processes have been moved to the scope cgroup (bsc#1174436) + 1416965614 meson: add option to skip installing to $sysconfdir + f71a1ef5d0 systemctl: give a nice hint about org.freedesktop.LogControl1 when applicable + 20a3f9fd95 systemctl: immediately reject invalid log levels + 9f67d2e57b systemctl: merge log_target(), log_level(), service_log_setting() + ddf7cf4872 systemctl: add service-log-{level,target} verbs + 026d7d156d systemctl: list unit introspection verbs first, modification second + +------------------------------------------------------------------- +Fri Nov 20 14:54:55 UTC 2020 - Franck Bui + +- systemd-default-settings is needed by %post scriptlet + +------------------------------------------------------------------- +Tue Nov 17 08:44:10 UTC 2020 - Franck Bui + +- Revert the change that dropped %{release} from the package version + constraints used in Requires: + + The release number is actually relevant since it can be increased + when some patches, which might touch multiple sub-packages of + systemd, are added/modified. + + However the %{release} is still no more used in conflicts. + ------------------------------------------------------------------- Fri Nov 6 08:34:18 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 45a51d96..74895391 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.32.gfdce77ce20 +%define suse_version +suse.45.gf6104ea5f5 %bcond_with gnuefi %if 0%{?bootstrap} @@ -115,7 +115,7 @@ BuildRequires: gnu-efi %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs -Provides: systemd = %{version} +Provides: systemd = %{version}-%{release} %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -125,7 +125,7 @@ Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version} +Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) Requires(post): coreutils @@ -142,7 +142,7 @@ Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Obsoletes: systemd-analyze < 201 -Provides: systemd-analyze = %{version} +Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz @@ -211,7 +211,7 @@ The HTML documentation for systemd. Summary: Development headers for systemd License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Requires: libsystemd0%{?mini} = %{version} +Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} Conflicts: systemd-devel @@ -224,10 +224,10 @@ Development headers and auxiliary files for developing applications for systemd. Summary: System V init tools License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) -Provides: systemd-sysvinit = %{version} +Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init %description sysvinit @@ -283,7 +283,7 @@ Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} -Provides: udev = %{version} +Provides: udev = %{version}-%{release} Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap @@ -316,9 +316,9 @@ access to udev device information Summary: Development files for libudev License: LGPL-2.1-or-later Group: Development/Libraries/Other -Requires: libudev%{?mini}1 = %{version} +Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} -Provides: libudev-devel = %{version} +Provides: libudev-devel = %{version}-%{version} Conflicts: libudev1 = %{version} Conflicts: libudev-devel %endif @@ -332,7 +332,7 @@ dynamic library, which provides access to udev device information. Summary: Systemd tools for coredump management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -346,7 +346,7 @@ This package contains systemd-coredump, coredumpctl. Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} @@ -364,7 +364,7 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires @@ -380,7 +380,7 @@ resolver tools for resolved Summary: Systemd tools for portable services License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %systemd_requires %description portable @@ -442,7 +442,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name}-network = %{version} +Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -476,7 +476,7 @@ To activate this NSS module, you will need to include it in Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd diff --git a/systemd-v246.6+suse.32.gfdce77ce20.tar.xz b/systemd-v246.6+suse.32.gfdce77ce20.tar.xz deleted file mode 100644 index 8b205eb8..00000000 --- a/systemd-v246.6+suse.32.gfdce77ce20.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:004c6f73d42c28b4706a44c3da99e8c8054ed324b4e77422abdcde0a93caa757 -size 6552480 diff --git a/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz b/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz new file mode 100644 index 00000000..15741d20 --- /dev/null +++ b/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3d33530b2e48912244b0848b179234ff46cb15c57508d5b0910ab3d668dc29b +size 6554804 diff --git a/systemd.changes b/systemd.changes index 063817c0..47b80da0 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Tue Dec 1 09:42:11 UTC 2020 - Franck Bui + +- Import commit f6104ea5f554233e34b94ffd92da8332c3bd7d8f + + 617aed9236 scope: on unified, make sure to unwatch all PIDs once they've been moved to the cgroup scope + +------------------------------------------------------------------- +Tue Nov 24 13:39:28 UTC 2020 - Franck Bui + +- Don't post-require systemd-default-settings-branding anymore + + This is actually not needed now that the branding package issues a + PID1 reloading every times it's being updated. + +------------------------------------------------------------------- +Mon Nov 23 17:20:28 UTC 2020 - Franck Bui + +- Import commit 49caf8e37aba04841e5493ccc25e7edab462d95b + + f8f7286527 units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-config.mount + e9c7158dc7 units: wait until some fs modules are entirely loaded before mounting their corresponding filesystem (bsc#1178631) + ac7ddc4201 Revert "units: skip modprobe@.service if the unit appears to be already loaded" + 17310a1d19 core: serialize u->pids until the processes have been moved to the scope cgroup (bsc#1174436) + 1416965614 meson: add option to skip installing to $sysconfdir + f71a1ef5d0 systemctl: give a nice hint about org.freedesktop.LogControl1 when applicable + 20a3f9fd95 systemctl: immediately reject invalid log levels + 9f67d2e57b systemctl: merge log_target(), log_level(), service_log_setting() + ddf7cf4872 systemctl: add service-log-{level,target} verbs + 026d7d156d systemctl: list unit introspection verbs first, modification second + +------------------------------------------------------------------- +Fri Nov 20 14:54:55 UTC 2020 - Franck Bui + +- systemd-default-settings is needed by %post scriptlet + +------------------------------------------------------------------- +Tue Nov 17 08:44:10 UTC 2020 - Franck Bui + +- Revert the change that dropped %{release} from the package version + constraints used in Requires: + + The release number is actually relevant since it can be increased + when some patches, which might touch multiple sub-packages of + systemd, are added/modified. + + However the %{release} is still no more used in conflicts. + ------------------------------------------------------------------- Fri Nov 6 08:34:18 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 03f5ba0f..3de69d39 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.32.gfdce77ce20 +%define suse_version +suse.45.gf6104ea5f5 %bcond_with gnuefi %if 0%{?bootstrap} @@ -113,7 +113,7 @@ BuildRequires: gnu-efi %if 0%{?bootstrap} #!BuildIgnore: dbus-1 Requires: this-is-only-for-build-envs -Provides: systemd = %{version} +Provides: systemd = %{version}-%{release} %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -123,7 +123,7 @@ Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version} +Requires: udev = %{version}-%{release} Requires: util-linux >= 2.27.1 Requires: group(lock) Requires(post): coreutils @@ -140,7 +140,7 @@ Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Obsoletes: systemd-analyze < 201 -Provides: systemd-analyze = %{version} +Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Source0: systemd-v%{version}%{suse_version}.tar.xz @@ -209,7 +209,7 @@ The HTML documentation for systemd. Summary: Development headers for systemd License: LGPL-2.1-or-later Group: Development/Libraries/C and C++ -Requires: libsystemd0%{?mini} = %{version} +Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} Conflicts: systemd-devel @@ -222,10 +222,10 @@ Development headers and auxiliary files for developing applications for systemd. Summary: System V init tools License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) -Provides: systemd-sysvinit = %{version} +Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init %description sysvinit @@ -281,7 +281,7 @@ Conflicts: util-linux < 2.16 Conflicts: ConsoleKit < 0.4.1 Requires: filesystem %if 0%{?bootstrap} -Provides: udev = %{version} +Provides: udev = %{version}-%{release} Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap @@ -314,9 +314,9 @@ access to udev device information Summary: Development files for libudev License: LGPL-2.1-or-later Group: Development/Libraries/Other -Requires: libudev%{?mini}1 = %{version} +Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} -Provides: libudev-devel = %{version} +Provides: libudev-devel = %{version}-%{version} Conflicts: libudev1 = %{version} Conflicts: libudev-devel %endif @@ -330,7 +330,7 @@ dynamic library, which provides access to udev device information. Summary: Systemd tools for coredump management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -344,7 +344,7 @@ This package contains systemd-coredump, coredumpctl. Summary: Systemd tools for container management License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} @@ -362,7 +362,7 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires @@ -378,7 +378,7 @@ resolver tools for resolved Summary: Systemd tools for portable services License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} %systemd_requires %description portable @@ -440,7 +440,7 @@ To activate this NSS module, you will need to include it in Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later Group: System/Libraries -Requires: %{name}-network = %{version} +Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve This package contains a plug-in module for the Name Service Switch @@ -474,7 +474,7 @@ To activate this NSS module, you will need to include it in Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later Group: System/Base -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires(post): systemd Requires(preun): systemd Requires(postun): systemd From 2e4c0c531aaa27be37bd10869326db9ee562586e36e264371c2c88739f17497c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 12 Dec 2020 19:27:10 +0000 Subject: [PATCH 063/124] Accepting request 854320 from Base:System OBS-URL: https://build.opensuse.org/request/show/854320 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=321 --- systemd-mini.changes | 12 ++++++++++++ systemd-mini.spec | 4 ++-- systemd-v246.6+suse.45.gf6104ea5f5.tar.xz | 3 --- systemd-v246.7+suse.50.gd5e7958d35.tar.xz | 3 +++ systemd.changes | 12 ++++++++++++ systemd.spec | 4 ++-- 6 files changed, 31 insertions(+), 7 deletions(-) delete mode 100644 systemd-v246.6+suse.45.gf6104ea5f5.tar.xz create mode 100644 systemd-v246.7+suse.50.gd5e7958d35.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 47b80da0..9ffd13af 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Dec 9 16:08:26 UTC 2020 - Franck Bui + +- Import commit d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 (merge of v246.7) + + 450792497e sd-event: fix delays assert brain-o (#17790) + 1040a19d08 udevadm: rename option '--log-priority' into '--log-level' + a7b41e19bd udev: rename kernel option 'log_priority' into 'log_level' + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/f6104ea5f554233e34b94ffd92da8332c3bd7d8f...d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 + ------------------------------------------------------------------- Tue Dec 1 09:42:11 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 74895391..742760cf 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.45.gf6104ea5f5 +%define suse_version +suse.50.gd5e7958d35 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.6 +Version: 246.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later diff --git a/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz b/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz deleted file mode 100644 index 15741d20..00000000 --- a/systemd-v246.6+suse.45.gf6104ea5f5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d3d33530b2e48912244b0848b179234ff46cb15c57508d5b0910ab3d668dc29b -size 6554804 diff --git a/systemd-v246.7+suse.50.gd5e7958d35.tar.xz b/systemd-v246.7+suse.50.gd5e7958d35.tar.xz new file mode 100644 index 00000000..db7bf6ca --- /dev/null +++ b/systemd-v246.7+suse.50.gd5e7958d35.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3c1a83d6d456c3d2f14d2942a3b85b6044ae52c5385cfb4074c23ec8bdebab6 +size 6564004 diff --git a/systemd.changes b/systemd.changes index 47b80da0..9ffd13af 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Wed Dec 9 16:08:26 UTC 2020 - Franck Bui + +- Import commit d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 (merge of v246.7) + + 450792497e sd-event: fix delays assert brain-o (#17790) + 1040a19d08 udevadm: rename option '--log-priority' into '--log-level' + a7b41e19bd udev: rename kernel option 'log_priority' into 'log_level' + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/f6104ea5f554233e34b94ffd92da8332c3bd7d8f...d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 + ------------------------------------------------------------------- Tue Dec 1 09:42:11 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 3de69d39..00a4afd9 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.45.gf6104ea5f5 +%define suse_version +suse.50.gd5e7958d35 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.6 +Version: 246.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From b0c2cef737d92b8ac60b0cf34c76630a2100aacff830ebe0103c066ebd7d148e Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 16 Dec 2020 09:58:54 +0000 Subject: [PATCH 064/124] Accepting request 855788 from Base:System - Explicitly require group(kvm) by udev: the group used to be created by system-users-hardware, but has been split/moved to qemu/kvm, where it is more logical. The file /usr/lib/udev/rules.d/50-udev-default.rules references this group, thus we should make sure the group exists. Otherwise there are errors in the journal in the form of: /usr/lib/udev/rules.d/50-udev-default.rules:86 Unknown group 'kvm', ignoring OBS-URL: https://build.opensuse.org/request/show/855788 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=322 --- systemd-mini.changes | 11 +++++++++++ systemd-mini.spec | 1 + systemd.changes | 11 +++++++++++ systemd.spec | 1 + 4 files changed, 24 insertions(+) diff --git a/systemd-mini.changes b/systemd-mini.changes index 9ffd13af..d5d6ac36 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 14 07:55:03 UTC 2020 - Dominique Leuenberger + +- Explicitly require group(kvm) by udev: the group used to be + created by system-users-hardware, but has been split/moved to + qemu/kvm, where it is more logical. The file + /usr/lib/udev/rules.d/50-udev-default.rules references this + group, thus we should make sure the group exists. Otherwise there + are errors in the journal in the form of: + /usr/lib/udev/rules.d/50-udev-default.rules:86 Unknown group 'kvm', ignoring + ------------------------------------------------------------------- Wed Dec 9 16:08:26 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 742760cf..450e5910 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -269,6 +269,7 @@ License: GPL-2.0-only Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware +Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils diff --git a/systemd.changes b/systemd.changes index 9ffd13af..d5d6ac36 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Mon Dec 14 07:55:03 UTC 2020 - Dominique Leuenberger + +- Explicitly require group(kvm) by udev: the group used to be + created by system-users-hardware, but has been split/moved to + qemu/kvm, where it is more logical. The file + /usr/lib/udev/rules.d/50-udev-default.rules references this + group, thus we should make sure the group exists. Otherwise there + are errors in the journal in the form of: + /usr/lib/udev/rules.d/50-udev-default.rules:86 Unknown group 'kvm', ignoring + ------------------------------------------------------------------- Wed Dec 9 16:08:26 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 00a4afd9..1db25784 100644 --- a/systemd.spec +++ b/systemd.spec @@ -267,6 +267,7 @@ License: GPL-2.0-only Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: system-group-hardware +Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils From 9ab73ef591da82ca67eb425633f586b5ed6b813102b3876499fcabd9b2055008 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 22 Dec 2020 10:26:02 +0000 Subject: [PATCH 065/124] Accepting request 856900 from Base:System OBS-URL: https://build.opensuse.org/request/show/856900 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=323 --- systemd-mini.changes | 56 +++++++++++++++++++++++ systemd-mini.spec | 5 +- systemd-v246.7+suse.50.gd5e7958d35.tar.xz | 3 -- systemd-v246.9+suse.78.g520e53b6d8.tar.xz | 3 ++ systemd.changes | 56 +++++++++++++++++++++++ systemd.spec | 5 +- 6 files changed, 121 insertions(+), 7 deletions(-) delete mode 100644 systemd-v246.7+suse.50.gd5e7958d35.tar.xz create mode 100644 systemd-v246.9+suse.78.g520e53b6d8.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index d5d6ac36..be0880dd 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Fri Dec 18 08:54:20 UTC 2020 - Franck Bui + +- Import commit 520e53b6d85087b05892ee637ae93f1b269e7e52 (merge of v246.9) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/2401461e5f0e32922823d954c56106f96344070e...520e53b6d85087b05892ee637ae93f1b269e7e52 + +------------------------------------------------------------------- +Fri Dec 18 08:41:04 UTC 2020 - Franck Bui + +- Import commit 2401461e5f0e32922823d954c56106f96344070e + + 6131548b0f udev: link_update() should fail if the entry in symlink dir couldn't have been created + f6cb8c7d79 udev: make algorithm that selects highest priority devlink less susceptible to race conditions (bsc#1084748) + fc64e47291 basic/stat-util: make mtime check stricter and use entire timestamp + ae91d45d3d test/sys-script.py: add missing DEVNAME entries to uevents + 09e3473a7a test/udev_test.pl: add "expected good" count + fc89379b5b test/udev-test.pl: suppress umount error message at startup + d9e114f10d test/sd-script.py: new helper script for udev testing + f2672eae66 test/udev-test.pl: generator for large list of block devices + 42b68e43e2 test/udev-test.pl: add repeat count + eec8ec375a tests/udev-test.pl: add multiple device test + 73b8f3cf93 test/udev-test.pl: count "good" results + ee04d70bb6 test/udev-test.pl: merge import parent tests into one + 03942c8fbc test/udev-test.pl: merge "space and var with space" tests + ec95546189 test/udev-test.pl: remove bogus rules from magic subsys test + f704429217 test/udev-test.pl: Make some tests a little harder + ce1a877dc0 test/udev-test.pl: last_rule is unsupported + 913c72ff2d test/udev-test.pl: fix wrong test descriptions + eeb25a1be6 test/udev-test.pl: allow checking multiple symlinks + 00ab4292da test/udev-test.pl: test correctness of symlink targets + 5b71ee2911 test/udev-test.pl: use computed devnode name + 2e04bb9ae8 test/udev-test.pl: allow concurrent additions and removals + 8816dd593c test/udev-test.pl: create rules only once + 214418632d test/udev-test.pl: allow multiple devices per test + 1eb6b23f27 udev-test: do not rely on "mail" group being defined + 4a0a4dcf10 udev: Fix sound.target dependency (bsc#1179363) + +------------------------------------------------------------------- +Wed Dec 16 10:40:48 UTC 2020 - Franck Bui + +- Enable support for zstd compression + + systemd-journald will now use zstd for compressing large fields in + journal files. systemd-coredump will also use this algorithm to + compress coredump files. + + Please note that systemd older than v246 won't be able to read new + journal files as zstd algorithm is not supported by these versions. + + This incompatible change was actually not the only one introduced by + v246 since the hash tables in journal files have been hardened + against hash collisions too in an incompatible way with older + versions. + ------------------------------------------------------------------- Mon Dec 14 07:55:03 UTC 2020 - Dominique Leuenberger diff --git a/systemd-mini.spec b/systemd-mini.spec index 450e5910..73c531fa 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.50.gd5e7958d35 +%define suse_version +suse.78.g520e53b6d8 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.7 +Version: 246.9 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -79,6 +79,7 @@ BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 +BuildRequires: pkgconfig(libzstd) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif diff --git a/systemd-v246.7+suse.50.gd5e7958d35.tar.xz b/systemd-v246.7+suse.50.gd5e7958d35.tar.xz deleted file mode 100644 index db7bf6ca..00000000 --- a/systemd-v246.7+suse.50.gd5e7958d35.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3c1a83d6d456c3d2f14d2942a3b85b6044ae52c5385cfb4074c23ec8bdebab6 -size 6564004 diff --git a/systemd-v246.9+suse.78.g520e53b6d8.tar.xz b/systemd-v246.9+suse.78.g520e53b6d8.tar.xz new file mode 100644 index 00000000..805cd127 --- /dev/null +++ b/systemd-v246.9+suse.78.g520e53b6d8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:988d1da9b2cdd0856c7036b120c037789f2ed6d5171911ff654cd8bcf72cf07a +size 6569608 diff --git a/systemd.changes b/systemd.changes index d5d6ac36..be0880dd 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,59 @@ +------------------------------------------------------------------- +Fri Dec 18 08:54:20 UTC 2020 - Franck Bui + +- Import commit 520e53b6d85087b05892ee637ae93f1b269e7e52 (merge of v246.9) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/2401461e5f0e32922823d954c56106f96344070e...520e53b6d85087b05892ee637ae93f1b269e7e52 + +------------------------------------------------------------------- +Fri Dec 18 08:41:04 UTC 2020 - Franck Bui + +- Import commit 2401461e5f0e32922823d954c56106f96344070e + + 6131548b0f udev: link_update() should fail if the entry in symlink dir couldn't have been created + f6cb8c7d79 udev: make algorithm that selects highest priority devlink less susceptible to race conditions (bsc#1084748) + fc64e47291 basic/stat-util: make mtime check stricter and use entire timestamp + ae91d45d3d test/sys-script.py: add missing DEVNAME entries to uevents + 09e3473a7a test/udev_test.pl: add "expected good" count + fc89379b5b test/udev-test.pl: suppress umount error message at startup + d9e114f10d test/sd-script.py: new helper script for udev testing + f2672eae66 test/udev-test.pl: generator for large list of block devices + 42b68e43e2 test/udev-test.pl: add repeat count + eec8ec375a tests/udev-test.pl: add multiple device test + 73b8f3cf93 test/udev-test.pl: count "good" results + ee04d70bb6 test/udev-test.pl: merge import parent tests into one + 03942c8fbc test/udev-test.pl: merge "space and var with space" tests + ec95546189 test/udev-test.pl: remove bogus rules from magic subsys test + f704429217 test/udev-test.pl: Make some tests a little harder + ce1a877dc0 test/udev-test.pl: last_rule is unsupported + 913c72ff2d test/udev-test.pl: fix wrong test descriptions + eeb25a1be6 test/udev-test.pl: allow checking multiple symlinks + 00ab4292da test/udev-test.pl: test correctness of symlink targets + 5b71ee2911 test/udev-test.pl: use computed devnode name + 2e04bb9ae8 test/udev-test.pl: allow concurrent additions and removals + 8816dd593c test/udev-test.pl: create rules only once + 214418632d test/udev-test.pl: allow multiple devices per test + 1eb6b23f27 udev-test: do not rely on "mail" group being defined + 4a0a4dcf10 udev: Fix sound.target dependency (bsc#1179363) + +------------------------------------------------------------------- +Wed Dec 16 10:40:48 UTC 2020 - Franck Bui + +- Enable support for zstd compression + + systemd-journald will now use zstd for compressing large fields in + journal files. systemd-coredump will also use this algorithm to + compress coredump files. + + Please note that systemd older than v246 won't be able to read new + journal files as zstd algorithm is not supported by these versions. + + This incompatible change was actually not the only one introduced by + v246 since the hash tables in journal files have been hardened + against hash collisions too in an incompatible way with older + versions. + ------------------------------------------------------------------- Mon Dec 14 07:55:03 UTC 2020 - Dominique Leuenberger diff --git a/systemd.spec b/systemd.spec index 1db25784..1e20e227 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.50.gd5e7958d35 +%define suse_version +suse.78.g520e53b6d8 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.7 +Version: 246.9 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -77,6 +77,7 @@ BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 +BuildRequires: pkgconfig(libzstd) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif From 488849158e5f9c6a61ec8d437320c69352ea49a11ec0cf4d74d2e4d3bb66ae9c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 7 Feb 2021 14:16:54 +0000 Subject: [PATCH 066/124] Accepting request 869763 from Base:System OBS-URL: https://build.opensuse.org/request/show/869763 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=324 --- systemd-mini.changes | 31 ++++++++++++++++++++++ systemd-mini.spec | 21 ++++++++------- systemd-sysv-convert | 8 ++++++ systemd-v246.10+suse.83.g134cf1c8bc.tar.xz | 3 +++ systemd-v246.9+suse.78.g520e53b6d8.tar.xz | 3 --- systemd.changes | 31 ++++++++++++++++++++++ systemd.spec | 21 ++++++++------- 7 files changed, 95 insertions(+), 23 deletions(-) create mode 100644 systemd-v246.10+suse.83.g134cf1c8bc.tar.xz delete mode 100644 systemd-v246.9+suse.78.g520e53b6d8.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index be0880dd..2ac6c835 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Feb 5 13:02:58 UTC 2021 - Franck Bui + +- systemd-sysv-convert: handle the case when services are migrated + from SysV scripts to systemd units and are renamed at the same + time (bsc#1181788) + + The list of such services is hard coded and contains only the + 'ntp->ntpd' translation. + +------------------------------------------------------------------- +Wed Feb 3 09:57:58 UTC 2021 - Franck Bui + +- Import commit 134cf1c8bc3e361a2641161aa11ac2b5b990480b (merge of v246.10) + + 25f220eafb sysusers: flush nscd's caches whenever /etc/{passwd,group} are modified (bsc#1181121) + 4a543f0257 journal: send journald logs to kmsg again + 26df96473f busctl: add a timestamp to the output of the busctl monitor command (bsc#1180225) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/520e53b6d85087b05892ee637ae93f1b269e7e52...134cf1c8bc3e361a2641161aa11ac2b5b990480b + +------------------------------------------------------------------- +Wed Jan 13 10:37:16 UTC 2021 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + * don't install legacy symlinks to / + * use %_pamdir to install pam modules + * leave nss files in /usr/lib*, glibc loads them from there just + fine independent of usrmerge + ------------------------------------------------------------------- Fri Dec 18 08:54:20 UTC 2020 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 73c531fa..e26e3e93 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -1,7 +1,7 @@ # # spec file for package systemd-mini # -# 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 @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.78.g520e53b6d8 +%define suse_version +suse.83.g134cf1c8bc %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.9 +Version: 246.10 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -511,7 +511,7 @@ systemd-journal-remote, and systemd-journal-upload. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamlibdir=/%{_lib}/security \ + -Dpamlibdir=%{_pamdir} \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ @@ -577,10 +577,7 @@ systemd-journal-remote, and systemd-journal-upload. %install %meson_install -# move to %{_lib} -%if ! 0%{?bootstrap} -mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} -%else +%if 0%{?bootstrap} rm %{buildroot}%{_libdir}/libnss_systemd.so* rm -r %{buildroot}%{_datadir}/locale %endif @@ -611,6 +608,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done +%if !0%{?usrmerged} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -622,6 +620,7 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel %endif +%endif # Make sure we don't ship static enablement symlinks in /etc during # installation, presets should be honoured instead. @@ -1171,7 +1170,7 @@ fi %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -/%{_lib}/security/pam_systemd.so +%{_pamdir}/pam_systemd.so %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1350,6 +1349,7 @@ fi %files sysvinit %defattr(-,root,root,-) +%if !0%{?usrmerged} /sbin/init /sbin/reboot /sbin/halt @@ -1359,6 +1359,7 @@ fi /sbin/telinit /sbin/runlevel %endif +%endif %{_sbindir}/init %{_sbindir}/reboot %{_sbindir}/halt @@ -1508,7 +1509,7 @@ fi %files -n nss-myhostname %defattr(-, root, root) -/%{_lib}/*nss_myhostname* +%{_libdir}/*nss_myhostname* %{_mandir}/man8/libnss_myhostname.* %{_mandir}/man8/nss-myhostname.* diff --git a/systemd-sysv-convert b/systemd-sysv-convert index 8a75b941..f4417703 100644 --- a/systemd-sysv-convert +++ b/systemd-sysv-convert @@ -79,6 +79,14 @@ case "$1" in # in the db only once. database_add $initscript -1 + # Some services were renamed during the transition from SySV init to + # systemd (bsc#1181788). Rather than letting packages fixing that + # themselves by hacking our database directly, let's hard-code renames + # here. Not really nice but that's the least worst solution. + case $initscript in + ntpd) initscript=ntp ;; + esac + # The package is introducing new services and never has any sysv init # scripts (bsc#982303). if [ ! -r /etc/init.d/$initscript ] && diff --git a/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz b/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz new file mode 100644 index 00000000..8346453f --- /dev/null +++ b/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0c1fd0a518b62d8f9db6eed77a4ba465e23663e9ac6cc9278b44bca596fd23d6 +size 6572124 diff --git a/systemd-v246.9+suse.78.g520e53b6d8.tar.xz b/systemd-v246.9+suse.78.g520e53b6d8.tar.xz deleted file mode 100644 index 805cd127..00000000 --- a/systemd-v246.9+suse.78.g520e53b6d8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:988d1da9b2cdd0856c7036b120c037789f2ed6d5171911ff654cd8bcf72cf07a -size 6569608 diff --git a/systemd.changes b/systemd.changes index be0880dd..2ac6c835 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Feb 5 13:02:58 UTC 2021 - Franck Bui + +- systemd-sysv-convert: handle the case when services are migrated + from SysV scripts to systemd units and are renamed at the same + time (bsc#1181788) + + The list of such services is hard coded and contains only the + 'ntp->ntpd' translation. + +------------------------------------------------------------------- +Wed Feb 3 09:57:58 UTC 2021 - Franck Bui + +- Import commit 134cf1c8bc3e361a2641161aa11ac2b5b990480b (merge of v246.10) + + 25f220eafb sysusers: flush nscd's caches whenever /etc/{passwd,group} are modified (bsc#1181121) + 4a543f0257 journal: send journald logs to kmsg again + 26df96473f busctl: add a timestamp to the output of the busctl monitor command (bsc#1180225) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/520e53b6d85087b05892ee637ae93f1b269e7e52...134cf1c8bc3e361a2641161aa11ac2b5b990480b + +------------------------------------------------------------------- +Wed Jan 13 10:37:16 UTC 2021 - Ludwig Nussel + +- prepare usrmerge (boo#1029961) + * don't install legacy symlinks to / + * use %_pamdir to install pam modules + * leave nss files in /usr/lib*, glibc loads them from there just + fine independent of usrmerge + ------------------------------------------------------------------- Fri Dec 18 08:54:20 UTC 2020 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 1e20e227..355fc6c6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# 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 @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.78.g520e53b6d8 +%define suse_version +suse.83.g134cf1c8bc %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.9 +Version: 246.10 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -509,7 +509,7 @@ systemd-journal-remote, and systemd-journal-upload. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamlibdir=/%{_lib}/security \ + -Dpamlibdir=%{_pamdir} \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=hybrid \ @@ -575,10 +575,7 @@ systemd-journal-remote, and systemd-journal-upload. %install %meson_install -# move to %{_lib} -%if ! 0%{?bootstrap} -mv %{buildroot}%{_libdir}/libnss_myhostname.so.2 %{buildroot}/%{_lib} -%else +%if 0%{?bootstrap} rm %{buildroot}%{_libdir}/libnss_systemd.so* rm -r %{buildroot}%{_datadir}/locale %endif @@ -609,6 +606,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done +%if !0%{?usrmerged} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -620,6 +618,7 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel %endif +%endif # Make sure we don't ship static enablement symlinks in /etc during # installation, presets should be honoured instead. @@ -1169,7 +1168,7 @@ fi %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -/%{_lib}/security/pam_systemd.so +%{_pamdir}/pam_systemd.so %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1348,6 +1347,7 @@ fi %files sysvinit %defattr(-,root,root,-) +%if !0%{?usrmerged} /sbin/init /sbin/reboot /sbin/halt @@ -1357,6 +1357,7 @@ fi /sbin/telinit /sbin/runlevel %endif +%endif %{_sbindir}/init %{_sbindir}/reboot %{_sbindir}/halt @@ -1506,7 +1507,7 @@ fi %files -n nss-myhostname %defattr(-, root, root) -/%{_lib}/*nss_myhostname* +%{_libdir}/*nss_myhostname* %{_mandir}/man8/libnss_myhostname.* %{_mandir}/man8/nss-myhostname.* From 28eb9c368f3bb0d1de6432bd3808c18c90f51a4a82f51f2a3b4077ea735e1892 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Mon, 22 Feb 2021 13:39:31 +0000 Subject: [PATCH 067/124] Accepting request 873790 from Base:System - Add 0001-conf-parser-introduce-early-drop-ins.patch Introduce early configuration drop-in file. This type of drop-ins are reserved for vendor own purposes only and should never been used by users. It might be removed in the future without any notice. - Drop use of %systemd_postun in %postun This macro is supposed to operate on units but it was used without passing any parameters. This call was probably used for issuing a daemon-reload but the following calls to %systemd_postun_with_restart imply that already. So let's simply drop it. OBS-URL: https://build.opensuse.org/request/show/873790 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=325 --- ...conf-parser-introduce-early-drop-ins.patch | 362 ++++++++++++++++++ systemd-mini.changes | 20 + systemd-mini.spec | 5 +- systemd.changes | 20 + systemd.spec | 5 +- 5 files changed, 408 insertions(+), 4 deletions(-) create mode 100644 0001-conf-parser-introduce-early-drop-ins.patch diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch new file mode 100644 index 00000000..0d20bde5 --- /dev/null +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -0,0 +1,362 @@ +From 3709cf5ba88e1cb9c737e524168b83a0964ef5db Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Fri, 22 Jan 2021 14:57:08 +0100 +Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +As formerly known as "downstream conf file drop-ins should never override main +user conf file". + +Previously all drop-ins, including those shipped by downstream, shipped in +/usr, could override user's main configuration file (located in /etc) because +the main file was always parsed first. + +This was problematic for downstreams because their customization should never +override the users one in general. Therefore the only way to make this logic +usable was by teaching users to never use the main conf files and to put all +theirs settings in drop-ins with a higher priority than the one downsteam would +use. However customizing the defaults through the main conf file is something +very well established since a long time hence this is not something +conceivable. + +This patch reworks the way we parse configuration files by introducing "early" +conf files (idea from Zbigniew Jędrzejewski-Szmek), which always have a +priority lower than the main config file and hence other conf file drop-ins +too. + +Early conf files can be located in any locations where regular conf snippets +can be installed and are sorted between them using the same sorting rules that +apply to other conf files. A conf file is considered as an early one if its +filename is prefixed with "__" (double underscore). + +Hence for example, drop-in "/usr/lib/systemd/logind.conf.d/__99-foo.conf" will +always be parsed before: + + /etc/systemd/logind.conf + /etc/systemd/logind.conf.d/00-foo.conf + /usr/lib/systemd/logind.conf.d/00-foo.conf + +This change isn't backwards-compatible, but the '__' prefix is something that +is unlikely used. Hence the risk should be very low. + +Unfortunately upstream is not seing this problem as a serious one and accept +that vendors' configuration files can take precedence over the main +configuration files (placed in /etc). See the following links for the +related discussions: + + https://github.com/systemd/systemd/issues/2121 (initial issue report) + https://github.com/systemd/systemd/pull/17161 (first attempt to solve this issue) + https://github.com/systemd/systemd/pull/18347 (introduction of early drop-in) + +Since SUSE heavily relies on drop-ins to customize some of the upstream default +settings, there was no other choice than to diverge from upstream in this +regard. + +But it should be noted that these early drop-ins are strictly reserved for SUSE +own purpose only. IOW users should never use them and early drop-ins should +never be created in /etc but only in /usr. We reserve the right to change or +drop this feature at any time. + +Fixes: #2121 +--- + src/shared/conf-parser.c | 57 ++++++++++++-- + src/test/test-conf-parser.c | 149 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 198 insertions(+), 8 deletions(-) + +diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c +index 0fec79f3d7..daf55d2358 100644 +--- a/src/shared/conf-parser.c ++++ b/src/shared/conf-parser.c +@@ -423,6 +423,7 @@ int config_parse(const char *unit, + + static int config_parse_many_files( + const char *conf_file, ++ char **early_files, + char **files, + const char *sections, + ConfigItemLookup lookup, +@@ -431,19 +432,27 @@ static int config_parse_many_files( + void *userdata, + usec_t *ret_mtime) { + +- usec_t mtime = 0; ++ usec_t t, mtime = 0; + char **fn; + int r; + ++ STRV_FOREACH(fn, early_files) { ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t); ++ if (r < 0) ++ return r; ++ if (t > mtime) /* Find the newest */ ++ mtime = t; ++ } ++ + if (conf_file) { +- r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &mtime); ++ r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &t); + if (r < 0) + return r; ++ if (t > mtime) /* Find the newest */ ++ mtime = t; + } + + STRV_FOREACH(fn, files) { +- usec_t t; +- + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t); + if (r < 0) + return r; +@@ -457,6 +466,28 @@ static int config_parse_many_files( + return 0; + } + ++static int config_parse_split_conf_files(char **files, char ***early_files, char ***late_files) { ++ char **f; ++ ++ assert(files); ++ assert(early_files); ++ assert(late_files); ++ ++ STRV_FOREACH(f, files) { ++ char ***s, *p; ++ ++ p = strdup(*f); ++ if (!p) ++ return log_oom(); ++ ++ s = startswith(basename(*f), "__") ? early_files : late_files; ++ if (strv_push(s, p) < 0) ++ return log_oom(); ++ } ++ ++ return 0; ++} ++ + /* Parse each config file in the directories specified as nulstr. */ + int config_parse_many_nulstr( + const char *conf_file, +@@ -468,14 +499,19 @@ int config_parse_many_nulstr( + void *userdata, + usec_t *ret_mtime) { + +- _cleanup_strv_free_ char **files = NULL; ++ _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; + int r; + + r = conf_files_list_nulstr(&files, ".conf", NULL, 0, conf_file_dirs); + if (r < 0) + return r; + +- return config_parse_many_files(conf_file, files, sections, lookup, table, flags, userdata, ret_mtime); ++ r = config_parse_split_conf_files(files, &early_files, &late_files); ++ if (r < 0) ++ return r; ++ ++ return config_parse_many_files(conf_file, early_files, late_files, sections, ++ lookup, table, flags, userdata, ret_mtime); + } + + /* Parse each config file in the directories specified as strv. */ +@@ -490,8 +526,8 @@ int config_parse_many( + void *userdata, + usec_t *ret_mtime) { + ++ _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; + _cleanup_strv_free_ char **dropin_dirs = NULL; +- _cleanup_strv_free_ char **files = NULL; + const char *suffix; + int r; + +@@ -504,7 +540,12 @@ int config_parse_many( + if (r < 0) + return r; + +- return config_parse_many_files(conf_file, files, sections, lookup, table, flags, userdata, ret_mtime); ++ r = config_parse_split_conf_files(files, &early_files, &late_files); ++ if (r < 0) ++ return r; ++ ++ return config_parse_many_files(conf_file, early_files, late_files, sections, ++ lookup, table, flags, userdata, ret_mtime); + } + + #define DEFINE_PARSER(type, vartype, conv_func) \ +diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c +index 07edc17f92..bb82923319 100644 +--- a/src/test/test-conf-parser.c ++++ b/src/test/test-conf-parser.c +@@ -5,6 +5,9 @@ + #include "fs-util.h" + #include "log.h" + #include "macro.h" ++#include "mkdir.h" ++#include "path-util.h" ++#include "rm-rf.h" + #include "string-util.h" + #include "strv.h" + #include "tmpfile-util.h" +@@ -385,6 +388,149 @@ static void test_config_parse(unsigned i, const char *s) { + } + } + ++static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) { ++ char **path; ++ ++ /* If 'is_main' is true then 'conf_files' should only contain an entry ++ * for the main conf file. */ ++ if (is_main) ++ assert_se(strv_length(conf_files) <= 1); ++ ++ STRV_FOREACH(path, conf_files) { ++ _cleanup_free_ char *abspath = NULL; ++ _cleanup_fclose_ FILE *f = NULL; ++ ++ abspath = path_join(root, *path); ++ assert_se(abspath); ++ ++ (void) mkdir_parents(abspath, 0755); ++ ++ f = fopen(abspath, "w"); ++ assert_se(f); ++ fprintf(f, ++ "[Section]\n" ++ "name=%s\n", ++ *path); ++ ++ if (!is_main) ++ fprintf(f, ++ "%s=%s\n", ++ startswith(basename(*path), "__") ? "early" : "late", ++ *path); ++ ++ if (ret_conf_dirs) { ++ char *d; ++ ++ assert_se((d = dirname_malloc(abspath))); ++ assert_se(strv_push(ret_conf_dirs, d) == 0); ++ } ++ } ++ ++ if (ret_conf_dirs) { ++ strv_uniq(*ret_conf_dirs); ++ strv_sort(*ret_conf_dirs); ++ } ++} ++ ++static void test_config_parse_many_one(bool nulstr, const char *main, char **conf_files, ++ const char *name, const char *early, const char *late) { ++ ++ _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL; ++ _cleanup_strv_free_ char **conf_dirs = NULL; ++ _cleanup_free_ char *conf_dirs_nulstr = NULL; ++ char *conf_file; ++ char *tmp_dir; ++ size_t size; ++ int r; ++ ++ const ConfigTableItem items[] = { ++ { "Section", "name", config_parse_string, 0, &parsed_name}, ++ { "Section", "late", config_parse_string, 0, &parsed_late}, ++ { "Section", "early", config_parse_string, 0, &parsed_early}, ++ }; ++ ++ tmp_dir = strdupa("/tmp/test-conf-parser-XXXXXX"); ++ assert_se(mkdtemp(tmp_dir)); ++ ++ setup_conf_files(tmp_dir, true, STRV_MAKE(main), NULL); ++ setup_conf_files(tmp_dir, false, conf_files, &conf_dirs); ++ ++ conf_file = main ? strjoina(tmp_dir, "/", main) : NULL; ++ ++ if (nulstr) { ++ r = strv_make_nulstr(conf_dirs, &conf_dirs_nulstr, &size); ++ assert_se(r == 0); ++ ++ r = config_parse_many_nulstr(conf_file, conf_dirs_nulstr, ++ "Section\0", ++ config_item_table_lookup, items, ++ CONFIG_PARSE_WARN, ++ NULL, ++ NULL); ++ } else { ++ r = config_parse_many(conf_file, (const char * const*) conf_dirs, "", ++ "Section\0", ++ config_item_table_lookup, items, ++ CONFIG_PARSE_WARN, ++ NULL, ++ NULL); ++ } ++ ++ assert_se(r == 0); ++ assert_se((!name && !parsed_name) || streq(name, parsed_name)); ++ assert_se((!late && !parsed_late) || streq(late, parsed_late)); ++ assert_se((!early && !parsed_early) || streq(early, parsed_early)); ++ ++ assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); ++} ++ ++static void test_config_parse_many(bool nulstr) { ++ test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL); ++ ++ test_config_parse_many_one(nulstr, ++ "dir/main.conf", NULL, ++ "dir/main.conf", NULL, NULL); ++ ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/__50-foo.conf"), ++ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); ++ ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), ++ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); ++ ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ ++ /* Early conf files should never override the main one whatever their ++ * priority/location. */ ++ test_config_parse_many_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), ++ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); ++ ++ /* Late conf files always take precendence over the early conf files ++ * and the main one. */ ++ test_config_parse_many_one(nulstr, ++ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ ++ test_config_parse_many_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", ++ "dir2/10-foo.conf"), ++ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); ++} ++ + int main(int argc, char **argv) { + unsigned i; + +@@ -407,5 +553,8 @@ int main(int argc, char **argv) { + for (i = 0; i < ELEMENTSOF(config_file); i++) + test_config_parse(i, config_file[i]); + ++ test_config_parse_many(true); ++ test_config_parse_many(false); ++ + return 0; + } +-- +2.26.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 2ac6c835..e337546c 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Feb 19 13:34:01 UTC 2021 - Franck Bui + +- Add 0001-conf-parser-introduce-early-drop-ins.patch + + Introduce early configuration drop-in file. This type of drop-ins + are reserved for vendor own purposes only and should never been used + by users. It might be removed in the future without any notice. + +------------------------------------------------------------------- +Wed Feb 17 10:30:43 UTC 2021 - Franck Bui + +- Drop use of %systemd_postun in %postun + + This macro is supposed to operate on units but it was used without + passing any parameters. This call was probably used for issuing a + daemon-reload but the following calls to + %systemd_postun_with_restart imply that already. So let's simply + drop it. + ------------------------------------------------------------------- Fri Feb 5 13:02:58 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index e26e3e93..2267d45e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -175,6 +175,7 @@ Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch Patch9: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -875,10 +876,10 @@ if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/sys fi %postun -%systemd_postun -# Avoid restarting logind until fixed upstream (issue #1163) +# daemon-reload is implied by %systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service +# Avoid restarting logind until fixed upstream (issue #1163) %pre -n udev%{?mini} # New installations uses the last compat symlink generation number diff --git a/systemd.changes b/systemd.changes index 2ac6c835..e337546c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Fri Feb 19 13:34:01 UTC 2021 - Franck Bui + +- Add 0001-conf-parser-introduce-early-drop-ins.patch + + Introduce early configuration drop-in file. This type of drop-ins + are reserved for vendor own purposes only and should never been used + by users. It might be removed in the future without any notice. + +------------------------------------------------------------------- +Wed Feb 17 10:30:43 UTC 2021 - Franck Bui + +- Drop use of %systemd_postun in %postun + + This macro is supposed to operate on units but it was used without + passing any parameters. This call was probably used for issuing a + daemon-reload but the following calls to + %systemd_postun_with_restart imply that already. So let's simply + drop it. + ------------------------------------------------------------------- Fri Feb 5 13:02:58 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 355fc6c6..2c744d4c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -173,6 +173,7 @@ Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch Patch9: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -873,10 +874,10 @@ if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/sys fi %postun -%systemd_postun -# Avoid restarting logind until fixed upstream (issue #1163) +# daemon-reload is implied by %systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service +# Avoid restarting logind until fixed upstream (issue #1163) %pre -n udev%{?mini} # New installations uses the last compat symlink generation number From 6c52ec6e42490f2d386e528b48937e9be87f257df5ea1e82bb801dad25b00129 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Tue, 2 Mar 2021 13:41:57 +0000 Subject: [PATCH 068/124] Accepting request 874480 from Base:System - systemd requires aaa_base >= 13.2 This dependency is required because 'systemctl {is-enabled,enable,disable} " ends up calling systemd-sysv-install which in its turn calls "chkconfig --no-systemctl". aaa_base package has a weird versioning but the '--no-systemctl' option has been introduced starting from SLE12-SP2-GA, which shipped version "13.2+git20140911.61c1681". Spotted in bsc#1180083. OBS-URL: https://build.opensuse.org/request/show/874480 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=326 --- systemd-mini.changes | 16 ++++++++++++++++ systemd-mini.spec | 3 +-- systemd.changes | 16 ++++++++++++++++ systemd.spec | 3 +-- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index e337546c..d9c20bad 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Feb 22 20:20:43 UTC 2021 - Franck Bui + +- systemd requires aaa_base >= 13.2 + + This dependency is required because 'systemctl + {is-enabled,enable,disable} " ends up calling + systemd-sysv-install which in its turn calls "chkconfig + --no-systemctl". + + aaa_base package has a weird versioning but the '--no-systemctl' + option has been introduced starting from SLE12-SP2-GA, which shipped + version "13.2+git20140911.61c1681". + + Spotted in bsc#1180083. + ------------------------------------------------------------------- Fri Feb 19 13:34:01 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 2267d45e..3ced7752 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -120,6 +120,7 @@ Provides: systemd = %{version}-%{release} %else # the buildignore is important for bootstrapping #!BuildIgnore: udev +Requires: aaa_base >= 13.2 Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 @@ -277,8 +278,6 @@ Requires(post): coreutils Requires(postun): coreutils Requires(postun): /usr/bin/systemctl -Conflicts: systemd < 39 -Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: dracut < 044.1 diff --git a/systemd.changes b/systemd.changes index e337546c..d9c20bad 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Mon Feb 22 20:20:43 UTC 2021 - Franck Bui + +- systemd requires aaa_base >= 13.2 + + This dependency is required because 'systemctl + {is-enabled,enable,disable} " ends up calling + systemd-sysv-install which in its turn calls "chkconfig + --no-systemctl". + + aaa_base package has a weird versioning but the '--no-systemctl' + option has been introduced starting from SLE12-SP2-GA, which shipped + version "13.2+git20140911.61c1681". + + Spotted in bsc#1180083. + ------------------------------------------------------------------- Fri Feb 19 13:34:01 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 2c744d4c..44651538 100644 --- a/systemd.spec +++ b/systemd.spec @@ -118,6 +118,7 @@ Provides: systemd = %{version}-%{release} %else # the buildignore is important for bootstrapping #!BuildIgnore: udev +Requires: aaa_base >= 13.2 Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: kmod >= 15 @@ -275,8 +276,6 @@ Requires(post): coreutils Requires(postun): coreutils Requires(postun): /usr/bin/systemctl -Conflicts: systemd < 39 -Conflicts: aaa_base < 11.5 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: dracut < 044.1 From 4678053d4fbe1fb62c83537e1244e65fc6e98158866d18238e94386b478c0079 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Mar 2021 19:14:01 +0000 Subject: [PATCH 069/124] Accepting request 879358 from Base:System - Import commit 9753d1c17545a5d46530696cb14254f5f12024f1 (merge of v246.11) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...9753d1c17545a5d46530696cb14254f5f12024f1 - Rebase 0001-conf-parser-introduce-early-drop-ins.patch - Import commit 13bc08870147b35f87cefb074aec22e767b7ac04 846d61e0a1 boot: Move console declarations to missing_efi.h 171a37228b boot: Add startswith() and endswith() functions with no_case variants 0fad9f309a boot: Drop unnecessary braces c38bbb0874 boot: Fix void pointer arithmetic warning 438210924b boot: Replace raw efivar gets with typed variants e46cb3e4a0 boot: Add efivar_get/set_uint64_le() functions e16bee35c8 boot: Rename efivar_get/set_int() to efivar_get/set_uint_string() 2808d0e9a3 boot: Tighten scope of variables used in loops d3f3d57743 boot: Add efivar_get_boolean_u8() 0551ecce71 boot: Make all efivar util functions take the guid as an argument 8376ba3b9f boot: Turn all guid constants into C99 compound initializers 166fc2dad2 boot: Enable C99 c87d66e261 boot: Move Secure Boot logic to new file da7bba9438 udev: fix memleak e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) - Make sure the udev socket units are reloaded during udev package updates - fix-machines-btrfs-subvol.sh is only shipped when machined is built OBS-URL: https://build.opensuse.org/request/show/879358 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=327 --- ...conf-parser-introduce-early-drop-ins.patch | 53 +++++++------------ systemd-mini.changes | 42 +++++++++++++++ systemd-mini.spec | 23 +++++--- systemd-v246.10+suse.83.g134cf1c8bc.tar.xz | 3 -- systemd-v246.11+suse.102.g9753d1c175.tar.xz | 3 ++ systemd.changes | 42 +++++++++++++++ systemd.spec | 23 +++++--- 7 files changed, 135 insertions(+), 54 deletions(-) delete mode 100644 systemd-v246.10+suse.83.g134cf1c8bc.tar.xz create mode 100644 systemd-v246.11+suse.102.g9753d1c175.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index 0d20bde5..c05f4769 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,4 +1,4 @@ -From 3709cf5ba88e1cb9c737e524168b83a0964ef5db Mon Sep 17 00:00:00 2001 +From 569f94a86a608fa7a47fef583f3f504ec8223967 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 57 ++++++++++++-- - src/test/test-conf-parser.c | 149 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 198 insertions(+), 8 deletions(-) + src/shared/conf-parser.c | 47 ++++++++++- + src/test/test-conf-parser.c | 151 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 194 insertions(+), 4 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 0fec79f3d7..daf55d2358 100644 +index 7499b3b882..799026626c 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -423,6 +423,7 @@ int config_parse(const char *unit, +@@ -426,6 +426,7 @@ int config_parse(const char *unit, static int config_parse_many_files( const char *conf_file, @@ -77,39 +77,20 @@ index 0fec79f3d7..daf55d2358 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -431,19 +432,27 @@ static int config_parse_many_files( - void *userdata, - usec_t *ret_mtime) { - -- usec_t mtime = 0; -+ usec_t t, mtime = 0; +@@ -438,6 +439,12 @@ static int config_parse_many_files( char **fn; int r; + STRV_FOREACH(fn, early_files) { -+ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t); ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); + if (r < 0) + return r; -+ if (t > mtime) /* Find the newest */ -+ mtime = t; + } + if (conf_file) { -- r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &mtime); -+ r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &t); + r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &mtime); if (r < 0) - return r; -+ if (t > mtime) /* Find the newest */ -+ mtime = t; - } - - STRV_FOREACH(fn, files) { -- usec_t t; -- - r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &t); - if (r < 0) - return r; -@@ -457,6 +466,28 @@ static int config_parse_many_files( +@@ -456,6 +463,28 @@ static int config_parse_many_files( return 0; } @@ -138,7 +119,7 @@ index 0fec79f3d7..daf55d2358 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -468,14 +499,19 @@ int config_parse_many_nulstr( +@@ -467,14 +496,19 @@ int config_parse_many_nulstr( void *userdata, usec_t *ret_mtime) { @@ -160,7 +141,7 @@ index 0fec79f3d7..daf55d2358 100644 } /* Parse each config file in the directories specified as strv. */ -@@ -490,8 +526,8 @@ int config_parse_many( +@@ -489,8 +523,8 @@ int config_parse_many( void *userdata, usec_t *ret_mtime) { @@ -170,7 +151,7 @@ index 0fec79f3d7..daf55d2358 100644 const char *suffix; int r; -@@ -504,7 +540,12 @@ int config_parse_many( +@@ -503,7 +537,12 @@ int config_parse_many( if (r < 0) return r; @@ -185,7 +166,7 @@ index 0fec79f3d7..daf55d2358 100644 #define DEFINE_PARSER(type, vartype, conv_func) \ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 07edc17f92..bb82923319 100644 +index 07edc17f92..2df4b073c5 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -198,7 +179,7 @@ index 07edc17f92..bb82923319 100644 #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -@@ -385,6 +388,149 @@ static void test_config_parse(unsigned i, const char *s) { +@@ -385,6 +388,151 @@ static void test_config_parse(unsigned i, const char *s) { } } @@ -299,6 +280,8 @@ index 07edc17f92..bb82923319 100644 +} + +static void test_config_parse_many(bool nulstr) { ++ log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : ""); ++ + test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL); + + test_config_parse_many_one(nulstr, @@ -348,7 +331,7 @@ index 07edc17f92..bb82923319 100644 int main(int argc, char **argv) { unsigned i; -@@ -407,5 +553,8 @@ int main(int argc, char **argv) { +@@ -407,5 +555,8 @@ int main(int argc, char **argv) { for (i = 0; i < ELEMENTSOF(config_file); i++) test_config_parse(i, config_file[i]); diff --git a/systemd-mini.changes b/systemd-mini.changes index d9c20bad..d0523373 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Mon Mar 15 15:56:45 UTC 2021 - Franck Bui + +- Import commit 9753d1c17545a5d46530696cb14254f5f12024f1 (merge of v246.11) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...9753d1c17545a5d46530696cb14254f5f12024f1 + +- Rebase 0001-conf-parser-introduce-early-drop-ins.patch + +------------------------------------------------------------------- +Mon Mar 15 11:06:54 UTC 2021 - Franck Bui + +- Import commit 13bc08870147b35f87cefb074aec22e767b7ac04 + + 846d61e0a1 boot: Move console declarations to missing_efi.h + 171a37228b boot: Add startswith() and endswith() functions with no_case variants + 0fad9f309a boot: Drop unnecessary braces + c38bbb0874 boot: Fix void pointer arithmetic warning + 438210924b boot: Replace raw efivar gets with typed variants + e46cb3e4a0 boot: Add efivar_get/set_uint64_le() functions + e16bee35c8 boot: Rename efivar_get/set_int() to efivar_get/set_uint_string() + 2808d0e9a3 boot: Tighten scope of variables used in loops + d3f3d57743 boot: Add efivar_get_boolean_u8() + 0551ecce71 boot: Make all efivar util functions take the guid as an argument + 8376ba3b9f boot: Turn all guid constants into C99 compound initializers + 166fc2dad2 boot: Enable C99 + c87d66e261 boot: Move Secure Boot logic to new file + da7bba9438 udev: fix memleak + e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) + 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) + +------------------------------------------------------------------- +Thu Mar 11 09:51:53 UTC 2021 - Franck Bui + +- Make sure the udev socket units are reloaded during udev package updates + +------------------------------------------------------------------- +Wed Mar 10 09:10:03 UTC 2021 - Franck Bui + +- fix-machines-btrfs-subvol.sh is only shipped when machined is built + ------------------------------------------------------------------- Mon Feb 22 20:20:43 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 3ced7752..fd4a0914 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.83.g134cf1c8bc +%define suse_version +suse.102.g9753d1c175 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.10 +Version: 246.11 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -903,12 +903,17 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -# Restarting udevd sockets means also stopping the daemon. But we -# don't want the sockets and the daemon to be inactive at the same -# time because we might loose new events sent by the kernel during the -# package update otherwise. Hence we accept the fact that the socket -# properties might not be updated. They are unlikely changed anyway. -%systemd_postun_with_restart systemd-udevd.service +systemctl daemon-reload || : +# On package update, restarting the socket units will probably fail as +# udevd is most likely running. Therefore systemctl will refuse to +# start them again once stopped. It's not an issue since we are mostly +# interested to make PID1 use the updated unit files once the socket +# units wil be started again. And that will happen when systemd-udevd +# itself will be restarted. +if [ $1 -ge 1 ]; then + systemctl try-restart systemd-udevd-{control,kernel}.socket 2>/dev/null || : + systemctl try-restart systemd-udevd.service || : +fi %posttrans -n udev%{?mini} %regenerate_initrd_posttrans @@ -921,6 +926,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %post container %tmpfiles_create systemd-nspawn.conf +%if %{with machined} if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed @@ -939,6 +945,7 @@ if [ $1 -gt 1 ]; then # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%endif %if ! 0%{?bootstrap} %post logger diff --git a/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz b/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz deleted file mode 100644 index 8346453f..00000000 --- a/systemd-v246.10+suse.83.g134cf1c8bc.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0c1fd0a518b62d8f9db6eed77a4ba465e23663e9ac6cc9278b44bca596fd23d6 -size 6572124 diff --git a/systemd-v246.11+suse.102.g9753d1c175.tar.xz b/systemd-v246.11+suse.102.g9753d1c175.tar.xz new file mode 100644 index 00000000..0183619d --- /dev/null +++ b/systemd-v246.11+suse.102.g9753d1c175.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d4ec3e2511b4af7635c5189276f5d5ad3694159fab01603103f7ff12162d52fb +size 6573652 diff --git a/systemd.changes b/systemd.changes index d9c20bad..d0523373 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,45 @@ +------------------------------------------------------------------- +Mon Mar 15 15:56:45 UTC 2021 - Franck Bui + +- Import commit 9753d1c17545a5d46530696cb14254f5f12024f1 (merge of v246.11) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...9753d1c17545a5d46530696cb14254f5f12024f1 + +- Rebase 0001-conf-parser-introduce-early-drop-ins.patch + +------------------------------------------------------------------- +Mon Mar 15 11:06:54 UTC 2021 - Franck Bui + +- Import commit 13bc08870147b35f87cefb074aec22e767b7ac04 + + 846d61e0a1 boot: Move console declarations to missing_efi.h + 171a37228b boot: Add startswith() and endswith() functions with no_case variants + 0fad9f309a boot: Drop unnecessary braces + c38bbb0874 boot: Fix void pointer arithmetic warning + 438210924b boot: Replace raw efivar gets with typed variants + e46cb3e4a0 boot: Add efivar_get/set_uint64_le() functions + e16bee35c8 boot: Rename efivar_get/set_int() to efivar_get/set_uint_string() + 2808d0e9a3 boot: Tighten scope of variables used in loops + d3f3d57743 boot: Add efivar_get_boolean_u8() + 0551ecce71 boot: Make all efivar util functions take the guid as an argument + 8376ba3b9f boot: Turn all guid constants into C99 compound initializers + 166fc2dad2 boot: Enable C99 + c87d66e261 boot: Move Secure Boot logic to new file + da7bba9438 udev: fix memleak + e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) + 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) + +------------------------------------------------------------------- +Thu Mar 11 09:51:53 UTC 2021 - Franck Bui + +- Make sure the udev socket units are reloaded during udev package updates + +------------------------------------------------------------------- +Wed Mar 10 09:10:03 UTC 2021 - Franck Bui + +- fix-machines-btrfs-subvol.sh is only shipped when machined is built + ------------------------------------------------------------------- Mon Feb 22 20:20:43 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 44651538..dda477e4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.83.g134cf1c8bc +%define suse_version +suse.102.g9753d1c175 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.10 +Version: 246.11 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -901,12 +901,17 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -# Restarting udevd sockets means also stopping the daemon. But we -# don't want the sockets and the daemon to be inactive at the same -# time because we might loose new events sent by the kernel during the -# package update otherwise. Hence we accept the fact that the socket -# properties might not be updated. They are unlikely changed anyway. -%systemd_postun_with_restart systemd-udevd.service +systemctl daemon-reload || : +# On package update, restarting the socket units will probably fail as +# udevd is most likely running. Therefore systemctl will refuse to +# start them again once stopped. It's not an issue since we are mostly +# interested to make PID1 use the updated unit files once the socket +# units wil be started again. And that will happen when systemd-udevd +# itself will be restarted. +if [ $1 -ge 1 ]; then + systemctl try-restart systemd-udevd-{control,kernel}.socket 2>/dev/null || : + systemctl try-restart systemd-udevd.service || : +fi %posttrans -n udev%{?mini} %regenerate_initrd_posttrans @@ -919,6 +924,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %post container %tmpfiles_create systemd-nspawn.conf +%if %{with machined} if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed @@ -937,6 +943,7 @@ if [ $1 -gt 1 ]; then # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%endif %if ! 0%{?bootstrap} %post logger From 48bab5088bd989d6c47609df1c6d44cd3b3784af5a63ebcff688d97444cee9d5 Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Thu, 8 Apr 2021 20:12:54 +0000 Subject: [PATCH 070/124] Accepting request 882182 from Base:System - Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13) 423b1e759c Revert "resolved: gracefully handle with packets with too large RR count" (bsc#1183745) 4723778738 meson.build: make xinitrcdir configurable (bsc#1183408) [...] For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/9753d1c17545a5d46530696cb14254f5f12024f1...14581e01203df7aa63c7c8383a12e6ebe258476f - Drop 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch as it's part of v246.13. - Make use of the new build option to ship xinitrc in /usr/etc/X11/xinit/xinitrc.d (bsc#1183408) - Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch Temporary workaround for bsc#1183745 (upstream issue 18917) until an actual fix is found. - Default to the "unified" cgroup hierarchy. At this point, most users of cgroup (such as docker, libvirt, kubernetes) should be ready for this change. It's still possible to switch back to the old "hybrid" hierarchy by passing "systemd.unified_cgroup_hierarchy=0" option to the kernel command line. OBS-URL: https://build.opensuse.org/request/show/882182 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=328 --- systemd-mini.changes | 35 +++++++++++++++++++++ systemd-mini.spec | 14 +++++---- systemd-v246.11+suse.102.g9753d1c175.tar.xz | 3 -- systemd-v246.13+suse.105.g14581e0120.tar.xz | 3 ++ systemd.changes | 35 +++++++++++++++++++++ systemd.spec | 14 +++++---- 6 files changed, 89 insertions(+), 15 deletions(-) delete mode 100644 systemd-v246.11+suse.102.g9753d1c175.tar.xz create mode 100644 systemd-v246.13+suse.105.g14581e0120.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index d0523373..f2e3c48f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Mar 30 13:35:38 UTC 2021 - Franck Bui + +- Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13) + + 423b1e759c Revert "resolved: gracefully handle with packets with too large RR count" (bsc#1183745) + 4723778738 meson.build: make xinitrcdir configurable (bsc#1183408) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/9753d1c17545a5d46530696cb14254f5f12024f1...14581e01203df7aa63c7c8383a12e6ebe258476f + +- Drop 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + as it's part of v246.13. + +- Make use of the new build option to ship xinitrc in + /usr/etc/X11/xinit/xinitrc.d (bsc#1183408) + +------------------------------------------------------------------- +Wed Mar 24 07:05:22 UTC 2021 - Franck Bui + +- Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + + Temporary workaround for bsc#1183745 (upstream issue 18917) until an + actual fix is found. + +------------------------------------------------------------------- +Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa + +- Default to the "unified" cgroup hierarchy. At this point, most + users of cgroup (such as docker, libvirt, kubernetes) should be + ready for this change. It's still possible to switch back to the + old "hybrid" hierarchy by passing "systemd.unified_cgroup_hierarchy=0" + option to the kernel command line. + ------------------------------------------------------------------- Mon Mar 15 15:56:45 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index fd4a0914..d2b08382 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.102.g9753d1c175 +%define suse_version +suse.105.g14581e0120 %bcond_with gnuefi %if 0%{?bootstrap} @@ -55,7 +55,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.11 +Version: 246.13 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -512,9 +512,10 @@ systemd-journal-remote, and systemd-journal-upload. -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ -Dpamlibdir=%{_pamdir} \ + -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ - -Ddefault-hierarchy=hybrid \ + -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ @@ -1205,8 +1206,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%dir %{_sysconfdir}/X11/xinit -%dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/network @@ -1214,7 +1213,10 @@ fi %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user -%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh + +%dir %{_distconfdir}/X11/xinit +%dir %{_distconfdir}/X11/xinit/xinitrc.d +%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user diff --git a/systemd-v246.11+suse.102.g9753d1c175.tar.xz b/systemd-v246.11+suse.102.g9753d1c175.tar.xz deleted file mode 100644 index 0183619d..00000000 --- a/systemd-v246.11+suse.102.g9753d1c175.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4ec3e2511b4af7635c5189276f5d5ad3694159fab01603103f7ff12162d52fb -size 6573652 diff --git a/systemd-v246.13+suse.105.g14581e0120.tar.xz b/systemd-v246.13+suse.105.g14581e0120.tar.xz new file mode 100644 index 00000000..67e2c666 --- /dev/null +++ b/systemd-v246.13+suse.105.g14581e0120.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6316b2146335f43df36f200bdad2482858a6f83a56c50f7b1221b6a24e552eb8 +size 6574688 diff --git a/systemd.changes b/systemd.changes index d0523373..f2e3c48f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,38 @@ +------------------------------------------------------------------- +Tue Mar 30 13:35:38 UTC 2021 - Franck Bui + +- Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13) + + 423b1e759c Revert "resolved: gracefully handle with packets with too large RR count" (bsc#1183745) + 4723778738 meson.build: make xinitrcdir configurable (bsc#1183408) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/9753d1c17545a5d46530696cb14254f5f12024f1...14581e01203df7aa63c7c8383a12e6ebe258476f + +- Drop 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + as it's part of v246.13. + +- Make use of the new build option to ship xinitrc in + /usr/etc/X11/xinit/xinitrc.d (bsc#1183408) + +------------------------------------------------------------------- +Wed Mar 24 07:05:22 UTC 2021 - Franck Bui + +- Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch + + Temporary workaround for bsc#1183745 (upstream issue 18917) until an + actual fix is found. + +------------------------------------------------------------------- +Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa + +- Default to the "unified" cgroup hierarchy. At this point, most + users of cgroup (such as docker, libvirt, kubernetes) should be + ready for this change. It's still possible to switch back to the + old "hybrid" hierarchy by passing "systemd.unified_cgroup_hierarchy=0" + option to the kernel command line. + ------------------------------------------------------------------- Mon Mar 15 15:56:45 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index dda477e4..962abb8e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.102.g9753d1c175 +%define suse_version +suse.105.g14581e0120 %bcond_with gnuefi %if 0%{?bootstrap} @@ -53,7 +53,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.11 +Version: 246.13 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -510,9 +510,10 @@ systemd-journal-remote, and systemd-journal-upload. -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ -Dpamlibdir=%{_pamdir} \ + -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ - -Ddefault-hierarchy=hybrid \ + -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ -Dbump-proc-sys-fs-nr-open=false \ @@ -1203,8 +1204,6 @@ fi %dir %{_sysconfdir}/sysctl.d %{_sysctldir}/99-sysctl.conf -%dir %{_sysconfdir}/X11/xinit -%dir %{_sysconfdir}/X11/xinit/xinitrc.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/network @@ -1212,7 +1211,10 @@ fi %dir %{_sysconfdir}/systemd/user %dir %{_sysconfdir}/xdg/systemd %{_sysconfdir}/xdg/systemd/user -%{_sysconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh + +%dir %{_distconfdir}/X11/xinit +%dir %{_distconfdir}/X11/xinit/xinitrc.d +%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh %config(noreplace) %{_sysconfdir}/pam.d/systemd-user From a1b0bcc02063c569b0af55fc4212d7d9efea851b4a5c920b2a0294e515363352 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 3 Jun 2021 22:33:07 +0000 Subject: [PATCH 071/124] Accepting request 885896 from Base:System - systemd.spec: clean some of the build deps up: - libpcre is redundant with libpcre2 (only required by the full build) and the mini variant needs none of them. Hence drop the ref to libpcre. - normally libidn2 is needed by some optional features in systemd-network (only). But it's implicitly pulled in by libgnutls (required by the main package). Let's make sure the related features won't be disabled inadvertently in the future by making the dep explicit. - enable libiptc for masquerading support in networkd - create subpackage systemd-experimental to host pstore, repart, userdb and homed OBS-URL: https://build.opensuse.org/request/show/885896 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=329 --- systemd-mini.changes | 26 +++++++++ systemd-mini.spec | 122 +++++++++++++++++++++++++++++++++++++++++-- systemd.changes | 26 +++++++++ systemd.spec | 122 +++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 290 insertions(+), 6 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index f2e3c48f..e63fc72b 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Apr 7 08:59:15 UTC 2021 - Franck Bui + +- systemd.spec: clean some of the build deps up: + + - libpcre is redundant with libpcre2 (only required by the full + build) and the mini variant needs none of them. Hence drop the ref + to libpcre. + + - normally libidn2 is needed by some optional features in + systemd-network (only). But it's implicitly pulled in by libgnutls + (required by the main package). Let's make sure the related + features won't be disabled inadvertently in the future by making + the dep explicit. + ------------------------------------------------------------------- Tue Mar 30 13:35:38 UTC 2021 - Franck Bui @@ -24,6 +39,11 @@ Wed Mar 24 07:05:22 UTC 2021 - Franck Bui Temporary workaround for bsc#1183745 (upstream issue 18917) until an actual fix is found. +------------------------------------------------------------------- +Tue Mar 23 14:11:03 UTC 2021 - Ludwig Nussel + +- enable libiptc for masquerading support in networkd + ------------------------------------------------------------------- Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa @@ -65,6 +85,12 @@ Mon Mar 15 11:06:54 UTC 2021 - Franck Bui e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) +------------------------------------------------------------------- +Thu Mar 11 16:58:44 UTC 2021 - Ludwig Nussel + +- create subpackage systemd-experimental to host pstore, repart, + userdb and homed + ------------------------------------------------------------------- Thu Mar 11 09:51:53 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index d2b08382..5ed9d5d2 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -38,6 +38,7 @@ %bcond_with portabled %bcond_with resolved %bcond_with sysvcompat +%bcond_with experimental %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -50,6 +51,7 @@ %bcond_without portabled %bcond_without resolved %bcond_without sysvcompat +%bcond_without experimental %endif %bcond_with parentpathid @@ -99,7 +101,6 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 -BuildRequires: pkgconfig(libpcre) %if %{with importd} BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libcurl) @@ -112,6 +113,10 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %if %{with gnuefi} BuildRequires: gnu-efi %endif +%if %{with experimental} +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -367,6 +372,7 @@ Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} +BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires @@ -493,6 +499,24 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%package experimental +Summary: Experimental systemd features +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires + +%description experimental +This package contains optional extra systemd services that are +considered a preview feature. Behaviour details and option names are +subject to change without the usual backwards-compatibility promises. + +Components that turn out to be stable may be merged into the main or a +dedicated package later. + +Use at your own risk. + + %if ! 0%{?bootstrap} %lang_package %endif @@ -526,14 +550,22 @@ systemd-journal-remote, and systemd-journal-upload. -Dsmack=false \ -Dima=false \ -Delfutils=auto \ +%if %{with experimental} + -Dpstore=true \ + -Drepart=true \ + -Dhomed=true \ + -Duserdb=true \ +%else -Dpstore=false \ -Drepart=false \ - -Duserdb=false \ -Dhomed=false \ + -Duserdb=false \ +%endif +%if 0%{?bootstrap} -Dfdisk=false \ -Dpwquality=false \ -Dp11kit=false \ -%if ! 0%{?bootstrap} +%else -Dman=true \ -Dhtml=true \ %endif @@ -1049,6 +1081,29 @@ fi %service_del_postun systemd-portabled.service %endif +%if %{with experimental} +%pre experimental +%service_add_pre systemd-pstore.service +%service_add_pre systemd-userdbd.service systemd-userdbd.socket +%service_add_pre systemd-homed.service + +%post experimental +%tmpfiles_create systemd-pstore.conf +%service_add_post systemd-pstore.service +%service_add_post systemd-userdbd.service systemd-userdbd.socket +%service_add_post systemd-homed.service + +%preun experimental +%service_del_preun systemd-pstore.service +%service_del_preun systemd-userdbd.service systemd-userdbd.socket +%service_del_preun systemd-homed.service + +%postun experimental +%service_del_postun systemd-pstore.service +%service_del_postun systemd-userdbd.service systemd-userdbd.socket +%service_del_postun systemd-homed.service +%endif + %clean %files @@ -1146,6 +1201,22 @@ fi %exclude %{_unitdir}/dbus-org.freedesktop.portable1.service %exclude %{_tmpfilesdir}/portables.conf %endif +%if %{with experimental} +%exclude %{_prefix}/lib/systemd/systemd-pstore +%exclude %{_unitdir}/systemd-pstore.service +%exclude %{_tmpfilesdir}/systemd-pstore.conf +%exclude %{_unitdir}/systemd-repart.service +%exclude %{_unitdir}/initrd-root-fs.target.wants/systemd-repart.service +%exclude %{_unitdir}/sysinit.target.wants/systemd-repart.service +%exclude %{_prefix}/lib/systemd/systemd-userwork +%exclude %{_prefix}/lib/systemd/systemd-userdbd +%exclude %{_unitdir}/systemd-userdbd.service +%exclude %{_unitdir}/systemd-userdbd.socket +%exclude %{_prefix}/lib/systemd/systemd-homed +%exclude %{_prefix}/lib/systemd/systemd-homework +%exclude %{_unitdir}/systemd-homed-activate.service +%exclude %{_unitdir}/systemd-homed.service +%endif %{_unitdir}/*.automount %{_unitdir}/*.service @@ -1308,6 +1379,17 @@ fi %exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%exclude %{_mandir}/man*/*pstore* +%exclude %{_mandir}/man*/*repart* +%exclude %{_mandir}/man*/userdbctl* +%exclude %{_mandir}/man*/systemd-userdbd* +%exclude %{_mandir}/man*/*homectl* +%exclude %{_mandir}/man*/*homed* +%exclude %{_mandir}/man*/org.freedesktop.home1* +%exclude %{_mandir}/man*/pam_systemd_home* +%exclude %{_datadir}/bash-completion/completions/homectl +%endif %endif %{_docdir}/systemd @@ -1614,4 +1696,38 @@ fi %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%files experimental +%defattr(-,root,root) +%config(noreplace) /etc/systemd/pstore.conf +%{_prefix}/lib/systemd/systemd-pstore +%{_unitdir}/systemd-pstore.service +%{_tmpfilesdir}/systemd-pstore.conf +%{_mandir}/man*/*pstore* +%{_bindir}/systemd-repart +%{_unitdir}/systemd-repart.service +%{_mandir}/man*/*repart* +/usr/bin/userdbctl +%{_prefix}/lib/systemd/systemd-userwork +%{_prefix}/lib/systemd/systemd-userdbd +%{_unitdir}/systemd-userdbd.service +%{_unitdir}/systemd-userdbd.socket +%{_mandir}/man*/userdbctl* +%{_mandir}/man*/systemd-userdbd* +%config %{_sysconfdir}/homed.conf +%{_bindir}/homectl +%{_prefix}/lib/systemd/systemd-homed +%{_prefix}/lib/systemd/systemd-homework +%{_unitdir}/systemd-homed.service +%{_pamdir}/pam_systemd_home.so +%{_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* +%endif + %changelog diff --git a/systemd.changes b/systemd.changes index f2e3c48f..e63fc72b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Wed Apr 7 08:59:15 UTC 2021 - Franck Bui + +- systemd.spec: clean some of the build deps up: + + - libpcre is redundant with libpcre2 (only required by the full + build) and the mini variant needs none of them. Hence drop the ref + to libpcre. + + - normally libidn2 is needed by some optional features in + systemd-network (only). But it's implicitly pulled in by libgnutls + (required by the main package). Let's make sure the related + features won't be disabled inadvertently in the future by making + the dep explicit. + ------------------------------------------------------------------- Tue Mar 30 13:35:38 UTC 2021 - Franck Bui @@ -24,6 +39,11 @@ Wed Mar 24 07:05:22 UTC 2021 - Franck Bui Temporary workaround for bsc#1183745 (upstream issue 18917) until an actual fix is found. +------------------------------------------------------------------- +Tue Mar 23 14:11:03 UTC 2021 - Ludwig Nussel + +- enable libiptc for masquerading support in networkd + ------------------------------------------------------------------- Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa @@ -65,6 +85,12 @@ Mon Mar 15 11:06:54 UTC 2021 - Franck Bui e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) +------------------------------------------------------------------- +Thu Mar 11 16:58:44 UTC 2021 - Ludwig Nussel + +- create subpackage systemd-experimental to host pstore, repart, + userdb and homed + ------------------------------------------------------------------- Thu Mar 11 09:51:53 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 962abb8e..d31ca44b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -36,6 +36,7 @@ %bcond_with portabled %bcond_with resolved %bcond_with sysvcompat +%bcond_with experimental %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -48,6 +49,7 @@ %bcond_without portabled %bcond_without resolved %bcond_without sysvcompat +%bcond_without experimental %endif %bcond_with parentpathid @@ -97,7 +99,6 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 -BuildRequires: pkgconfig(libpcre) %if %{with importd} BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(libcurl) @@ -110,6 +111,10 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %if %{with gnuefi} BuildRequires: gnu-efi %endif +%if %{with experimental} +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) +%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -365,6 +370,7 @@ Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Group: System/Base Requires: %{name} = %{version}-%{release} +BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %systemd_requires @@ -491,6 +497,24 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%package experimental +Summary: Experimental systemd features +License: LGPL-2.1-or-later +Group: System/Base +Requires: %{name} = %{version}-%{release} +%systemd_requires + +%description experimental +This package contains optional extra systemd services that are +considered a preview feature. Behaviour details and option names are +subject to change without the usual backwards-compatibility promises. + +Components that turn out to be stable may be merged into the main or a +dedicated package later. + +Use at your own risk. + + %if ! 0%{?bootstrap} %lang_package %endif @@ -524,14 +548,22 @@ systemd-journal-remote, and systemd-journal-upload. -Dsmack=false \ -Dima=false \ -Delfutils=auto \ +%if %{with experimental} + -Dpstore=true \ + -Drepart=true \ + -Dhomed=true \ + -Duserdb=true \ +%else -Dpstore=false \ -Drepart=false \ - -Duserdb=false \ -Dhomed=false \ + -Duserdb=false \ +%endif +%if 0%{?bootstrap} -Dfdisk=false \ -Dpwquality=false \ -Dp11kit=false \ -%if ! 0%{?bootstrap} +%else -Dman=true \ -Dhtml=true \ %endif @@ -1047,6 +1079,29 @@ fi %service_del_postun systemd-portabled.service %endif +%if %{with experimental} +%pre experimental +%service_add_pre systemd-pstore.service +%service_add_pre systemd-userdbd.service systemd-userdbd.socket +%service_add_pre systemd-homed.service + +%post experimental +%tmpfiles_create systemd-pstore.conf +%service_add_post systemd-pstore.service +%service_add_post systemd-userdbd.service systemd-userdbd.socket +%service_add_post systemd-homed.service + +%preun experimental +%service_del_preun systemd-pstore.service +%service_del_preun systemd-userdbd.service systemd-userdbd.socket +%service_del_preun systemd-homed.service + +%postun experimental +%service_del_postun systemd-pstore.service +%service_del_postun systemd-userdbd.service systemd-userdbd.socket +%service_del_postun systemd-homed.service +%endif + %clean %files @@ -1144,6 +1199,22 @@ fi %exclude %{_unitdir}/dbus-org.freedesktop.portable1.service %exclude %{_tmpfilesdir}/portables.conf %endif +%if %{with experimental} +%exclude %{_prefix}/lib/systemd/systemd-pstore +%exclude %{_unitdir}/systemd-pstore.service +%exclude %{_tmpfilesdir}/systemd-pstore.conf +%exclude %{_unitdir}/systemd-repart.service +%exclude %{_unitdir}/initrd-root-fs.target.wants/systemd-repart.service +%exclude %{_unitdir}/sysinit.target.wants/systemd-repart.service +%exclude %{_prefix}/lib/systemd/systemd-userwork +%exclude %{_prefix}/lib/systemd/systemd-userdbd +%exclude %{_unitdir}/systemd-userdbd.service +%exclude %{_unitdir}/systemd-userdbd.socket +%exclude %{_prefix}/lib/systemd/systemd-homed +%exclude %{_prefix}/lib/systemd/systemd-homework +%exclude %{_unitdir}/systemd-homed-activate.service +%exclude %{_unitdir}/systemd-homed.service +%endif %{_unitdir}/*.automount %{_unitdir}/*.service @@ -1306,6 +1377,17 @@ fi %exclude %{_mandir}/man*/portablectl* %exclude %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%exclude %{_mandir}/man*/*pstore* +%exclude %{_mandir}/man*/*repart* +%exclude %{_mandir}/man*/userdbctl* +%exclude %{_mandir}/man*/systemd-userdbd* +%exclude %{_mandir}/man*/*homectl* +%exclude %{_mandir}/man*/*homed* +%exclude %{_mandir}/man*/org.freedesktop.home1* +%exclude %{_mandir}/man*/pam_systemd_home* +%exclude %{_datadir}/bash-completion/completions/homectl +%endif %endif %{_docdir}/systemd @@ -1612,4 +1694,38 @@ fi %{_mandir}/man*/systemd-portabled* %endif +%if %{with experimental} +%files experimental +%defattr(-,root,root) +%config(noreplace) /etc/systemd/pstore.conf +%{_prefix}/lib/systemd/systemd-pstore +%{_unitdir}/systemd-pstore.service +%{_tmpfilesdir}/systemd-pstore.conf +%{_mandir}/man*/*pstore* +%{_bindir}/systemd-repart +%{_unitdir}/systemd-repart.service +%{_mandir}/man*/*repart* +/usr/bin/userdbctl +%{_prefix}/lib/systemd/systemd-userwork +%{_prefix}/lib/systemd/systemd-userdbd +%{_unitdir}/systemd-userdbd.service +%{_unitdir}/systemd-userdbd.socket +%{_mandir}/man*/userdbctl* +%{_mandir}/man*/systemd-userdbd* +%config %{_sysconfdir}/homed.conf +%{_bindir}/homectl +%{_prefix}/lib/systemd/systemd-homed +%{_prefix}/lib/systemd/systemd-homework +%{_unitdir}/systemd-homed.service +%{_pamdir}/pam_systemd_home.so +%{_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* +%endif + %changelog From 441419a1e69c265f50e81bd308837e45548d99bf8e8418c2cbb3946637522f85 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 1 Jul 2021 05:05:27 +0000 Subject: [PATCH 072/124] Accepting request 902866 from Base:System MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Import commit e9a23d9e064c2e7ac21a1b984d116bcf15327e63 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 - Import commit fcdb8dce591db2f5fc3c1e3eeb7abe9a2090b401 aa2d840a3b compat-rules: fix warning: "label ‘out’ defined but not used" in path_id_compat.c - Restore 61-persistent-storage-compat.rules that was mistakenly dropped during the merge of v248. - Create /run/lock/subsys again (bsc#1187292) The creation of this directory was mistakenly dropped when 'filesystem' package took the initialization of the generic paths over. Paths under /run/lock are still managed by systemd for lack of better place. - Drop systemd's dependency on udev (jsc#PM-2677) In some environments (i.e. containers) udev is usually not necessary but pulls in unnecessary packages. - Now that chkconfig/insserv are history, let's implement the strict minimum in systemd-sysv-install to enable/disable SysV init scripts (bsc#1186595 bsc#1186359) Indeed there's no much point in dropping SysV support completely until upstream will do especially since 3rd party applications such as vmware still rely on it, see bsc#1186359). - Allow the sysusers config files shipped by systemd rpms to be overriden during system installation (bsc#1171962) - While at it, add a comment to explain why we don't use OBS-URL: https://build.opensuse.org/request/show/902866 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=330 --- ...ent-excessive-proc-self-mountinfo-pa.patch | 35 ++++ ...conf-parser-introduce-early-drop-ins.patch | 54 +++--- ...-part-from-etc-hostname-when-setting.patch | 28 ++- ...-exclude-statements-based-on-file-ow.patch | 124 ------------- ...dd-back-support-for-SysV-scripts-for.patch | 18 +- systemd-mini.changes | 168 ++++++++++++++++++ systemd-mini.spec | 165 +++++++++++------ systemd-sysv-install | 157 +++++++++++++--- systemd-v246.13+suse.105.g14581e0120.tar.xz | 3 - systemd-v248.3+suse.30.ge9a23d9e06.tar.xz | 3 + systemd.changes | 168 ++++++++++++++++++ systemd.spec | 165 +++++++++++------ tmpfiles-suse.conf | 4 + 13 files changed, 779 insertions(+), 313 deletions(-) create mode 100644 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch delete mode 100644 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch delete mode 100644 systemd-v246.13+suse.105.g14581e0120.tar.xz create mode 100644 systemd-v248.3+suse.30.ge9a23d9e06.tar.xz diff --git a/0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch b/0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch new file mode 100644 index 00000000..def1f512 --- /dev/null +++ b/0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch @@ -0,0 +1,35 @@ +From c9bce1f07276c591d8637dbfc3244ee11e8fa4e1 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Tue, 18 May 2021 11:53:55 +0200 +Subject: [PATCH 1/1] Revert "core: prevent excessive /proc/self/mountinfo + parsing" + +This reverts commit d586f642fd90e3bb378f7b6d3e3a64a753e51756. + +This reverts commit d586f642fd90e3bb378f7b6d3e3a64a753e51756 temporarly until +more investigation is done to find the root cause of +https://github.com/systemd/systemd/issues/19464. +--- + src/core/mount.c | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/src/core/mount.c b/src/core/mount.c +index ca5d0939a1..2939062161 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -1859,12 +1859,6 @@ static void mount_enumerate(Manager *m) { + goto fail; + } + +- r = sd_event_source_set_ratelimit(m->mount_event_source, 1 * USEC_PER_SEC, 5); +- if (r < 0) { +- log_error_errno(r, "Failed to enable rate limit for mount events: %m"); +- goto fail; +- } +- + (void) sd_event_source_set_description(m->mount_event_source, "mount-monitor-dispatch"); + } + +-- +2.26.2 + diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index c05f4769..3331afdc 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,4 +1,4 @@ -From 569f94a86a608fa7a47fef583f3f504ec8223967 Mon Sep 17 00:00:00 2001 +From 0eb84d049c77dceeb48724770f89f0fa01557c87 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins @@ -61,23 +61,23 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 47 ++++++++++- - src/test/test-conf-parser.c | 151 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 194 insertions(+), 4 deletions(-) + src/shared/conf-parser.c | 48 ++++++++++-- + src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 195 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 7499b3b882..799026626c 100644 +index 9dfa190751..b5dee9cbb1 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -426,6 +426,7 @@ int config_parse(const char *unit, +@@ -428,6 +428,7 @@ int config_parse( static int config_parse_many_files( - const char *conf_file, + const char* const* conf_files, + char **early_files, char **files, const char *sections, ConfigItemLookup lookup, -@@ -438,6 +439,12 @@ static int config_parse_many_files( +@@ -440,6 +441,12 @@ static int config_parse_many_files( char **fn; int r; @@ -87,10 +87,10 @@ index 7499b3b882..799026626c 100644 + return r; + } + - if (conf_file) { - r = config_parse(NULL, conf_file, NULL, sections, lookup, table, flags, userdata, &mtime); - if (r < 0) -@@ -456,6 +463,28 @@ static int config_parse_many_files( + /* First read the first found main config file. */ + STRV_FOREACH(fn, (char**) conf_files) { + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); +@@ -462,6 +469,28 @@ static int config_parse_many_files( return 0; } @@ -119,7 +119,7 @@ index 7499b3b882..799026626c 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -467,14 +496,19 @@ int config_parse_many_nulstr( +@@ -473,15 +502,19 @@ int config_parse_many_nulstr( void *userdata, usec_t *ret_mtime) { @@ -131,17 +131,18 @@ index 7499b3b882..799026626c 100644 if (r < 0) return r; -- return config_parse_many_files(conf_file, files, sections, lookup, table, flags, userdata, ret_mtime); +- return config_parse_many_files(STRV_MAKE_CONST(conf_file), +- files, sections, lookup, table, flags, userdata, + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + -+ return config_parse_many_files(conf_file, early_files, late_files, sections, -+ lookup, table, flags, userdata, ret_mtime); ++ return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files, ++ sections, lookup, table, flags, userdata, + ret_mtime); } - /* Parse each config file in the directories specified as strv. */ -@@ -489,8 +523,8 @@ int config_parse_many( +@@ -497,8 +530,8 @@ int config_parse_many( void *userdata, usec_t *ret_mtime) { @@ -151,22 +152,22 @@ index 7499b3b882..799026626c 100644 const char *suffix; int r; -@@ -503,7 +537,12 @@ int config_parse_many( +@@ -511,7 +544,12 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_file, files, sections, lookup, table, flags, userdata, ret_mtime); +- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime); + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + -+ return config_parse_many_files(conf_file, early_files, late_files, sections, -+ lookup, table, flags, userdata, ret_mtime); ++ return config_parse_many_files(conf_files, early_files, late_files, ++ sections, lookup, table, flags, userdata, ret_mtime); } #define DEFINE_PARSER(type, vartype, conv_func) \ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 07edc17f92..2df4b073c5 100644 +index 5da864347e..77d9f28a79 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -179,7 +180,7 @@ index 07edc17f92..2df4b073c5 100644 #include "string-util.h" #include "strv.h" #include "tmpfile-util.h" -@@ -385,6 +388,151 @@ static void test_config_parse(unsigned i, const char *s) { +@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) { } } @@ -263,7 +264,8 @@ index 07edc17f92..2df4b073c5 100644 + NULL, + NULL); + } else { -+ r = config_parse_many(conf_file, (const char * const*) conf_dirs, "", ++ r = config_parse_many(STRV_MAKE_CONST(conf_file), ++ (const char * const*) conf_dirs, "", + "Section\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, @@ -331,7 +333,7 @@ index 07edc17f92..2df4b073c5 100644 int main(int argc, char **argv) { unsigned i; -@@ -407,5 +555,8 @@ int main(int argc, char **argv) { +@@ -407,5 +556,8 @@ int main(int argc, char **argv) { for (i = 0; i < ELEMENTSOF(config_file); i++) test_config_parse(i, config_file[i]); diff --git a/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch index 5e9a1dfd..74e3790e 100644 --- a/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch +++ b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch @@ -1,7 +1,7 @@ -From f299a8180f1db0680b454c0e37696891361e3067 Mon Sep 17 00:00:00 2001 +From 54366ae306ae19bdb2a5af7eb5158260cdc37e8f Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Tue, 28 May 2013 15:17:35 +0200 -Subject: [PATCH 03/12] strip the domain part from /etc/hostname when setting +Subject: [PATCH 1/1] strip the domain part from /etc/hostname when setting system host name [fbui: fixes bnc#820213] @@ -13,19 +13,17 @@ Subject: [PATCH 03/12] strip the domain part from /etc/hostname when setting possibility was to fix the installer to create a correct /etc/hostname file. Need to investigate...] --- - src/core/hostname-setup.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) + src/shared/hostname-setup.c | 7 +++++++ + 1 file changed, 7 insertions(+) -diff --git a/src/core/hostname-setup.c b/src/core/hostname-setup.c -index 6d047db838..1acc0c998b 100644 ---- a/src/core/hostname-setup.c -+++ b/src/core/hostname-setup.c -@@ -39,8 +39,16 @@ int hostname_setup(void) { - enoent = true; +diff --git a/src/shared/hostname-setup.c b/src/shared/hostname-setup.c +index 511aa7d031..351d0e761d 100644 +--- a/src/shared/hostname-setup.c ++++ b/src/shared/hostname-setup.c +@@ -189,6 +189,13 @@ int hostname_setup(bool really) { else log_warning_errno(r, "Failed to read configured hostname: %m"); -- } else -+ } else { + } else { + char *domain; + + /* SUSE: strip the domain name */ @@ -34,10 +32,8 @@ index 6d047db838..1acc0c998b 100644 + *domain = '\0'; + hn = b; -+ } - } - - if (isempty(hn)) { + source = HOSTNAME_STATIC; + } -- 2.26.2 diff --git a/0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch b/0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch deleted file mode 100644 index 570f2c91..00000000 --- a/0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch +++ /dev/null @@ -1,124 +0,0 @@ -From b46d43bf980afe13cfff39fc2876aed10f33db1d Mon Sep 17 00:00:00 2001 -From: Thomas Blume -Date: Thu, 14 Apr 2016 15:42:02 +0200 -Subject: [PATCH 04/12] tmpfiles: support exclude statements based on file - ownership - -SUSE supported tmpfile cleanups based on file ownership before systemd. -So this feature needs to be available in systemd. -This was part of fate#314974 - -[tblume: suse-only patch ported from SLES12-SP1 commit e769a63907ae4b] -[tblume: part of fate#314974] ---- - man/tmpfiles.d.xml | 4 +++- - src/tmpfiles/tmpfiles.c | 49 ++++++++++++++++++++++++++++++++--------- - 2 files changed, 42 insertions(+), 11 deletions(-) - -diff --git a/man/tmpfiles.d.xml b/man/tmpfiles.d.xml -index b9e9eee96c..b90ae01345 100644 ---- a/man/tmpfiles.d.xml -+++ b/man/tmpfiles.d.xml -@@ -605,7 +605,9 @@ w- /proc/sys/vm/swappiness - - - - 10 - suffixed by a newline. For C, specifies the source file or directory. For t - and T, determines extended attributes to be set. For a and - A, determines ACL attributes to be set. For h and H, -- determines the file attributes to set. Ignored for all other lines. -+ determines the file attributes to set. For x and X a comma separated list -+ of usernames. If given, only paths belonging to these users will be excluded during directory cleanup. Ignored -+ for all other lines. - - This field can contain specifiers, see below. - -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 2404e36bf2..349653c786 100644 ---- a/src/tmpfiles/tmpfiles.c -+++ b/src/tmpfiles/tmpfiles.c -@@ -14,6 +14,8 @@ - #include - #include - #include -+#include -+#include - - #include "sd-path.h" - -@@ -505,6 +507,7 @@ static int dir_cleanup( - struct stat s; - usec_t age; - _cleanup_free_ char *sub_path = NULL; -+ Item *found; - - if (dot_or_dot_dot(dent->d_name)) - continue; -@@ -546,15 +549,41 @@ static int dir_cleanup( - goto finish; - } - -- /* Is there an item configured for this path? */ -- if (ordered_hashmap_get(items, sub_path)) { -- log_debug("Ignoring \"%s\": a separate entry exists.", sub_path); -- continue; -- } -+ /* evaluate username arguments in ignore statements */ -+ found = find_glob(globs, sub_path); - -- if (find_glob(globs, sub_path)) { -- log_debug("Ignoring \"%s\": a separate glob exists.", sub_path); -- continue; -+ if (i->type == CREATE_DIRECTORY && found && found->argument) { -+ struct passwd *pw; -+ char *userfound = NULL, *args = strdup(found->argument); -+ bool match = false; -+ -+ while ((userfound = strsep(&args, ","))) { -+ pw = getpwnam(userfound); -+ -+ if (pw) { -+ if (s.st_uid == pw->pw_uid) { -+ match = true; -+ break; -+ } -+ } -+ } -+ -+ if (match) { -+ log_debug("Ignoring \"%s\" of user \"%s\".", sub_path, pw->pw_name); -+ match=false; -+ continue; -+ } -+ } else { -+ /* Is there an item configured for this path? */ -+ if (ordered_hashmap_get(items, sub_path)) { -+ log_debug("Ignoring \"%s\": a separate entry exists.", sub_path); -+ continue; -+ } -+ -+ if (found) { -+ log_debug("Ignoring \"%s\": a separate glob exists.", sub_path); -+ continue; -+ } - } - - if (S_ISDIR(s.st_mode)) { -@@ -2637,8 +2666,6 @@ static int parse_line( - case EMPTY_DIRECTORY: - case TRUNCATE_DIRECTORY: - case CREATE_FIFO: -- case IGNORE_PATH: -- case IGNORE_DIRECTORY_PATH: - case REMOVE_PATH: - case RECURSIVE_REMOVE_PATH: - case ADJUST_MODE: -@@ -2649,6 +2676,8 @@ static int parse_line( - - break; - -+ case IGNORE_PATH: -+ case IGNORE_DIRECTORY_PATH: - case CREATE_FILE: - case TRUNCATE_FILE: - break; --- -2.26.2 - diff --git a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch index 53c44ddd..fdf44437 100644 --- a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch +++ b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch @@ -1,7 +1,7 @@ -From f9521480d5dc5af747fecc9adc4c617e473e5494 Mon Sep 17 00:00:00 2001 +From ac7bfed30245145ce68a037e7578da12ce2de009 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 26 May 2016 08:59:41 +0200 -Subject: [PATCH 06/12] sysv-generator: add (back) support for SysV scripts for +Subject: [PATCH 1/1] sysv-generator: add (back) support for SysV scripts for the early boot For the record, the upstream support was removed by commit @@ -43,7 +43,7 @@ the same time as 'normal' services. 1 file changed, 23 insertions(+) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index a2c72d1009..1c01008967 100644 +index 8c7aef23c3..f88f9119fb 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -31,6 +31,9 @@ static const struct { @@ -63,8 +63,8 @@ index a2c72d1009..1c01008967 100644 + bool early; } SysvStub; - static void free_sysvstub(SysvStub *s) { -@@ -147,6 +151,12 @@ static int generate_unit_file(SysvStub *s) { + static SysvStub* free_sysvstub(SysvStub *s) { +@@ -146,6 +150,12 @@ static int generate_unit_file(SysvStub *s) { fprintf(f, "Description=%s\n", t); } @@ -77,7 +77,7 @@ index a2c72d1009..1c01008967 100644 STRV_FOREACH(p, s->before) fprintf(f, "Before=%s\n", *p); STRV_FOREACH(p, s->after) -@@ -213,6 +223,10 @@ static char *sysv_translate_name(const char *name) { +@@ -212,6 +222,10 @@ static char *sysv_translate_name(const char *name) { _cleanup_free_ char *c = NULL; char *res; @@ -88,7 +88,7 @@ index a2c72d1009..1c01008967 100644 c = strdup(name); if (!c) return NULL; -@@ -289,6 +303,11 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, +@@ -288,6 +302,11 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, return 1; } @@ -100,7 +100,7 @@ index a2c72d1009..1c01008967 100644 /* Strip ".sh" suffix from file name for comparison */ filename_no_sh = strdupa(filename); e = endswith(filename_no_sh, ".sh"); -@@ -676,6 +695,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { +@@ -674,6 +693,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { if (other->sysv_start_priority < 0) continue; @@ -110,7 +110,7 @@ index a2c72d1009..1c01008967 100644 /* If both units have modern headers we don't care * about the priorities */ if (s->has_lsb && other->has_lsb) -@@ -800,6 +822,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { +@@ -798,6 +820,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { .sysv_start_priority = -1, .name = TAKE_PTR(name), .path = TAKE_PTR(fpath), diff --git a/systemd-mini.changes b/systemd-mini.changes index e63fc72b..84317eba 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,171 @@ +------------------------------------------------------------------- +Mon Jun 28 16:45:04 UTC 2021 - Franck Bui + +- Import commit e9a23d9e064c2e7ac21a1b984d116bcf15327e63 + + 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL + d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 + +------------------------------------------------------------------- +Thu Jun 24 13:39:30 UTC 2021 - Franck Bui + +- Import commit fcdb8dce591db2f5fc3c1e3eeb7abe9a2090b401 + + aa2d840a3b compat-rules: fix warning: "label ‘out’ defined but not used" in path_id_compat.c + +- Restore 61-persistent-storage-compat.rules that was mistakenly + dropped during the merge of v248. + +------------------------------------------------------------------- +Fri Jun 18 12:53:34 UTC 2021 - Franck Bui + +- Create /run/lock/subsys again (bsc#1187292) + + The creation of this directory was mistakenly dropped when + 'filesystem' package took the initialization of the generic paths + over. + + Paths under /run/lock are still managed by systemd for lack of + better place. + +------------------------------------------------------------------- +Fri Jun 4 13:10:30 UTC 2021 - Franck Bui + +- Drop systemd's dependency on udev (jsc#PM-2677) + + In some environments (i.e. containers) udev is usually not necessary + but pulls in unnecessary packages. + +------------------------------------------------------------------- +Fri Jun 4 07:32:16 UTC 2021 - Franck Bui + +- Now that chkconfig/insserv are history, let's implement the strict + minimum in systemd-sysv-install to enable/disable SysV init scripts + (bsc#1186595 bsc#1186359) + + Indeed there's no much point in dropping SysV support completely + until upstream will do especially since 3rd party applications such + as vmware still rely on it, see bsc#1186359). + +------------------------------------------------------------------- +Tue May 25 16:30:40 UTC 2021 - Franck Bui + +- Allow the sysusers config files shipped by systemd rpms to be + overriden during system installation (bsc#1171962) + +- While at it, add a comment to explain why we don't use + %sysusers_create in %pre and why it should be safe in %post. + +------------------------------------------------------------------- +Thu May 20 20:19:27 UTC 2021 - Franck Bui + +- udev requires systemd in its %post (bsc#1185958) + + udevadm, called in udev's %post, requires libsystemd-shared-248.so. + +------------------------------------------------------------------- +Thu May 20 18:52:53 UTC 2021 - Franck Bui + +- Restore all "License:" tags + + udev uses a different license (GPL-2.0-only) than the main package + and "osc service localrun format_spec_file" has the good taste to + restore the license tags for all other subpackages if one of the + subpackage tag differs. + +------------------------------------------------------------------- +Thu May 20 15:47:38 UTC 2021 - Franck Bui + +- Expect 644 permissions for /usr/lib/udev/compat-symlink-generation (bsc#1185807) + +------------------------------------------------------------------- +Wed May 19 06:54:57 UTC 2021 - Franck Bui + +- Spec file minor cleanups: + + - Drop all "Group:" tags as they are deprecated. + + - Drop "License:" tags from all subpackages and make it inherited + from the main package. + + - Drop "%bcond_with parentpathid" as it's not used. + +------------------------------------------------------------------- +Tue May 18 18:31:20 UTC 2021 - Franck Bui + +- Introduce subpackage systemd-tests + + This subpackage is mainly used before submitting a new version of + the systemd packages. As such it's not intended for regular users + hence can be removed/renamed at any time. One might wonder why the + unit tests are not executed during package builds (%check)... the + reason is that the environment used to build package (chroot) is too + limited and therefore only a subset of the unit tests would be + executed in this environment. + + To disable the build of the subpackage, use "--without=tests". + +------------------------------------------------------------------- +Tue May 18 10:04:16 UTC 2021 - Franck Bui + +- Add 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch + + A temporary patch until + https://github.com/systemd/systemd/issues/19464 is solved. + +------------------------------------------------------------------- +Tue May 18 08:19:57 UTC 2021 - Franck Bui + +- Import commit bc08011f04ac4f12569ec05965149f665a0b110b (merge of v248.3) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/6f5c11b28f5739b901390f22c2bf4c003cadedaa...bc08011f04ac4f12569ec05965149f665a0b110b + +------------------------------------------------------------------- +Mon May 10 13:12:56 UTC 2021 - Franck Bui + +- Import commit 6f5c11b28f5739b901390f22c2bf4c003cadedaa (merge of v248.2) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/e5f93c9d2e9e26dd0dff430c4c072a547357ae7d...6f5c11b28f5739b901390f22c2bf4c003cadedaa + +------------------------------------------------------------------- +Mon Apr 26 16:25:38 UTC 2021 - Franck Bui + +- Upgrade to v248 (commit 5d3d934a5c2f4593207497db94e6f313348e89e7) + + See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for + details. + + - A couple runtime dependencies on libraries are now tracked + manually (with Recommends:) due to the fact that some symbols of + these libs are dynamically loaded with dlopen() (heck!) + + - oomd is left disablde for now + + - pam configuration file 'systemd-user' is now shipped in + /usr/etc/pam.d + + - Rebased 0001-conf-parser-introduce-early-drop-ins.patch + 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch + 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch + + - Dropped 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch + as it is SLE specific. + +- Clean systemd-experimental up: + + - Enclose "%package/%descriptoin experimental" within a "%if + %experimental/%endif" block condition + + - List the build requirements in the sub-package instead of listing + them in the main package. + + - Enable support for fido2, pwquality and qrencode in the home + stuff + + - Improve the package description + ------------------------------------------------------------------- Wed Apr 7 08:59:15 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 5ed9d5d2..cef89604 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.105.g14581e0120 +%define suse_version +suse.30.ge9a23d9e06 %bcond_with gnuefi %if 0%{?bootstrap} @@ -39,6 +39,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental +%bcond_with tests %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -52,16 +53,15 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental +%bcond_without tests %endif -%bcond_with parentpathid Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.13 +Version: 248.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later -Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets @@ -76,6 +76,7 @@ BuildRequires: python3-lxml BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) +BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) @@ -113,10 +114,6 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %if %{with gnuefi} BuildRequires: gnu-efi %endif -%if %{with experimental} -BuildRequires: pkgconfig(fdisk) -BuildRequires: pkgconfig(openssl) -%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -128,13 +125,15 @@ Provides: systemd = %{version}-%{release} Requires: aaa_base >= 13.2 Requires: dbus-1 >= 1.4.0 Requires: kbd -Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version}-%{release} 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 +# ditto but dlopen()ed by systemd-cryptenroll +Recommends: libfido2 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -175,7 +174,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh 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 -Patch4: 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -191,6 +189,7 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. +Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -206,7 +205,6 @@ drop-in replacement for sysvinit. %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc @@ -218,7 +216,6 @@ The HTML documentation for systemd. %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -231,7 +228,6 @@ Development headers and auxiliary files for developing applications for systemd. %package sysvinit Summary: System V init tools License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -244,7 +240,6 @@ Drop-in replacement of System V init tools. %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -274,14 +269,14 @@ This library provides several of the systemd C APIs: %package -n udev%{?mini} Summary: A rule-based device node and kernel event manager License: GPL-2.0-only -Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -Requires(postun): /usr/bin/systemctl +%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -307,7 +302,6 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -322,7 +316,6 @@ access to udev device information %package -n libudev%{?mini}-devel Summary: Development files for libudev License: LGPL-2.1-or-later -Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -338,7 +331,6 @@ dynamic library, which provides access to udev device information. %package coredump Summary: Systemd tools for coredump management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -352,7 +344,6 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -370,8 +361,9 @@ and systemd-importd. %package network Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# This Recommends because some symbols of libidn2 are dlopen()ed by resolved +Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved @@ -387,7 +379,6 @@ resolver tools for resolved %package portable Summary: Systemd tools for portable services License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -407,7 +398,6 @@ https://systemd.io/PORTABLE_SERVICES %package logger Summary: Journal only logging License: LGPL-2.1-or-later -Group: System/Base Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -419,7 +409,6 @@ This package marks the installation to not use syslog but only the journal. %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -432,7 +421,6 @@ To activate this NSS module, you will need to include it in %package -n nss-myhostname Summary: Plugin for local system host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -449,7 +437,6 @@ To activate this NSS module, you will need to include it in %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later -Group: System/Libraries Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -466,7 +453,6 @@ To activate this NSS module, you will need to include it in %package -n nss-mymachines Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -483,11 +469,8 @@ To activate this NSS module, you will need to include it in %package journal-remote Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%systemd_requires %description journal-remote This extends the journal functionality to keep a copy of logs on a @@ -499,23 +482,61 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%if %{with tests} +%package tests +Summary: Unit tests for systemd +License: LGPL-2.1-or-later +Requires: %{name} = %{version}-%{release} +Recommends: python3 +Recommends: python3-colorama +# Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) +Recommends: dosfstools + +%description tests +This package contains the unit tests used to check various internal +functions used by systemd and all its components. + +The python script /usr/lib/systemd/tests/run-unit-tests.py can be used +to run all unit tests at once. +%endif + +%if %{with experimental} %package experimental Summary: Experimental systemd features License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# These Recommends because some symbols of these libs are dlopen()ed by home stuff +Recommends: libfido2 +Recommends: libpwquality1 +Recommends: libqrencode4 +# libfido2, libpwquality1 and libqrencode4 are build requirements for home stuff +BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(pwquality) +# fdisk and openssl are build requirements for home stuff and repart +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) %systemd_requires %description experimental -This package contains optional extra systemd services that are -considered a preview feature. Behaviour details and option names are -subject to change without the usual backwards-compatibility promises. +This package contains optional extra services that are considered as +previews and are provided so users can do early experiments with the +new features or technologies without waiting for them to be fully +supported by either upstream and openSUSE. -Components that turn out to be stable may be merged into the main or a -dedicated package later. +Please note that all services should be considered in development +phase and as such their behaviors details, unit files, option names, +etc... are subject to change without the usual backwards-compatibility +promises. -Use at your own risk. +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, pstore, repart, userdbd. + +Have fun with these services at your own risk. +%endif %if ! 0%{?bootstrap} %lang_package @@ -528,6 +549,7 @@ Use at your own risk. %build # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ @@ -535,6 +557,7 @@ Use at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ + -Dpamconfdir=%{_distconfdir}/pam.d \ -Dpamlibdir=%{_pamdir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ @@ -550,6 +573,7 @@ Use at your own risk. -Dsmack=false \ -Dima=false \ -Delfutils=auto \ + -Doomd=false \ %if %{with experimental} -Dpstore=true \ -Drepart=true \ @@ -562,16 +586,11 @@ Use at your own risk. -Duserdb=false \ %endif %if 0%{?bootstrap} - -Dfdisk=false \ - -Dpwquality=false \ - -Dp11kit=false \ + -Dnss-myhostname=false \ %else -Dman=true \ -Dhtml=true \ %endif -%if 0%{?bootstrap} - -Dnss-myhostname=false \ -%endif %if %{without coredump} -Dcoredump=false \ %endif @@ -599,6 +618,13 @@ Use at your own risk. %if %{without sysvcompat} -Dsysvinit-path= \ -Dsysvrcnd-path= \ +%endif +%if %{with tests} + -Dtests=unsafe \ + -Dinstall-tests=true \ +%else + -Dtests=false \ + -Dinstall-tests=false \ %endif -Dadm-group=false \ -Dwheel-group=false \ @@ -660,8 +686,8 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target -# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ +# Replace upstream systemd-user with the openSUSE one. +install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -838,10 +864,16 @@ fi pam-config --add --systemd || : %endif -%sysusers_create %{_sysusersdir}/systemd.conf +# systemd-sysusers is not available in %pre so this needs to be done +# in %post. However this shouldn't be an issue since all files the +# main package ships are owned by root. +%sysusers_create systemd.conf + [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : + systemctl daemon-reexec || : + %journal_catalog_update %tmpfiles_create @@ -908,7 +940,7 @@ if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/sys fi %postun -# daemon-reload is implied by %systemd_postun_with_restart +# daemon-reload is implied by %%systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service # Avoid restarting logind until fixed upstream (issue #1163) @@ -1012,7 +1044,8 @@ fi %service_add_pre systemd-journal-upload.service %post journal-remote -%sysusers_create %{_sysusersdir}/systemd-remote.conf +# Assume that all files shipped by systemd-journal-remove are owned by root. +%sysusers_create systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -1116,7 +1149,11 @@ fi %{_bindir}/localectl %{_bindir}/systemctl %{_bindir}/systemd-analyze +%if ! 0%{?bootstrap} +%{_bindir}/systemd-cryptenroll +%endif %{_bindir}/systemd-delta +%{_bindir}/systemd-dissect %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot %{_bindir}/systemd-id128 @@ -1126,6 +1163,7 @@ fi %{_bindir}/systemd-umount %{_bindir}/systemd-notify %{_bindir}/systemd-run +%{_bindir}/systemd-sysext %{_bindir}/journalctl %{_bindir}/systemd-ask-password %{_bindir}/loginctl @@ -1166,6 +1204,7 @@ fi %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/kmod-static-nodes.service %exclude %{_unitdir}/systemd-nspawn@.service %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined @@ -1262,6 +1301,7 @@ fi %{_modulesloaddir} %dir %{_sysusersdir} +%doc %{_sysusersdir}/README %{_sysusersdir}/systemd.conf %dir %{_sysconfdir}/tmpfiles.d @@ -1275,6 +1315,7 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%doc %{_sysctldir}/README %{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1289,7 +1330,7 @@ fi %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%config(noreplace) %{_sysconfdir}/pam.d/systemd-user +%{_distconfdir}/pam.d/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1313,6 +1354,7 @@ fi # FIXME: why do we have to own this dir ? %dir %{_modprobedir} +%doc %{_modprobedir}/README %{_modprobedir}/systemd.conf # Some files created at runtime. @@ -1353,6 +1395,7 @@ fi %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* +%{_mandir}/man8//rc-local.* %{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* @@ -1477,13 +1520,18 @@ fi %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id +# dmi_memory_id is only relevant on arches with DMI +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_prefix}/lib/udev/dmi_memory_id +%endif %{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id -%ghost %{_prefix}/lib/udev/compat-symlink-generation +%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %dir %{_udevrulesdir}/ +%doc %{_udevrulesdir}/README %exclude %{_udevrulesdir}/70-uaccess.rules %exclude %{_udevrulesdir}/71-seat.rules %exclude %{_udevrulesdir}/73-seat-late.rules @@ -1504,6 +1552,7 @@ fi %endif %dir %{_unitdir} %{_prefix}/lib/systemd/systemd-udevd +%{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket %{_unitdir}/initrd-udevadm-cleanup-db.service @@ -1696,10 +1745,15 @@ fi %{_mandir}/man*/systemd-portabled* %endif +%if %{with tests} +%files tests +%{_prefix}/lib/systemd/tests +%endif + %if %{with experimental} %files experimental %defattr(-,root,root) -%config(noreplace) /etc/systemd/pstore.conf +%config(noreplace) %{_sysconfdir}/systemd/pstore.conf %{_prefix}/lib/systemd/systemd-pstore %{_unitdir}/systemd-pstore.service %{_tmpfilesdir}/systemd-pstore.conf @@ -1707,18 +1761,19 @@ fi %{_bindir}/systemd-repart %{_unitdir}/systemd-repart.service %{_mandir}/man*/*repart* -/usr/bin/userdbctl +%{_bindir}/userdbctl %{_prefix}/lib/systemd/systemd-userwork %{_prefix}/lib/systemd/systemd-userdbd %{_unitdir}/systemd-userdbd.service %{_unitdir}/systemd-userdbd.socket %{_mandir}/man*/userdbctl* %{_mandir}/man*/systemd-userdbd* -%config %{_sysconfdir}/homed.conf +%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 %{_pamdir}/pam_systemd_home.so %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf diff --git a/systemd-sysv-install b/systemd-sysv-install index 36e13055..403fc632 100644 --- a/systemd-sysv-install +++ b/systemd-sysv-install @@ -1,41 +1,148 @@ -#!/bin/sh +#!/bin/bash + # This script is called by "systemctl enable/disable" when the given unit is a # SysV init.d script. It needs to call the distribution's mechanism for # enabling/disabling those, such as chkconfig, update-rc.d, or similar. This # can optionally take a --root argument for enabling a SysV init script # in a chroot or similar. +# +# chkconfig(8) and insserv(8) are no more available hence let's do the +# bare minimum and create/remote the symlinks for the well known +# runlevels and nothing more. Note that we don't take care of +# enabling/disabling the service dependencies as the sysv-generator +# will take care of them for us (openSUSE specific). +# + set -e usage() { - echo "Usage: $0 [--root=path] enable|disable|is-enabled " >&2 - exit 1 + echo >&2 "Usage: $0 [--quiet] [--root=path] enable|disable|is-enabled " + exit 1 } +info() { + $quiet || echo "$*" +} + +die() { + echo >&2 "error: $*, aborting." + exit 1 +} + +declare -A lsb_header + +check_runlevels() { + for l in $*; do + # Sanity check + case $l in + 0|1|2|3|4|5|6) continue ;; + *) return 1 + esac + done +} + +load_initscript() { + local found_lsb_start_marker=false + local found_lsb_end_marker=false + + [ -r $1 ] || die "initscript /etc/init.d/$1 can't be read" + + lsb_header=() + + while read line; do + # skip anything that is not a comment + [[ "$line" =~ ^# ]] || continue + + if ! $found_lsb_start_marker; then + [ "$line" == "### BEGIN INIT INFO" ] && + found_lsb_start_marker=true + continue + fi + + line=$(echo ${line:1}) + + case "$line" in + Default-Start:*) + levels=$(echo ${line:14}) + + check_runlevels $levels || + die "Invalid runlevels specified in $line" + + lsb_header[Default-Start]=$levels + ;; + "## END INIT INFO") + found_lsb_end_marker=true + break ;; + esac + done <$1 + + $found_lsb_end_marker || + die "malformated LSB header in $1: missing LSB end marker" +} + +enable_initscript() { + load_initscript $1 + + for l in ${lsb_header[Default-Start]}; do + symlink="$(pwd)/rc${l}.d/S50$1" + + info "ln -sf ../$1 $symlink" + ln -sf ../$1 "$symlink" + done +} + +disable_initscript() { + for symlink in rc*.d/[SK]*; do + [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ] && { + info "rm $(pwd)/$symlink" + rm $symlink + } + done +} + +is_initscript_enabled() { + for symlink in rc*.d/S*; do + [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ] && + return 0 + done + return 1 +} + +root= +quiet=false + # parse options -eval set -- "$(getopt -o r: --long root: -- "$@")" +eval set -- "$(getopt --name $(basename $0) -o hqr: --long help,quiet,root: -- "$@")" while true; do - case "$1" in - -r|--root) - ROOT="$2" - shift 2 ;; - --) shift ; break ;; - *) usage ;; - esac + case "$1" in + -h|--help) + usage ;; + -r|--root) + shift + root=$1 ;; + -q|--quiet) + quiet=true ;; + --) + shift + break ;; + *) + usage ;; + esac + shift done -NAME="$2" -[ -n "$NAME" ] || usage +[ $# -eq 2 ] || usage +action=$1 +name=$2 -case "$1" in - enable) - chkconfig $ROOT --no-systemctl -s "$NAME" on - ;; - disable) - chkconfig $ROOT --no-systemctl -s "$NAME" off - ;; - is-enabled) - chkconfig $ROOT --no-systemctl -c "$NAME" - ;; - *) - usage ;; +sysvinit_path=$(realpath -q -e $root/etc/init.d) || + die "$root/etc/init.d: no such file or directory" + +cd $sysvinit_path + +case "$action" in +enable) enable_initscript $name ;; +disable) disable_initscript $name ;; +is-enabled) is_initscript_enabled $name ;; +*) usage esac diff --git a/systemd-v246.13+suse.105.g14581e0120.tar.xz b/systemd-v246.13+suse.105.g14581e0120.tar.xz deleted file mode 100644 index 67e2c666..00000000 --- a/systemd-v246.13+suse.105.g14581e0120.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6316b2146335f43df36f200bdad2482858a6f83a56c50f7b1221b6a24e552eb8 -size 6574688 diff --git a/systemd-v248.3+suse.30.ge9a23d9e06.tar.xz b/systemd-v248.3+suse.30.ge9a23d9e06.tar.xz new file mode 100644 index 00000000..2bda2ab4 --- /dev/null +++ b/systemd-v248.3+suse.30.ge9a23d9e06.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb92dd21edf73541f3ccce6fb95ab6a2c3d261e14c95a77445cada2982913fdc +size 7080532 diff --git a/systemd.changes b/systemd.changes index e63fc72b..84317eba 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,171 @@ +------------------------------------------------------------------- +Mon Jun 28 16:45:04 UTC 2021 - Franck Bui + +- Import commit e9a23d9e064c2e7ac21a1b984d116bcf15327e63 + + 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL + d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 + +------------------------------------------------------------------- +Thu Jun 24 13:39:30 UTC 2021 - Franck Bui + +- Import commit fcdb8dce591db2f5fc3c1e3eeb7abe9a2090b401 + + aa2d840a3b compat-rules: fix warning: "label ‘out’ defined but not used" in path_id_compat.c + +- Restore 61-persistent-storage-compat.rules that was mistakenly + dropped during the merge of v248. + +------------------------------------------------------------------- +Fri Jun 18 12:53:34 UTC 2021 - Franck Bui + +- Create /run/lock/subsys again (bsc#1187292) + + The creation of this directory was mistakenly dropped when + 'filesystem' package took the initialization of the generic paths + over. + + Paths under /run/lock are still managed by systemd for lack of + better place. + +------------------------------------------------------------------- +Fri Jun 4 13:10:30 UTC 2021 - Franck Bui + +- Drop systemd's dependency on udev (jsc#PM-2677) + + In some environments (i.e. containers) udev is usually not necessary + but pulls in unnecessary packages. + +------------------------------------------------------------------- +Fri Jun 4 07:32:16 UTC 2021 - Franck Bui + +- Now that chkconfig/insserv are history, let's implement the strict + minimum in systemd-sysv-install to enable/disable SysV init scripts + (bsc#1186595 bsc#1186359) + + Indeed there's no much point in dropping SysV support completely + until upstream will do especially since 3rd party applications such + as vmware still rely on it, see bsc#1186359). + +------------------------------------------------------------------- +Tue May 25 16:30:40 UTC 2021 - Franck Bui + +- Allow the sysusers config files shipped by systemd rpms to be + overriden during system installation (bsc#1171962) + +- While at it, add a comment to explain why we don't use + %sysusers_create in %pre and why it should be safe in %post. + +------------------------------------------------------------------- +Thu May 20 20:19:27 UTC 2021 - Franck Bui + +- udev requires systemd in its %post (bsc#1185958) + + udevadm, called in udev's %post, requires libsystemd-shared-248.so. + +------------------------------------------------------------------- +Thu May 20 18:52:53 UTC 2021 - Franck Bui + +- Restore all "License:" tags + + udev uses a different license (GPL-2.0-only) than the main package + and "osc service localrun format_spec_file" has the good taste to + restore the license tags for all other subpackages if one of the + subpackage tag differs. + +------------------------------------------------------------------- +Thu May 20 15:47:38 UTC 2021 - Franck Bui + +- Expect 644 permissions for /usr/lib/udev/compat-symlink-generation (bsc#1185807) + +------------------------------------------------------------------- +Wed May 19 06:54:57 UTC 2021 - Franck Bui + +- Spec file minor cleanups: + + - Drop all "Group:" tags as they are deprecated. + + - Drop "License:" tags from all subpackages and make it inherited + from the main package. + + - Drop "%bcond_with parentpathid" as it's not used. + +------------------------------------------------------------------- +Tue May 18 18:31:20 UTC 2021 - Franck Bui + +- Introduce subpackage systemd-tests + + This subpackage is mainly used before submitting a new version of + the systemd packages. As such it's not intended for regular users + hence can be removed/renamed at any time. One might wonder why the + unit tests are not executed during package builds (%check)... the + reason is that the environment used to build package (chroot) is too + limited and therefore only a subset of the unit tests would be + executed in this environment. + + To disable the build of the subpackage, use "--without=tests". + +------------------------------------------------------------------- +Tue May 18 10:04:16 UTC 2021 - Franck Bui + +- Add 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch + + A temporary patch until + https://github.com/systemd/systemd/issues/19464 is solved. + +------------------------------------------------------------------- +Tue May 18 08:19:57 UTC 2021 - Franck Bui + +- Import commit bc08011f04ac4f12569ec05965149f665a0b110b (merge of v248.3) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/6f5c11b28f5739b901390f22c2bf4c003cadedaa...bc08011f04ac4f12569ec05965149f665a0b110b + +------------------------------------------------------------------- +Mon May 10 13:12:56 UTC 2021 - Franck Bui + +- Import commit 6f5c11b28f5739b901390f22c2bf4c003cadedaa (merge of v248.2) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/e5f93c9d2e9e26dd0dff430c4c072a547357ae7d...6f5c11b28f5739b901390f22c2bf4c003cadedaa + +------------------------------------------------------------------- +Mon Apr 26 16:25:38 UTC 2021 - Franck Bui + +- Upgrade to v248 (commit 5d3d934a5c2f4593207497db94e6f313348e89e7) + + See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for + details. + + - A couple runtime dependencies on libraries are now tracked + manually (with Recommends:) due to the fact that some symbols of + these libs are dynamically loaded with dlopen() (heck!) + + - oomd is left disablde for now + + - pam configuration file 'systemd-user' is now shipped in + /usr/etc/pam.d + + - Rebased 0001-conf-parser-introduce-early-drop-ins.patch + 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch + 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch + + - Dropped 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch + as it is SLE specific. + +- Clean systemd-experimental up: + + - Enclose "%package/%descriptoin experimental" within a "%if + %experimental/%endif" block condition + + - List the build requirements in the sub-package instead of listing + them in the main package. + + - Enable support for fido2, pwquality and qrencode in the home + stuff + + - Improve the package description + ------------------------------------------------------------------- Wed Apr 7 08:59:15 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index d31ca44b..9ba18701 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.105.g14581e0120 +%define suse_version +suse.30.ge9a23d9e06 %bcond_with gnuefi %if 0%{?bootstrap} @@ -37,6 +37,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental +%bcond_with tests %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -50,16 +51,15 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental +%bcond_without tests %endif -%bcond_with parentpathid Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 246.13 +Version: 248.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later -Group: System/Base BuildRoot: %{_tmppath}/%{name}-%{version}-build %if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets @@ -74,6 +74,7 @@ BuildRequires: python3-lxml BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) +BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) @@ -111,10 +112,6 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %if %{with gnuefi} BuildRequires: gnu-efi %endif -%if %{with experimental} -BuildRequires: pkgconfig(fdisk) -BuildRequires: pkgconfig(openssl) -%endif %if 0%{?bootstrap} #!BuildIgnore: dbus-1 @@ -126,13 +123,15 @@ Provides: systemd = %{version}-%{release} Requires: aaa_base >= 13.2 Requires: dbus-1 >= 1.4.0 Requires: kbd -Requires: kmod >= 15 Requires: netcfg >= 11.5 Requires: systemd-default-settings-branding Requires: systemd-presets-branding -Requires: udev = %{version}-%{release} 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 +# ditto but dlopen()ed by systemd-cryptenroll +Recommends: libfido2 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -173,7 +172,6 @@ Source102: scripts-systemd-migrate-sysconfig-i18n.sh 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 -Patch4: 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -189,6 +187,7 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. +Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -204,7 +203,6 @@ drop-in replacement for sysvinit. %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -Group: Documentation/Other Supplements: (systemd and patterns-base-documentation) %description doc @@ -216,7 +214,6 @@ The HTML documentation for systemd. %package devel Summary: Development headers for systemd License: LGPL-2.1-or-later -Group: Development/Libraries/C and C++ Requires: libsystemd0%{?mini} = %{version}-%{release} Requires: systemd-rpm-macros %if 0%{?bootstrap} @@ -229,7 +226,6 @@ Development headers and auxiliary files for developing applications for systemd. %package sysvinit Summary: System V init tools License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -242,7 +238,6 @@ Drop-in replacement of System V init tools. %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libsystemd0 Requires: this-is-only-for-build-envs @@ -272,14 +267,14 @@ This library provides several of the systemd C APIs: %package -n udev%{?mini} Summary: A rule-based device node and kernel event manager License: GPL-2.0-only -Group: System/Kernel URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -Requires(postun): /usr/bin/systemctl +%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -305,7 +300,6 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -Group: System/Libraries %if 0%{?bootstrap} Conflicts: libudev1 Conflicts: kiwi @@ -320,7 +314,6 @@ access to udev device information %package -n libudev%{?mini}-devel Summary: Development files for libudev License: LGPL-2.1-or-later -Group: Development/Libraries/Other Requires: libudev%{?mini}1 = %{version}-%{release} %if 0%{?bootstrap} Provides: libudev-devel = %{version}-%{version} @@ -336,7 +329,6 @@ dynamic library, which provides access to udev device information. %package coredump Summary: Systemd tools for coredump management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/coredumpctl @@ -350,7 +342,6 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires Provides: systemd:%{_bindir}/systemd-nspawn @@ -368,8 +359,9 @@ and systemd-importd. %package network Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# This Recommends because some symbols of libidn2 are dlopen()ed by resolved +Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved @@ -385,7 +377,6 @@ resolver tools for resolved %package portable Summary: Systemd tools for portable services License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} %systemd_requires @@ -405,7 +396,6 @@ https://systemd.io/PORTABLE_SERVICES %package logger Summary: Journal only logging License: LGPL-2.1-or-later -Group: System/Base Provides: syslog Provides: sysvinit(syslog) Requires(post): /usr/bin/systemctl @@ -417,7 +407,6 @@ This package marks the installation to not use syslog but only the journal. %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-systemd This package contains a plugin for the Name Service Switch (NSS), @@ -430,7 +419,6 @@ To activate this NSS module, you will need to include it in %package -n nss-myhostname Summary: Plugin for local system host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-myhostname This package contains a plug-in module for the Name Service Switch @@ -447,7 +435,6 @@ To activate this NSS module, you will need to include it in %package -n nss-resolve Summary: Plugin for local hostname resolution via systemd-resolved License: LGPL-2.1-or-later -Group: System/Libraries Requires: %{name}-network = %{version}-%{release} %description -n nss-resolve @@ -464,7 +451,6 @@ To activate this NSS module, you will need to include it in %package -n nss-mymachines Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later -Group: System/Libraries %description -n nss-mymachines This package contains a plugin for the Name Service Switch (NSS), @@ -481,11 +467,8 @@ To activate this NSS module, you will need to include it in %package journal-remote Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd +%systemd_requires %description journal-remote This extends the journal functionality to keep a copy of logs on a @@ -497,23 +480,61 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif +%if %{with tests} +%package tests +Summary: Unit tests for systemd +License: LGPL-2.1-or-later +Requires: %{name} = %{version}-%{release} +Recommends: python3 +Recommends: python3-colorama +# Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) +Recommends: dosfstools + +%description tests +This package contains the unit tests used to check various internal +functions used by systemd and all its components. + +The python script /usr/lib/systemd/tests/run-unit-tests.py can be used +to run all unit tests at once. +%endif + +%if %{with experimental} %package experimental Summary: Experimental systemd features License: LGPL-2.1-or-later -Group: System/Base Requires: %{name} = %{version}-%{release} +# These Recommends because some symbols of these libs are dlopen()ed by home stuff +Recommends: libfido2 +Recommends: libpwquality1 +Recommends: libqrencode4 +# libfido2, libpwquality1 and libqrencode4 are build requirements for home stuff +BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(pwquality) +# fdisk and openssl are build requirements for home stuff and repart +BuildRequires: pkgconfig(fdisk) +BuildRequires: pkgconfig(openssl) %systemd_requires %description experimental -This package contains optional extra systemd services that are -considered a preview feature. Behaviour details and option names are -subject to change without the usual backwards-compatibility promises. +This package contains optional extra services that are considered as +previews and are provided so users can do early experiments with the +new features or technologies without waiting for them to be fully +supported by either upstream and openSUSE. -Components that turn out to be stable may be merged into the main or a -dedicated package later. +Please note that all services should be considered in development +phase and as such their behaviors details, unit files, option names, +etc... are subject to change without the usual backwards-compatibility +promises. -Use at your own risk. +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, pstore, repart, userdbd. + +Have fun with these services at your own risk. +%endif %if ! 0%{?bootstrap} %lang_package @@ -526,6 +547,7 @@ Use at your own risk. %build # keep split-usr until all packages have moved their systemd rules to /usr %meson \ + -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ @@ -533,6 +555,7 @@ Use at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ + -Dpamconfdir=%{_distconfdir}/pam.d \ -Dpamlibdir=%{_pamdir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ @@ -548,6 +571,7 @@ Use at your own risk. -Dsmack=false \ -Dima=false \ -Delfutils=auto \ + -Doomd=false \ %if %{with experimental} -Dpstore=true \ -Drepart=true \ @@ -560,16 +584,11 @@ Use at your own risk. -Duserdb=false \ %endif %if 0%{?bootstrap} - -Dfdisk=false \ - -Dpwquality=false \ - -Dp11kit=false \ + -Dnss-myhostname=false \ %else -Dman=true \ -Dhtml=true \ %endif -%if 0%{?bootstrap} - -Dnss-myhostname=false \ -%endif %if %{without coredump} -Dcoredump=false \ %endif @@ -597,6 +616,13 @@ Use at your own risk. %if %{without sysvcompat} -Dsysvinit-path= \ -Dsysvrcnd-path= \ +%endif +%if %{with tests} + -Dtests=unsafe \ + -Dinstall-tests=true \ +%else + -Dtests=false \ + -Dinstall-tests=false \ %endif -Dadm-group=false \ -Dwheel-group=false \ @@ -658,8 +684,8 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target -# Replace /etc/pam.d/systemd-user shipped by upstream with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_sysconfdir}/pam.d/ +# Replace upstream systemd-user with the openSUSE one. +install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -836,10 +862,16 @@ fi pam-config --add --systemd || : %endif -%sysusers_create %{_sysusersdir}/systemd.conf +# systemd-sysusers is not available in %pre so this needs to be done +# in %post. However this shouldn't be an issue since all files the +# main package ships are owned by root. +%sysusers_create systemd.conf + [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : + systemctl daemon-reexec || : + %journal_catalog_update %tmpfiles_create @@ -906,7 +938,7 @@ if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/sys fi %postun -# daemon-reload is implied by %systemd_postun_with_restart +# daemon-reload is implied by %%systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service # Avoid restarting logind until fixed upstream (issue #1163) @@ -1010,7 +1042,8 @@ fi %service_add_pre systemd-journal-upload.service %post journal-remote -%sysusers_create %{_sysusersdir}/systemd-remote.conf +# Assume that all files shipped by systemd-journal-remove are owned by root. +%sysusers_create systemd-remote.conf %service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service %service_add_post systemd-journal-remote.socket systemd-journal-remote.service %service_add_post systemd-journal-upload.service @@ -1114,7 +1147,11 @@ fi %{_bindir}/localectl %{_bindir}/systemctl %{_bindir}/systemd-analyze +%if ! 0%{?bootstrap} +%{_bindir}/systemd-cryptenroll +%endif %{_bindir}/systemd-delta +%{_bindir}/systemd-dissect %{_bindir}/systemd-escape %{_bindir}/systemd-firstboot %{_bindir}/systemd-id128 @@ -1124,6 +1161,7 @@ fi %{_bindir}/systemd-umount %{_bindir}/systemd-notify %{_bindir}/systemd-run +%{_bindir}/systemd-sysext %{_bindir}/journalctl %{_bindir}/systemd-ask-password %{_bindir}/loginctl @@ -1164,6 +1202,7 @@ fi %exclude %{_unitdir}/systemd-udev*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service +%exclude %{_unitdir}/kmod-static-nodes.service %exclude %{_unitdir}/systemd-nspawn@.service %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined @@ -1260,6 +1299,7 @@ fi %{_modulesloaddir} %dir %{_sysusersdir} +%doc %{_sysusersdir}/README %{_sysusersdir}/systemd.conf %dir %{_sysconfdir}/tmpfiles.d @@ -1273,6 +1313,7 @@ fi %dir %{_sysctldir} %dir %{_sysconfdir}/sysctl.d +%doc %{_sysctldir}/README %{_sysctldir}/99-sysctl.conf %dir %{_sysconfdir}/X11/xorg.conf.d @@ -1287,7 +1328,7 @@ fi %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%config(noreplace) %{_sysconfdir}/pam.d/systemd-user +%{_distconfdir}/pam.d/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1311,6 +1352,7 @@ fi # FIXME: why do we have to own this dir ? %dir %{_modprobedir} +%doc %{_modprobedir}/README %{_modprobedir}/systemd.conf # Some files created at runtime. @@ -1351,6 +1393,7 @@ fi %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* +%{_mandir}/man8//rc-local.* %{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* @@ -1475,13 +1518,18 @@ fi %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id +# dmi_memory_id is only relevant on arches with DMI +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_prefix}/lib/udev/dmi_memory_id +%endif %{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe %{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id -%ghost %{_prefix}/lib/udev/compat-symlink-generation +%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %dir %{_udevrulesdir}/ +%doc %{_udevrulesdir}/README %exclude %{_udevrulesdir}/70-uaccess.rules %exclude %{_udevrulesdir}/71-seat.rules %exclude %{_udevrulesdir}/73-seat-late.rules @@ -1502,6 +1550,7 @@ fi %endif %dir %{_unitdir} %{_prefix}/lib/systemd/systemd-udevd +%{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket %{_unitdir}/initrd-udevadm-cleanup-db.service @@ -1694,10 +1743,15 @@ fi %{_mandir}/man*/systemd-portabled* %endif +%if %{with tests} +%files tests +%{_prefix}/lib/systemd/tests +%endif + %if %{with experimental} %files experimental %defattr(-,root,root) -%config(noreplace) /etc/systemd/pstore.conf +%config(noreplace) %{_sysconfdir}/systemd/pstore.conf %{_prefix}/lib/systemd/systemd-pstore %{_unitdir}/systemd-pstore.service %{_tmpfilesdir}/systemd-pstore.conf @@ -1705,18 +1759,19 @@ fi %{_bindir}/systemd-repart %{_unitdir}/systemd-repart.service %{_mandir}/man*/*repart* -/usr/bin/userdbctl +%{_bindir}/userdbctl %{_prefix}/lib/systemd/systemd-userwork %{_prefix}/lib/systemd/systemd-userdbd %{_unitdir}/systemd-userdbd.service %{_unitdir}/systemd-userdbd.socket %{_mandir}/man*/userdbctl* %{_mandir}/man*/systemd-userdbd* -%config %{_sysconfdir}/homed.conf +%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 %{_pamdir}/pam_systemd_home.so %{_datadir}/dbus-1/system-services/org.freedesktop.home1.service %{_datadir}/dbus-1/system.d/org.freedesktop.home1.conf diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf index 885e852c..68635292 100644 --- a/tmpfiles-suse.conf +++ b/tmpfiles-suse.conf @@ -9,6 +9,10 @@ L+ /etc/mtab - - - - ../proc/self/mounts # FIXME: Might be moved to lockded. d /run/lock 0775 root lock - +# /run/lock/subsys is used for serializing SysV service execution, and +# hence without use on SysV-less systems. +d /run/lock/subsys 0755 root root - + # FIXME: Should these one be moved to shadow ? f /var/log/wtmp 0664 root utmp - f /var/log/btmp 0660 root utmp - From 5dfe3d4e23600a7e783e36a5ab9077e1c11f8b35ad91da4ecbff1d7fef3d95b7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 4 Jul 2021 20:10:18 +0000 Subject: [PATCH 073/124] Accepting request 903365 from Base:System - Finally don't create /run/lock/subsys anymore This effectively reverts the fix for bsc#1187292 made earlier. This directory is specific to RH sysvinit and since we're going to fade the support of SysV init script away the directory has no future. - Enable TPM2 support OBS-URL: https://build.opensuse.org/request/show/903365 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=331 --- systemd-mini.changes | 14 ++++++++++++++ systemd-mini.spec | 7 +++++++ systemd.changes | 14 ++++++++++++++ systemd.spec | 7 +++++++ tmpfiles-suse.conf | 4 ---- 5 files changed, 42 insertions(+), 4 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 84317eba..c11e4dc7 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 1 07:47:31 UTC 2021 - Franck Bui + +- Finally don't create /run/lock/subsys anymore + + This effectively reverts the fix for bsc#1187292 made earlier. This + directory is specific to RH sysvinit and since we're going to fade + the support of SysV init script away the directory has no future. + ------------------------------------------------------------------- Mon Jun 28 16:45:04 UTC 2021 - Franck Bui @@ -6,6 +15,11 @@ Mon Jun 28 16:45:04 UTC 2021 - Franck Bui 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 +------------------------------------------------------------------- +Mon Jun 28 12:46:04 UTC 2021 - Fabian Vogt + +- Enable TPM2 support + ------------------------------------------------------------------- Thu Jun 24 13:39:30 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index cef89604..65f56a41 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -83,6 +83,9 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -134,6 +137,9 @@ Requires: group(lock) Recommends: libpcre2-8-0 # ditto but dlopen()ed by systemd-cryptenroll Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -588,6 +594,7 @@ Have fun with these services at your own risk. %if 0%{?bootstrap} -Dnss-myhostname=false \ %else + -Dtpm2=true \ -Dman=true \ -Dhtml=true \ %endif diff --git a/systemd.changes b/systemd.changes index 84317eba..c11e4dc7 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Thu Jul 1 07:47:31 UTC 2021 - Franck Bui + +- Finally don't create /run/lock/subsys anymore + + This effectively reverts the fix for bsc#1187292 made earlier. This + directory is specific to RH sysvinit and since we're going to fade + the support of SysV init script away the directory has no future. + ------------------------------------------------------------------- Mon Jun 28 16:45:04 UTC 2021 - Franck Bui @@ -6,6 +15,11 @@ Mon Jun 28 16:45:04 UTC 2021 - Franck Bui 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 +------------------------------------------------------------------- +Mon Jun 28 12:46:04 UTC 2021 - Fabian Vogt + +- Enable TPM2 support + ------------------------------------------------------------------- Thu Jun 24 13:39:30 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 9ba18701..1b9aeaae 100644 --- a/systemd.spec +++ b/systemd.spec @@ -81,6 +81,9 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -132,6 +135,9 @@ Requires: group(lock) Recommends: libpcre2-8-0 # ditto but dlopen()ed by systemd-cryptenroll Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -586,6 +592,7 @@ Have fun with these services at your own risk. %if 0%{?bootstrap} -Dnss-myhostname=false \ %else + -Dtpm2=true \ -Dman=true \ -Dhtml=true \ %endif diff --git a/tmpfiles-suse.conf b/tmpfiles-suse.conf index 68635292..885e852c 100644 --- a/tmpfiles-suse.conf +++ b/tmpfiles-suse.conf @@ -9,10 +9,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts # FIXME: Might be moved to lockded. d /run/lock 0775 root lock - -# /run/lock/subsys is used for serializing SysV service execution, and -# hence without use on SysV-less systems. -d /run/lock/subsys 0755 root root - - # FIXME: Should these one be moved to shadow ? f /var/log/wtmp 0664 root utmp - f /var/log/btmp 0660 root utmp - From fed1c9a7ac184c5d37d9b8a28ad785c8aee936c01846491e6bea63bdd044423b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 22 Jul 2021 20:42:41 +0000 Subject: [PATCH 074/124] Accepting request 907311 from Base:System - Added patches to fix CVE-2021-33910 (bsc#1188063) Added 1001-unit-name-generate-a-clear-error-code-when-convertin.patch Added 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch Added 1003-basic-unit-name-adjust-comments.patch These patches will be moved to the git repo once the bug will become public. - systemd-hwdb-update.service should be shipped by the udev package OBS-URL: https://build.opensuse.org/request/show/907311 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=332 --- ...te-a-clear-error-code-when-convertin.patch | 63 +++++++++++++++++ ...it-name-do-not-use-strdupa-on-a-path.patch | 67 +++++++++++++++++++ 1003-basic-unit-name-adjust-comments.patch | 38 +++++++++++ systemd-mini.changes | 17 +++++ systemd-mini.spec | 10 +++ systemd.changes | 17 +++++ systemd.spec | 10 +++ 7 files changed, 222 insertions(+) create mode 100644 1001-unit-name-generate-a-clear-error-code-when-convertin.patch create mode 100644 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch create mode 100644 1003-basic-unit-name-adjust-comments.patch diff --git a/1001-unit-name-generate-a-clear-error-code-when-convertin.patch b/1001-unit-name-generate-a-clear-error-code-when-convertin.patch new file mode 100644 index 00000000..3a090213 --- /dev/null +++ b/1001-unit-name-generate-a-clear-error-code-when-convertin.patch @@ -0,0 +1,63 @@ +From 83f392a392067d61be24eb720ff0cf1da7f1892b Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Tue, 1 Jun 2021 19:43:55 +0200 +Subject: [PATCH 1001/1003] unit-name: generate a clear error code when + converting an overly long fs path to a unit name + +(cherry picked from commit 9d5acfab20c5f1177d877d0bec18063c0a6c5929) + +[fbui: adjust context] +--- + src/basic/unit-name.c | 6 ++++++ + src/test/test-unit-name.c | 4 ++-- + 2 files changed, 8 insertions(+), 2 deletions(-) + +diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c +index 532f8fa048..85dcba6cb7 100644 +--- a/src/basic/unit-name.c ++++ b/src/basic/unit-name.c +@@ -528,6 +528,9 @@ int unit_name_from_path(const char *path, const char *suffix, char **ret) { + if (!s) + return -ENOMEM; + ++ if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ ++ return -ENAMETOOLONG; ++ + /* Refuse this if this got too long or for some other reason didn't result in a valid name */ + if (!unit_name_is_valid(s, UNIT_NAME_PLAIN)) + return -EINVAL; +@@ -559,6 +562,9 @@ int unit_name_from_path_instance(const char *prefix, const char *path, const cha + if (!s) + return -ENOMEM; + ++ if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ ++ return -ENAMETOOLONG; ++ + /* Refuse this if this got too long or for some other reason didn't result in a valid name */ + if (!unit_name_is_valid(s, UNIT_NAME_INSTANCE)) + return -EINVAL; +diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c +index ece78aa548..c0b79715e1 100644 +--- a/src/test/test-unit-name.c ++++ b/src/test/test-unit-name.c +@@ -130,7 +130,7 @@ static void test_unit_name_from_path(void) { + test_unit_name_from_path_one("///", ".mount", "-.mount", 0); + test_unit_name_from_path_one("/foo/../bar", ".mount", NULL, -EINVAL); + test_unit_name_from_path_one("/foo/./bar", ".mount", NULL, -EINVAL); +- test_unit_name_from_path_one("/waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", ".mount", NULL, -EINVAL); ++ test_unit_name_from_path_one("/waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", ".mount", NULL, -ENAMETOOLONG); + } + + static void test_unit_name_from_path_instance_one(const char *pattern, const char *path, const char *suffix, const char *expected, int ret) { +@@ -160,7 +160,7 @@ static void test_unit_name_from_path_instance(void) { + test_unit_name_from_path_instance_one("waldo", "..", ".mount", NULL, -EINVAL); + test_unit_name_from_path_instance_one("waldo", "/foo", ".waldi", NULL, -EINVAL); + test_unit_name_from_path_instance_one("wa--ldo", "/--", ".mount", "wa--ldo@\\x2d\\x2d.mount", 0); +- test_unit_name_from_path_instance_one("waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "/waldo", ".mount", NULL, -EINVAL); ++ test_unit_name_from_path_instance_one("waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "/waldo", ".mount", NULL, -ENAMETOOLONG); + } + + static void test_unit_name_to_path_one(const char *unit, const char *path, int ret) { +-- +2.26.2 + diff --git a/1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch b/1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch new file mode 100644 index 00000000..a6f54db8 --- /dev/null +++ b/1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch @@ -0,0 +1,67 @@ +From f636948448bd8a3588388d21dad737a079266392 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 23 Jun 2021 11:46:41 +0200 +Subject: [PATCH 1002/1003] basic/unit-name: do not use strdupa() on a path + +The path may have unbounded length, for example through a fuse mount. + +CVE-2021-33910: attacked controlled alloca() leads to crash in systemd and +ultimately a kernel panic. Systemd parses the content of /proc/self/mountinfo +and each mountpoint is passed to mount_setup_unit(), which calls +unit_name_path_escape() underneath. A local attacker who is able to mount a +filesystem with a very long path can crash systemd and the whole system. + +https://bugzilla.redhat.com/show_bug.cgi?id=1970887 + +The resulting string length is bounded by UNIT_NAME_MAX, which is 256. But we +can't easily check the length after simplification before doing the +simplification, which in turns uses a copy of the string we can write to. +So we can't reject paths that are too long before doing the duplication. +Hence the most obvious solution is to switch back to strdup(), as before +7410616cd9dbbec97cf98d75324da5cda2b2f7a2. + +[fbui: fixes bsc#1188063] +[fbui: fixes CVE-2021-33910] +--- + src/basic/unit-name.c | 13 +++++-------- + 1 file changed, 5 insertions(+), 8 deletions(-) + +diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c +index 85dcba6cb7..46b24f2d9e 100644 +--- a/src/basic/unit-name.c ++++ b/src/basic/unit-name.c +@@ -378,12 +378,13 @@ int unit_name_unescape(const char *f, char **ret) { + } + + int unit_name_path_escape(const char *f, char **ret) { +- char *p, *s; ++ _cleanup_free_ char *p = NULL; ++ char *s; + + assert(f); + assert(ret); + +- p = strdupa(f); ++ p = strdup(f); + if (!p) + return -ENOMEM; + +@@ -395,13 +396,9 @@ int unit_name_path_escape(const char *f, char **ret) { + if (!path_is_normalized(p)) + return -EINVAL; + +- /* Truncate trailing slashes */ ++ /* Truncate trailing slashes and skip leading slashes */ + delete_trailing_chars(p, "/"); +- +- /* Truncate leading slashes */ +- p = skip_leading_chars(p, "/"); +- +- s = unit_name_escape(p); ++ s = unit_name_escape(skip_leading_chars(p, "/")); + } + if (!s) + return -ENOMEM; +-- +2.26.2 + diff --git a/1003-basic-unit-name-adjust-comments.patch b/1003-basic-unit-name-adjust-comments.patch new file mode 100644 index 00000000..98cad8b5 --- /dev/null +++ b/1003-basic-unit-name-adjust-comments.patch @@ -0,0 +1,38 @@ +From 9731d5204357d43204ca83155f5b552594b843bc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Wed, 23 Jun 2021 11:52:56 +0200 +Subject: [PATCH 1003/1003] basic/unit-name: adjust comments +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +We already checked for "too long" right above… +--- + src/basic/unit-name.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c +index 46b24f2d9e..c5850949ae 100644 +--- a/src/basic/unit-name.c ++++ b/src/basic/unit-name.c +@@ -528,7 +528,7 @@ int unit_name_from_path(const char *path, const char *suffix, char **ret) { + if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ + return -ENAMETOOLONG; + +- /* Refuse this if this got too long or for some other reason didn't result in a valid name */ ++ /* Refuse if this for some other reason didn't result in a valid name */ + if (!unit_name_is_valid(s, UNIT_NAME_PLAIN)) + return -EINVAL; + +@@ -562,7 +562,7 @@ int unit_name_from_path_instance(const char *prefix, const char *path, const cha + if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ + return -ENAMETOOLONG; + +- /* Refuse this if this got too long or for some other reason didn't result in a valid name */ ++ /* Refuse if this for some other reason didn't result in a valid name */ + if (!unit_name_is_valid(s, UNIT_NAME_INSTANCE)) + return -EINVAL; + +-- +2.26.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index c11e4dc7..84cd5d49 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Jul 8 18:04:31 UTC 2021 - Franck Bui + +- Added patches to fix CVE-2021-33910 (bsc#1188063) + + Added 1001-unit-name-generate-a-clear-error-code-when-convertin.patch + Added 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch + Added 1003-basic-unit-name-adjust-comments.patch + + These patches will be moved to the git repo once the bug will become + public. + +------------------------------------------------------------------- +Mon Jul 5 09:03:07 UTC 2021 - Franck Bui + +- systemd-hwdb-update.service should be shipped by the udev package + ------------------------------------------------------------------- Thu Jul 1 07:47:31 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 65f56a41..50b3bf24 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -197,6 +197,12 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream. Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch +# Patches for bsc#1188063/CVE-2021-33910. They will be moved to the +# git repo once the bug will become public. +Patch1001: 1001-unit-name-generate-a-clear-error-code-when-convertin.patch +Patch1002: 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch +Patch1003: 1003-basic-unit-name-adjust-comments.patch + %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -1209,7 +1215,9 @@ fi %endif %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* +%exclude %{_unitdir}/systemd-hwdb*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* +%exclude %{_unitdir}/*.target.wants/systemd-hwdb*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service %exclude %{_unitdir}/kmod-static-nodes.service %exclude %{_unitdir}/systemd-nspawn@.service @@ -1562,11 +1570,13 @@ fi %{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket +%{_unitdir}/systemd-hwdb*.* %{_unitdir}/initrd-udevadm-cleanup-db.service %dir %{_unitdir}/sysinit.target.wants %{_unitdir}/sysinit.target.wants/systemd-udev*.service %dir %{_unitdir}/sockets.target.wants %{_unitdir}/sockets.target.wants/systemd-udev*.socket +%{_unitdir}/*.target.wants/systemd-hwdb*.* %{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc diff --git a/systemd.changes b/systemd.changes index c11e4dc7..84cd5d49 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Thu Jul 8 18:04:31 UTC 2021 - Franck Bui + +- Added patches to fix CVE-2021-33910 (bsc#1188063) + + Added 1001-unit-name-generate-a-clear-error-code-when-convertin.patch + Added 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch + Added 1003-basic-unit-name-adjust-comments.patch + + These patches will be moved to the git repo once the bug will become + public. + +------------------------------------------------------------------- +Mon Jul 5 09:03:07 UTC 2021 - Franck Bui + +- systemd-hwdb-update.service should be shipped by the udev package + ------------------------------------------------------------------- Thu Jul 1 07:47:31 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 1b9aeaae..dd5ca994 100644 --- a/systemd.spec +++ b/systemd.spec @@ -195,6 +195,12 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream. Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch +# Patches for bsc#1188063/CVE-2021-33910. They will be moved to the +# git repo once the bug will become public. +Patch1001: 1001-unit-name-generate-a-clear-error-code-when-convertin.patch +Patch1002: 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch +Patch1003: 1003-basic-unit-name-adjust-comments.patch + %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -1207,7 +1213,9 @@ fi %endif %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* +%exclude %{_unitdir}/systemd-hwdb*.* %exclude %{_unitdir}/*.target.wants/systemd-udev*.* +%exclude %{_unitdir}/*.target.wants/systemd-hwdb*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service %exclude %{_unitdir}/kmod-static-nodes.service %exclude %{_unitdir}/systemd-nspawn@.service @@ -1560,11 +1568,13 @@ fi %{_unitdir}/kmod-static-nodes.service %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket +%{_unitdir}/systemd-hwdb*.* %{_unitdir}/initrd-udevadm-cleanup-db.service %dir %{_unitdir}/sysinit.target.wants %{_unitdir}/sysinit.target.wants/systemd-udev*.service %dir %{_unitdir}/sockets.target.wants %{_unitdir}/sockets.target.wants/systemd-udev*.socket +%{_unitdir}/*.target.wants/systemd-hwdb*.* %{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc From cff4d1a6d1314e5c48f109fa5b44abca87a6c549a97c52cbe6a001bd211cda91 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 2 Aug 2021 10:04:37 +0000 Subject: [PATCH 075/124] Accepting request 908417 from Base:System - Import commit 73e9e6fb847513c6d62f2fb445778ef5bc0fe516 (merge of v248.6) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/cb29bcc5ef2c0ee659686c5d229646a6ba98ec50...73e9e6fb847513c6d62f2fb445778ef5bc0fe516 - Drop 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch Commit 81107b8419c39f726fd2805517a5b9faab204e59 fixes https://github.com/systemd/systemd/issues/19464 which makes the aforementioned patch not needed anymore. - Drop 1003-basic-unit-name-adjust-comments.patch It's been merged in SUSE/v248 branch - Import commit cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 (merge of v248.5) 4a1c5f34bd basic/unit-name: do not use strdupa() on a path (bsc#1188063 CVE-2021-33910) [...] For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/94efce2ee59fca15a48ff9c232c8dd7cf930c0a0...cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 - Drop 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch as it was merged in v248.5. - Import commit 94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 (merge of v248.4) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/c0aecee593511e49638579cb2b9ac8aaf1f8e6c8...94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 - Drop 1001-unit-name-generate-a-clear-error-code-when-convertin.patch as it was merged in v248.4. - Import commit c0aecee593511e49638579cb2b9ac8aaf1f8e6c8 42ec1d537a login: use a hwdb entry for tagging Parallels' fb devices with 'master-of-seat' tag ecc7c7b462 login: use a hwdb entry for tagging HyperV's fb devices with 'master-of-seat' tag a4cfd70476 login: XGI Z7/Z9 (XG20 core) graphic chip requires master-of-seat to be set (bsc#1187154) OBS-URL: https://build.opensuse.org/request/show/908417 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=333 --- ...ent-excessive-proc-self-mountinfo-pa.patch | 35 ---------- ...te-a-clear-error-code-when-convertin.patch | 63 ----------------- ...it-name-do-not-use-strdupa-on-a-path.patch | 67 ------------------- 1003-basic-unit-name-adjust-comments.patch | 38 ----------- systemd-mini.changes | 62 +++++++++++++++++ systemd-mini.spec | 11 +-- systemd-v248.3+suse.30.ge9a23d9e06.tar.xz | 3 - systemd-v248.6+suse.45.g73e9e6fb84.tar.xz | 3 + systemd.changes | 62 +++++++++++++++++ systemd.spec | 11 +-- 10 files changed, 131 insertions(+), 224 deletions(-) delete mode 100644 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch delete mode 100644 1001-unit-name-generate-a-clear-error-code-when-convertin.patch delete mode 100644 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch delete mode 100644 1003-basic-unit-name-adjust-comments.patch delete mode 100644 systemd-v248.3+suse.30.ge9a23d9e06.tar.xz create mode 100644 systemd-v248.6+suse.45.g73e9e6fb84.tar.xz diff --git a/0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch b/0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch deleted file mode 100644 index def1f512..00000000 --- a/0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch +++ /dev/null @@ -1,35 +0,0 @@ -From c9bce1f07276c591d8637dbfc3244ee11e8fa4e1 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Tue, 18 May 2021 11:53:55 +0200 -Subject: [PATCH 1/1] Revert "core: prevent excessive /proc/self/mountinfo - parsing" - -This reverts commit d586f642fd90e3bb378f7b6d3e3a64a753e51756. - -This reverts commit d586f642fd90e3bb378f7b6d3e3a64a753e51756 temporarly until -more investigation is done to find the root cause of -https://github.com/systemd/systemd/issues/19464. ---- - src/core/mount.c | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/src/core/mount.c b/src/core/mount.c -index ca5d0939a1..2939062161 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -1859,12 +1859,6 @@ static void mount_enumerate(Manager *m) { - goto fail; - } - -- r = sd_event_source_set_ratelimit(m->mount_event_source, 1 * USEC_PER_SEC, 5); -- if (r < 0) { -- log_error_errno(r, "Failed to enable rate limit for mount events: %m"); -- goto fail; -- } -- - (void) sd_event_source_set_description(m->mount_event_source, "mount-monitor-dispatch"); - } - --- -2.26.2 - diff --git a/1001-unit-name-generate-a-clear-error-code-when-convertin.patch b/1001-unit-name-generate-a-clear-error-code-when-convertin.patch deleted file mode 100644 index 3a090213..00000000 --- a/1001-unit-name-generate-a-clear-error-code-when-convertin.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 83f392a392067d61be24eb720ff0cf1da7f1892b Mon Sep 17 00:00:00 2001 -From: Lennart Poettering -Date: Tue, 1 Jun 2021 19:43:55 +0200 -Subject: [PATCH 1001/1003] unit-name: generate a clear error code when - converting an overly long fs path to a unit name - -(cherry picked from commit 9d5acfab20c5f1177d877d0bec18063c0a6c5929) - -[fbui: adjust context] ---- - src/basic/unit-name.c | 6 ++++++ - src/test/test-unit-name.c | 4 ++-- - 2 files changed, 8 insertions(+), 2 deletions(-) - -diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c -index 532f8fa048..85dcba6cb7 100644 ---- a/src/basic/unit-name.c -+++ b/src/basic/unit-name.c -@@ -528,6 +528,9 @@ int unit_name_from_path(const char *path, const char *suffix, char **ret) { - if (!s) - return -ENOMEM; - -+ if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ -+ return -ENAMETOOLONG; -+ - /* Refuse this if this got too long or for some other reason didn't result in a valid name */ - if (!unit_name_is_valid(s, UNIT_NAME_PLAIN)) - return -EINVAL; -@@ -559,6 +562,9 @@ int unit_name_from_path_instance(const char *prefix, const char *path, const cha - if (!s) - return -ENOMEM; - -+ if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ -+ return -ENAMETOOLONG; -+ - /* Refuse this if this got too long or for some other reason didn't result in a valid name */ - if (!unit_name_is_valid(s, UNIT_NAME_INSTANCE)) - return -EINVAL; -diff --git a/src/test/test-unit-name.c b/src/test/test-unit-name.c -index ece78aa548..c0b79715e1 100644 ---- a/src/test/test-unit-name.c -+++ b/src/test/test-unit-name.c -@@ -130,7 +130,7 @@ static void test_unit_name_from_path(void) { - test_unit_name_from_path_one("///", ".mount", "-.mount", 0); - test_unit_name_from_path_one("/foo/../bar", ".mount", NULL, -EINVAL); - test_unit_name_from_path_one("/foo/./bar", ".mount", NULL, -EINVAL); -- test_unit_name_from_path_one("/waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", ".mount", NULL, -EINVAL); -+ test_unit_name_from_path_one("/waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", ".mount", NULL, -ENAMETOOLONG); - } - - static void test_unit_name_from_path_instance_one(const char *pattern, const char *path, const char *suffix, const char *expected, int ret) { -@@ -160,7 +160,7 @@ static void test_unit_name_from_path_instance(void) { - test_unit_name_from_path_instance_one("waldo", "..", ".mount", NULL, -EINVAL); - test_unit_name_from_path_instance_one("waldo", "/foo", ".waldi", NULL, -EINVAL); - test_unit_name_from_path_instance_one("wa--ldo", "/--", ".mount", "wa--ldo@\\x2d\\x2d.mount", 0); -- test_unit_name_from_path_instance_one("waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "/waldo", ".mount", NULL, -EINVAL); -+ test_unit_name_from_path_instance_one("waldoaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa", "/waldo", ".mount", NULL, -ENAMETOOLONG); - } - - static void test_unit_name_to_path_one(const char *unit, const char *path, int ret) { --- -2.26.2 - diff --git a/1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch b/1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch deleted file mode 100644 index a6f54db8..00000000 --- a/1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch +++ /dev/null @@ -1,67 +0,0 @@ -From f636948448bd8a3588388d21dad737a079266392 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 23 Jun 2021 11:46:41 +0200 -Subject: [PATCH 1002/1003] basic/unit-name: do not use strdupa() on a path - -The path may have unbounded length, for example through a fuse mount. - -CVE-2021-33910: attacked controlled alloca() leads to crash in systemd and -ultimately a kernel panic. Systemd parses the content of /proc/self/mountinfo -and each mountpoint is passed to mount_setup_unit(), which calls -unit_name_path_escape() underneath. A local attacker who is able to mount a -filesystem with a very long path can crash systemd and the whole system. - -https://bugzilla.redhat.com/show_bug.cgi?id=1970887 - -The resulting string length is bounded by UNIT_NAME_MAX, which is 256. But we -can't easily check the length after simplification before doing the -simplification, which in turns uses a copy of the string we can write to. -So we can't reject paths that are too long before doing the duplication. -Hence the most obvious solution is to switch back to strdup(), as before -7410616cd9dbbec97cf98d75324da5cda2b2f7a2. - -[fbui: fixes bsc#1188063] -[fbui: fixes CVE-2021-33910] ---- - src/basic/unit-name.c | 13 +++++-------- - 1 file changed, 5 insertions(+), 8 deletions(-) - -diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c -index 85dcba6cb7..46b24f2d9e 100644 ---- a/src/basic/unit-name.c -+++ b/src/basic/unit-name.c -@@ -378,12 +378,13 @@ int unit_name_unescape(const char *f, char **ret) { - } - - int unit_name_path_escape(const char *f, char **ret) { -- char *p, *s; -+ _cleanup_free_ char *p = NULL; -+ char *s; - - assert(f); - assert(ret); - -- p = strdupa(f); -+ p = strdup(f); - if (!p) - return -ENOMEM; - -@@ -395,13 +396,9 @@ int unit_name_path_escape(const char *f, char **ret) { - if (!path_is_normalized(p)) - return -EINVAL; - -- /* Truncate trailing slashes */ -+ /* Truncate trailing slashes and skip leading slashes */ - delete_trailing_chars(p, "/"); -- -- /* Truncate leading slashes */ -- p = skip_leading_chars(p, "/"); -- -- s = unit_name_escape(p); -+ s = unit_name_escape(skip_leading_chars(p, "/")); - } - if (!s) - return -ENOMEM; --- -2.26.2 - diff --git a/1003-basic-unit-name-adjust-comments.patch b/1003-basic-unit-name-adjust-comments.patch deleted file mode 100644 index 98cad8b5..00000000 --- a/1003-basic-unit-name-adjust-comments.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 9731d5204357d43204ca83155f5b552594b843bc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 23 Jun 2021 11:52:56 +0200 -Subject: [PATCH 1003/1003] basic/unit-name: adjust comments -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -We already checked for "too long" right above… ---- - src/basic/unit-name.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/basic/unit-name.c b/src/basic/unit-name.c -index 46b24f2d9e..c5850949ae 100644 ---- a/src/basic/unit-name.c -+++ b/src/basic/unit-name.c -@@ -528,7 +528,7 @@ int unit_name_from_path(const char *path, const char *suffix, char **ret) { - if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ - return -ENAMETOOLONG; - -- /* Refuse this if this got too long or for some other reason didn't result in a valid name */ -+ /* Refuse if this for some other reason didn't result in a valid name */ - if (!unit_name_is_valid(s, UNIT_NAME_PLAIN)) - return -EINVAL; - -@@ -562,7 +562,7 @@ int unit_name_from_path_instance(const char *prefix, const char *path, const cha - if (strlen(s) >= UNIT_NAME_MAX) /* Return a slightly more descriptive error for this specific condition */ - return -ENAMETOOLONG; - -- /* Refuse this if this got too long or for some other reason didn't result in a valid name */ -+ /* Refuse if this for some other reason didn't result in a valid name */ - if (!unit_name_is_valid(s, UNIT_NAME_INSTANCE)) - return -EINVAL; - --- -2.26.2 - diff --git a/systemd-mini.changes b/systemd-mini.changes index 84cd5d49..6a0a7640 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Mon Jul 26 10:54:10 UTC 2021 - Franck Bui + +- Import commit 73e9e6fb847513c6d62f2fb445778ef5bc0fe516 (merge of v248.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/cb29bcc5ef2c0ee659686c5d229646a6ba98ec50...73e9e6fb847513c6d62f2fb445778ef5bc0fe516 + +------------------------------------------------------------------- +Tue Jul 20 16:26:39 UTC 2021 - Franck Bui + +- Drop 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch + + Commit 81107b8419c39f726fd2805517a5b9faab204e59 fixes + https://github.com/systemd/systemd/issues/19464 which makes the + aforementioned patch not needed anymore. + +------------------------------------------------------------------- +Tue Jul 20 16:22:46 UTC 2021 - Franck Bui + +- Drop 1003-basic-unit-name-adjust-comments.patch + + It's been merged in SUSE/v248 branch + +------------------------------------------------------------------- +Tue Jul 20 15:51:47 UTC 2021 - Franck Bui + +- Import commit cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 (merge of v248.5) + + 4a1c5f34bd basic/unit-name: do not use strdupa() on a path (bsc#1188063 CVE-2021-33910) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/94efce2ee59fca15a48ff9c232c8dd7cf930c0a0...cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 + +- Drop 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch as it + was merged in v248.5. + +------------------------------------------------------------------- +Tue Jul 20 15:25:38 UTC 2021 - Franck Bui + +- Import commit 94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 (merge of v248.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/c0aecee593511e49638579cb2b9ac8aaf1f8e6c8...94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 + +- Drop 1001-unit-name-generate-a-clear-error-code-when-convertin.patch + as it was merged in v248.4. + +------------------------------------------------------------------- +Tue Jul 20 15:10:41 UTC 2021 - Franck Bui + +- Import commit c0aecee593511e49638579cb2b9ac8aaf1f8e6c8 + + 42ec1d537a login: use a hwdb entry for tagging Parallels' fb devices with 'master-of-seat' tag + ecc7c7b462 login: use a hwdb entry for tagging HyperV's fb devices with 'master-of-seat' tag + a4cfd70476 login: XGI Z7/Z9 (XG20 core) graphic chip requires master-of-seat to be set (bsc#1187154) + ef553e0199 sd-dhcp-client: tentatively ignore FORCERENEW command (bsc#1185972 CVE-2020-13529) + aae6c575fc sd-dhcp-client: logs when dhcp client unexpectedly gains a new lease + 258a3d2043 sd-dhcp-client: shorten code a bit + 0a80303114 sd-dhcp-client: check error earlier and reduce indentation + ------------------------------------------------------------------- Thu Jul 8 18:04:31 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 50b3bf24..6f2afebc 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.30.ge9a23d9e06 +%define suse_version +suse.45.g73e9e6fb84 %bcond_with gnuefi %if 0%{?bootstrap} @@ -58,7 +58,7 @@ Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 248.3 +Version: 248.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -195,13 +195,6 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. -Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch - -# Patches for bsc#1188063/CVE-2021-33910. They will be moved to the -# git repo once the bug will become public. -Patch1001: 1001-unit-name-generate-a-clear-error-code-when-convertin.patch -Patch1002: 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch -Patch1003: 1003-basic-unit-name-adjust-comments.patch %description Systemd is a system and service manager, compatible with SysV and LSB diff --git a/systemd-v248.3+suse.30.ge9a23d9e06.tar.xz b/systemd-v248.3+suse.30.ge9a23d9e06.tar.xz deleted file mode 100644 index 2bda2ab4..00000000 --- a/systemd-v248.3+suse.30.ge9a23d9e06.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb92dd21edf73541f3ccce6fb95ab6a2c3d261e14c95a77445cada2982913fdc -size 7080532 diff --git a/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz b/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz new file mode 100644 index 00000000..a72a623b --- /dev/null +++ b/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3750afd054f03b6868463ffd663441ead475d31dcd83d429c36580e7c6f748a +size 7123304 diff --git a/systemd.changes b/systemd.changes index 84cd5d49..6a0a7640 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,65 @@ +------------------------------------------------------------------- +Mon Jul 26 10:54:10 UTC 2021 - Franck Bui + +- Import commit 73e9e6fb847513c6d62f2fb445778ef5bc0fe516 (merge of v248.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/cb29bcc5ef2c0ee659686c5d229646a6ba98ec50...73e9e6fb847513c6d62f2fb445778ef5bc0fe516 + +------------------------------------------------------------------- +Tue Jul 20 16:26:39 UTC 2021 - Franck Bui + +- Drop 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch + + Commit 81107b8419c39f726fd2805517a5b9faab204e59 fixes + https://github.com/systemd/systemd/issues/19464 which makes the + aforementioned patch not needed anymore. + +------------------------------------------------------------------- +Tue Jul 20 16:22:46 UTC 2021 - Franck Bui + +- Drop 1003-basic-unit-name-adjust-comments.patch + + It's been merged in SUSE/v248 branch + +------------------------------------------------------------------- +Tue Jul 20 15:51:47 UTC 2021 - Franck Bui + +- Import commit cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 (merge of v248.5) + + 4a1c5f34bd basic/unit-name: do not use strdupa() on a path (bsc#1188063 CVE-2021-33910) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/94efce2ee59fca15a48ff9c232c8dd7cf930c0a0...cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 + +- Drop 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch as it + was merged in v248.5. + +------------------------------------------------------------------- +Tue Jul 20 15:25:38 UTC 2021 - Franck Bui + +- Import commit 94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 (merge of v248.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/c0aecee593511e49638579cb2b9ac8aaf1f8e6c8...94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 + +- Drop 1001-unit-name-generate-a-clear-error-code-when-convertin.patch + as it was merged in v248.4. + +------------------------------------------------------------------- +Tue Jul 20 15:10:41 UTC 2021 - Franck Bui + +- Import commit c0aecee593511e49638579cb2b9ac8aaf1f8e6c8 + + 42ec1d537a login: use a hwdb entry for tagging Parallels' fb devices with 'master-of-seat' tag + ecc7c7b462 login: use a hwdb entry for tagging HyperV's fb devices with 'master-of-seat' tag + a4cfd70476 login: XGI Z7/Z9 (XG20 core) graphic chip requires master-of-seat to be set (bsc#1187154) + ef553e0199 sd-dhcp-client: tentatively ignore FORCERENEW command (bsc#1185972 CVE-2020-13529) + aae6c575fc sd-dhcp-client: logs when dhcp client unexpectedly gains a new lease + 258a3d2043 sd-dhcp-client: shorten code a bit + 0a80303114 sd-dhcp-client: check error earlier and reduce indentation + ------------------------------------------------------------------- Thu Jul 8 18:04:31 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index dd5ca994..f20d2bcf 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.30.ge9a23d9e06 +%define suse_version +suse.45.g73e9e6fb84 %bcond_with gnuefi %if 0%{?bootstrap} @@ -56,7 +56,7 @@ Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 248.3 +Version: 248.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -193,13 +193,6 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. -Patch100: 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch - -# Patches for bsc#1188063/CVE-2021-33910. They will be moved to the -# git repo once the bug will become public. -Patch1001: 1001-unit-name-generate-a-clear-error-code-when-convertin.patch -Patch1002: 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch -Patch1003: 1003-basic-unit-name-adjust-comments.patch %description Systemd is a system and service manager, compatible with SysV and LSB From f419cd2fdd86ccacfaba1eef4d0e937fb8999bf3169c14fd80f171d86a8a639b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 4 Aug 2021 20:28:26 +0000 Subject: [PATCH 076/124] Accepting request 909721 from Base:System - Avoid the error message when udev is updated due to udev being already active when the sockets are started again (bsc#1188291) OBS-URL: https://build.opensuse.org/request/show/909721 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=334 --- systemd-mini.changes | 6 ++++++ systemd-mini.spec | 26 +++++++++++++++----------- systemd.changes | 6 ++++++ systemd.spec | 26 +++++++++++++++----------- 4 files changed, 42 insertions(+), 22 deletions(-) diff --git a/systemd-mini.changes b/systemd-mini.changes index 6a0a7640..25dbc3d6 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 29 13:12:48 UTC 2021 - Franck Bui + +- Avoid the error message when udev is updated due to udev being + already active when the sockets are started again (bsc#1188291) + ------------------------------------------------------------------- Mon Jul 26 10:54:10 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 6f2afebc..0f05b170 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -974,17 +974,21 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -systemctl daemon-reload || : -# On package update, restarting the socket units will probably fail as -# udevd is most likely running. Therefore systemctl will refuse to -# start them again once stopped. It's not an issue since we are mostly -# interested to make PID1 use the updated unit files once the socket -# units wil be started again. And that will happen when systemd-udevd -# itself will be restarted. -if [ $1 -ge 1 ]; then - systemctl try-restart systemd-udevd-{control,kernel}.socket 2>/dev/null || : - systemctl try-restart systemd-udevd.service || : -fi + +# The order of the units being restarted is important here because there's currently no +# way to queue multiple jobs into a single transaction atomically. Therefore systemctl +# will create 3 restart jobs that can be handled by PID1 separately and if the jobs for +# the sockets are being handled first then starting them again will fail as the service +# is still active hence the sockets held by udevd. However if the restart job for udevd +# is handled first, there should be enough time to queue the socket jobs before the stop +# job for udevd is processed. Hence PID1 will automatically sort the restart jobs +# correctly by stopping the service then the sockets and then by starting the sockets and +# the unit. +# +# Note that when systemd-udevd is restarted, there will always be a short time +# frame where no socket will be listening to the events sent by the kernel, no +# matter if the socket unit is restarted in first or not. +%service_del_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket %posttrans -n udev%{?mini} %regenerate_initrd_posttrans diff --git a/systemd.changes b/systemd.changes index 6a0a7640..25dbc3d6 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jul 29 13:12:48 UTC 2021 - Franck Bui + +- Avoid the error message when udev is updated due to udev being + already active when the sockets are started again (bsc#1188291) + ------------------------------------------------------------------- Mon Jul 26 10:54:10 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f20d2bcf..f55e9088 100644 --- a/systemd.spec +++ b/systemd.spec @@ -972,17 +972,21 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -systemctl daemon-reload || : -# On package update, restarting the socket units will probably fail as -# udevd is most likely running. Therefore systemctl will refuse to -# start them again once stopped. It's not an issue since we are mostly -# interested to make PID1 use the updated unit files once the socket -# units wil be started again. And that will happen when systemd-udevd -# itself will be restarted. -if [ $1 -ge 1 ]; then - systemctl try-restart systemd-udevd-{control,kernel}.socket 2>/dev/null || : - systemctl try-restart systemd-udevd.service || : -fi + +# The order of the units being restarted is important here because there's currently no +# way to queue multiple jobs into a single transaction atomically. Therefore systemctl +# will create 3 restart jobs that can be handled by PID1 separately and if the jobs for +# the sockets are being handled first then starting them again will fail as the service +# is still active hence the sockets held by udevd. However if the restart job for udevd +# is handled first, there should be enough time to queue the socket jobs before the stop +# job for udevd is processed. Hence PID1 will automatically sort the restart jobs +# correctly by stopping the service then the sockets and then by starting the sockets and +# the unit. +# +# Note that when systemd-udevd is restarted, there will always be a short time +# frame where no socket will be listening to the events sent by the kernel, no +# matter if the socket unit is restarted in first or not. +%service_del_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket %posttrans -n udev%{?mini} %regenerate_initrd_posttrans From f37ad015692a649be6c2983e6291958f61fcda4ead51c8e584e249b43c45c20b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 4 Sep 2021 20:33:46 +0000 Subject: [PATCH 077/124] Accepting request 915488 from Base:System - Configure split-usr=true only when %usrmerged is not defined - Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/7f23815a706cf2b2df3eac2eb2f8220736b8f427...40bda18e346ff45132ccd6f8f8e96de78dcf3470 - Rework the test (sub)package: - it's been renamed into 'systemd-testsuite' - it includes the extended tests too - the relevant commits have been backported to SUSE/v249 so no SUSE specific patch is needed to run the extended tests (see below) - the deps needed by the extended tests have been added - Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427 ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too 088fbb71d0 test: adapt install_pam() for openSUSE 4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE" ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static" 6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only 278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set 3bba2f876a test: add support for NO_BUILD=1 on openSUSE d77cbc1b64 test: make busybox TEST-13-only dependency - Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719) See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for details. - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch - Configure split-usr=true only when %usrmerged is not defined OBS-URL: https://build.opensuse.org/request/show/915488 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=335 --- ...conf-parser-introduce-early-drop-ins.patch | 18 ++-- ...and-var-lock-bind-mount-if-they-aren.patch | 8 +- ...ering-startup-for-etc-init.d-boot.lo.patch | 11 ++- ...-part-from-etc-hostname-when-setting.patch | 4 +- ...ult-symlinks-for-primary-cd_dvd-driv.patch | 4 +- ...dd-back-support-for-SysV-scripts-for.patch | 10 +- ...twork.service-an-alias-of-systemd-ne.patch | 8 +- ...ranslate-Required-Start-into-a-Wants.patch | 16 +-- ...ole-specificities-weirdness-for-s390.patch | 8 +- ...sion-keyring-per-system-sevice-entir.patch | 8 +- ...e-etc-resolv.conf-symlink-at-runtime.patch | 26 ++--- systemd-mini.changes | 45 +++++++++ systemd-mini.spec | 99 +++++++++++++++---- systemd-v248.6+suse.45.g73e9e6fb84.tar.xz | 3 - systemd-v249.4+suse.32.g40bda18e34.tar.xz | 3 + systemd.changes | 45 +++++++++ systemd.spec | 99 +++++++++++++++---- 17 files changed, 318 insertions(+), 97 deletions(-) delete mode 100644 systemd-v248.6+suse.45.g73e9e6fb84.tar.xz create mode 100644 systemd-v249.4+suse.32.g40bda18e34.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index 3331afdc..bf5a21d2 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,7 +1,7 @@ -From 0eb84d049c77dceeb48724770f89f0fa01557c87 Mon Sep 17 00:00:00 2001 +From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 -Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins +Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -66,10 +66,10 @@ Fixes: #2121 2 files changed, 195 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 9dfa190751..b5dee9cbb1 100644 +index d0ac1b2660..cb453fa50d 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -428,6 +428,7 @@ int config_parse( +@@ -430,6 +430,7 @@ int config_parse( static int config_parse_many_files( const char* const* conf_files, @@ -77,7 +77,7 @@ index 9dfa190751..b5dee9cbb1 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -440,6 +441,12 @@ static int config_parse_many_files( +@@ -442,6 +443,12 @@ static int config_parse_many_files( char **fn; int r; @@ -90,7 +90,7 @@ index 9dfa190751..b5dee9cbb1 100644 /* First read the first found main config file. */ STRV_FOREACH(fn, (char**) conf_files) { r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); -@@ -462,6 +469,28 @@ static int config_parse_many_files( +@@ -464,6 +471,28 @@ static int config_parse_many_files( return 0; } @@ -119,7 +119,7 @@ index 9dfa190751..b5dee9cbb1 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -473,15 +502,19 @@ int config_parse_many_nulstr( +@@ -475,15 +504,19 @@ int config_parse_many_nulstr( void *userdata, usec_t *ret_mtime) { @@ -142,7 +142,7 @@ index 9dfa190751..b5dee9cbb1 100644 ret_mtime); } -@@ -497,8 +530,8 @@ int config_parse_many( +@@ -499,8 +532,8 @@ int config_parse_many( void *userdata, usec_t *ret_mtime) { @@ -152,7 +152,7 @@ index 9dfa190751..b5dee9cbb1 100644 const char *suffix; int r; -@@ -511,7 +544,12 @@ int config_parse_many( +@@ -513,7 +546,12 @@ int config_parse_many( if (r < 0) return r; diff --git a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch index dfc696e1..8cdd1ce8 100644 --- a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch +++ b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch @@ -1,7 +1,7 @@ -From f98af900e625b15862f9173a5c55662d4cee7356 Mon Sep 17 00:00:00 2001 +From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 29 Oct 2012 13:01:20 +0000 -Subject: [PATCH 01/12] restore /var/run and /var/lock bind mount if they +Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they aren't symlink --- @@ -13,10 +13,10 @@ Subject: [PATCH 01/12] restore /var/run and /var/lock bind mount if they create mode 100644 units/var-run.mount diff --git a/units/meson.build b/units/meson.build -index 275daad3f4..dadc9432ef 100644 +index 17e9ead9c1..7b926f9f91 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -150,6 +150,8 @@ units = [ +@@ -160,6 +160,8 @@ units = [ ['umount.target', ''], ['usb-gadget.target', ''], ['user.slice', ''], diff --git a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch index 1e278fda..47bb74af 100644 --- a/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch +++ b/0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch @@ -1,7 +1,8 @@ -From 47563b617a371680d1ec3729fa4324310ebe3710 Mon Sep 17 00:00:00 2001 +From ddf3a821b51fbd3064914eb00a03bbecce9ee361 Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Tue, 25 Mar 2014 13:08:56 +0000 -Subject: [PATCH 1/1] rc-local: fix ordering startup for /etc/init.d/boot.local +Subject: [PATCH 03/11] rc-local: fix ordering startup for + /etc/init.d/boot.local [tblume: fixes bnc#869142] --- @@ -9,13 +10,13 @@ Subject: [PATCH 1/1] rc-local: fix ordering startup for /etc/init.d/boot.local 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/units/rc-local.service.in b/units/rc-local.service.in -index d4aaaf09d4..5cd1571cc7 100644 +index 55e83dfe00..8b20f8d1af 100644 --- a/units/rc-local.service.in +++ b/units/rc-local.service.in @@ -13,7 +13,7 @@ - Description=@RC_LOCAL_PATH@ Compatibility + Description={{RC_LOCAL_PATH}} Compatibility Documentation=man:systemd-rc-local-generator(8) - ConditionFileIsExecutable=@RC_LOCAL_PATH@ + ConditionFileIsExecutable={{RC_LOCAL_PATH}} -After=network.target +After=basic.target diff --git a/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch index 74e3790e..f7d958c4 100644 --- a/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch +++ b/0003-strip-the-domain-part-from-etc-hostname-when-setting.patch @@ -1,7 +1,7 @@ -From 54366ae306ae19bdb2a5af7eb5158260cdc37e8f Mon Sep 17 00:00:00 2001 +From c6ed74889adade0287ee609150611544d8d5c6d2 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Tue, 28 May 2013 15:17:35 +0200 -Subject: [PATCH 1/1] strip the domain part from /etc/hostname when setting +Subject: [PATCH 04/11] strip the domain part from /etc/hostname when setting system host name [fbui: fixes bnc#820213] diff --git a/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch b/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch index b37a8acc..c8b7f70a 100644 --- a/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch +++ b/0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch @@ -1,7 +1,7 @@ -From 8e95d5534e9a577529ac49aaec610e6ceefec0b9 Mon Sep 17 00:00:00 2001 +From ae4741127dc0ae575d13b8a7b201207da6167517 Mon Sep 17 00:00:00 2001 From: Robert Milasan Date: Sat, 12 Jul 2014 14:20:36 +0200 -Subject: [PATCH 05/12] udev: create default symlinks for primary cd_dvd drive +Subject: [PATCH 05/11] udev: create default symlinks for primary cd_dvd drive Imported from SLE12-SP1, commit 4f8bacfbffd7049608b5076. diff --git a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch index fdf44437..11737094 100644 --- a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch +++ b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch @@ -1,7 +1,7 @@ -From ac7bfed30245145ce68a037e7578da12ce2de009 Mon Sep 17 00:00:00 2001 +From 1bd48f23ea7750b354bfb94482f9f035bf8b7841 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 26 May 2016 08:59:41 +0200 -Subject: [PATCH 1/1] sysv-generator: add (back) support for SysV scripts for +Subject: [PATCH 06/11] sysv-generator: add (back) support for SysV scripts for the early boot For the record, the upstream support was removed by commit @@ -43,7 +43,7 @@ the same time as 'normal' services. 1 file changed, 23 insertions(+) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 8c7aef23c3..f88f9119fb 100644 +index bf23c48662..fa5355c964 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c @@ -31,6 +31,9 @@ static const struct { @@ -100,7 +100,7 @@ index 8c7aef23c3..f88f9119fb 100644 /* Strip ".sh" suffix from file name for comparison */ filename_no_sh = strdupa(filename); e = endswith(filename_no_sh, ".sh"); -@@ -674,6 +693,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { +@@ -651,6 +670,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { if (other->sysv_start_priority < 0) continue; @@ -110,7 +110,7 @@ index 8c7aef23c3..f88f9119fb 100644 /* If both units have modern headers we don't care * about the priorities */ if (s->has_lsb && other->has_lsb) -@@ -798,6 +820,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { +@@ -775,6 +797,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { .sysv_start_priority = -1, .name = TAKE_PTR(name), .path = TAKE_PTR(fpath), diff --git a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch index c4fd62e1..cb8f69a8 100644 --- a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +++ b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -1,7 +1,7 @@ -From 0adc3f402aeeadd73a0977ca6a1bc65d3d4201c1 Mon Sep 17 00:00:00 2001 +From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001 From: Pawel Wieczorkiewicz Date: Tue, 2 Jun 2015 13:33:24 +0000 -Subject: [PATCH 07/12] networkd: make network.service an alias of +Subject: [PATCH 07/11] networkd: make network.service an alias of systemd-networkd.service NetworkManager and wicked does this already. This is needed by yast2 @@ -13,10 +13,10 @@ and other parts of the system. 1 file changed, 1 insertion(+) diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in -index 2673146841..083a35b912 100644 +index ffa45ba049..6a5d0dea3c 100644 --- a/units/systemd-networkd.service.in +++ b/units/systemd-networkd.service.in -@@ -50,6 +50,7 @@ User=systemd-network +@@ -53,6 +53,7 @@ User=systemd-network [Install] WantedBy=multi-user.target diff --git a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch index d21fea50..55b44930 100644 --- a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +++ b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch @@ -1,7 +1,7 @@ -From a32292849ca2837f99d6801da26b8d8e401831c4 Mon Sep 17 00:00:00 2001 +From 7f59f7b1b506c1394712ad3d6bab81318052a14c Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Wed, 4 May 2016 17:40:04 +0200 -Subject: [PATCH 08/12] sysv-generator: translate "Required-Start" into a +Subject: [PATCH 08/11] sysv-generator: translate "Required-Start" into a "Wants" dependency [tblume: Port of SLES12SP1 patch 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch] @@ -17,10 +17,10 @@ Subject: [PATCH 08/12] sysv-generator: translate "Required-Start" into a 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index 1c01008967..7a58be9287 100644 +index fa5355c964..62755f3652 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c -@@ -258,6 +258,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, +@@ -257,6 +257,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, "remote_fs", SPECIAL_REMOTE_FS_TARGET, "syslog", NULL, "time", SPECIAL_TIME_SYNC_TARGET, @@ -28,7 +28,7 @@ index 1c01008967..7a58be9287 100644 }; const char *filename; -@@ -272,6 +273,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, +@@ -271,6 +272,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, filename = basename(s->path); @@ -36,7 +36,7 @@ index 1c01008967..7a58be9287 100644 n = *name == '$' ? name + 1 : name; for (i = 0; i < ELEMENTSOF(table); i += 2) { -@@ -408,7 +410,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -407,7 +409,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text for (;;) { _cleanup_free_ char *word = NULL, *m = NULL; @@ -45,7 +45,7 @@ index 1c01008967..7a58be9287 100644 r = extract_first_word(&text, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RELAX); if (r < 0) -@@ -421,6 +423,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -420,6 +422,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text continue; is_before = startswith_no_case(full_text, "X-Start-Before:"); @@ -53,7 +53,7 @@ index 1c01008967..7a58be9287 100644 if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET) && !is_before) { /* the network-online target is special, as it needs to be actively pulled in */ -@@ -429,8 +432,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -428,8 +431,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text return log_oom(); r = strv_extend(&s->wants, m); diff --git a/0009-pid1-handle-console-specificities-weirdness-for-s390.patch b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch index e4984478..6124095d 100644 --- a/0009-pid1-handle-console-specificities-weirdness-for-s390.patch +++ b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch @@ -1,7 +1,7 @@ -From 7fc80ccccaa6f7b98af8bcd899a97d561777ff94 Mon Sep 17 00:00:00 2001 +From dedd52f920cf7ae718bb31ac7286d3f7314540c6 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 10 Jun 2016 15:19:57 +0200 -Subject: [PATCH 09/12] pid1: handle console specificities/weirdness for s390 +Subject: [PATCH 09/11] pid1: handle console specificities/weirdness for s390 arch The 3270 console on S/390 can do color but not the 3215 console. @@ -30,10 +30,10 @@ whose $subject is "[PATCH] support conmode setting on command line". 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c -index 6cacde90ba..1a03902acc 100644 +index d769423d6e..1a65391146 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c -@@ -780,7 +780,20 @@ bool tty_is_vc_resolve(const char *tty) { +@@ -779,7 +779,20 @@ bool tty_is_vc_resolve(const char *tty) { } const char *default_term_for_tty(const char *tty) { diff --git a/0011-core-disable-session-keyring-per-system-sevice-entir.patch b/0011-core-disable-session-keyring-per-system-sevice-entir.patch index a3e1fac1..9d5bad80 100644 --- a/0011-core-disable-session-keyring-per-system-sevice-entir.patch +++ b/0011-core-disable-session-keyring-per-system-sevice-entir.patch @@ -1,7 +1,7 @@ -From e5b3d1d00bbdbcb168889699c462bf01b58062a5 Mon Sep 17 00:00:00 2001 +From 67f3fa5aa2781d42c809da9303f81b28544824d8 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 6 Jul 2017 15:48:10 +0200 -Subject: [PATCH 11/12] core: disable session keyring per system sevice +Subject: [PATCH 10/11] core: disable session keyring per system sevice entirely for now Until PAM module "pam_keyinit" is fully integrated in SUSE's PAM stack, this @@ -27,10 +27,10 @@ https://github.com/systemd/systemd/pull/6286 1 file changed, 3 insertions(+) diff --git a/src/core/execute.c b/src/core/execute.c -index 2a4840a3a9..aefd4eaff1 100644 +index 2a337b55a2..b5a1a3b6e5 100644 --- a/src/core/execute.c +++ b/src/core/execute.c -@@ -2779,6 +2779,9 @@ static int setup_keyring( +@@ -3356,6 +3356,9 @@ static int setup_keyring( assert(context); assert(p); diff --git a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch index a687aaa0..510c4732 100644 --- a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -1,7 +1,7 @@ -From 90d84a96aca84b39f6aabda048703dc7c0e79ef4 Mon Sep 17 00:00:00 2001 +From 1aa6cfc7ff05929f013262c86ab7557e5394fb4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH 12/12] resolved: create /etc/resolv.conf symlink at runtime +Subject: [PATCH 11/11] resolved: create /etc/resolv.conf symlink at runtime If the symlink doesn't exists, and we are being started, let's create it to provie name resolution. @@ -14,11 +14,11 @@ don't touch it in that case either. https://bugzilla.redhat.com/show_bug.cgi?id=1313085 --- src/resolve/resolved.c | 6 ++++++ - tmpfiles.d/etc.conf.m4 | 3 --- + tmpfiles.d/etc.conf.in | 3 --- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index 16477f28d6..3922804039 100644 +index aabaa266e9..39277ea487 100644 --- a/src/resolve/resolved.c +++ b/src/resolve/resolved.c @@ -53,6 +53,12 @@ static int run(int argc, char *argv[]) { @@ -34,19 +34,19 @@ index 16477f28d6..3922804039 100644 /* As we're root, we can create the directory where resolv.conf will live */ r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid, MKDIR_WARN_MODE); if (r < 0) -diff --git a/tmpfiles.d/etc.conf.m4 b/tmpfiles.d/etc.conf.m4 -index f82e0b82ce..66a777bdb2 100644 ---- a/tmpfiles.d/etc.conf.m4 -+++ b/tmpfiles.d/etc.conf.m4 +diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in +index 2323fd8cd8..ebdc699c26 100644 +--- a/tmpfiles.d/etc.conf.in ++++ b/tmpfiles.d/etc.conf.in @@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - m4_ifdef(`HAVE_SMACK_RUN_LABEL', + {% if HAVE_SMACK_RUN_LABEL %} t /etc/mtab - - - - security.SMACK64=_ - )m4_dnl --m4_ifdef(`ENABLE_RESOLVE', + {% endif %} +-{% if ENABLE_RESOLVE %} -L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --)m4_dnl +-{% endif %} C! /etc/nsswitch.conf - - - - - m4_ifdef(`HAVE_PAM', + {% if HAVE_PAM %} C! /etc/pam.d - - - - -- 2.26.2 diff --git a/systemd-mini.changes b/systemd-mini.changes index 25dbc3d6..a93d76e2 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Wed Sep 1 11:54:23 UTC 2021 - Franck Bui + +- Configure split-usr=true only when %usrmerged is not defined + +------------------------------------------------------------------- +Wed Sep 1 09:56:55 UTC 2021 - Franck Bui + +- Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/7f23815a706cf2b2df3eac2eb2f8220736b8f427...40bda18e346ff45132ccd6f8f8e96de78dcf3470 + +------------------------------------------------------------------- +Mon Aug 23 15:12:10 UTC 2021 - Franck Bui + +- Rework the test (sub)package: + - it's been renamed into 'systemd-testsuite' + - it includes the extended tests too + - the relevant commits have been backported to SUSE/v249 so no SUSE + specific patch is needed to run the extended tests (see below) + - the deps needed by the extended tests have been added + +- Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427 + + ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too + 088fbb71d0 test: adapt install_pam() for openSUSE + 4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE" + ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static" + 6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only + 278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set + 3bba2f876a test: add support for NO_BUILD=1 on openSUSE + d77cbc1b64 test: make busybox TEST-13-only dependency + +------------------------------------------------------------------- +Mon Aug 2 12:54:44 UTC 2021 - Franck Bui + +- Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719) + + See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for + details. + + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch + 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + ------------------------------------------------------------------- Thu Jul 29 13:12:48 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 0f05b170..1112b547 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,8 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.45.g73e9e6fb84 +%define suse_version +suse.32.g40bda18e34 +%define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi %if 0%{?bootstrap} @@ -39,7 +40,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental -%bcond_with tests +%bcond_with testsuite %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -53,12 +54,12 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental -%bcond_without tests +%bcond_without testsuite %endif Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 248.6 +Version: 249.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -98,6 +99,7 @@ BuildRequires: libmount-devel >= 2.27.1 BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel +BuildRequires: python3-jinja2 # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 @@ -487,22 +489,77 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif -%if %{with tests} -%package tests -Summary: Unit tests for systemd +%if %{with testsuite} +%package testsuite +Summary: Testsuite for systemd +# Unit tests dependencies License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama # Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) Recommends: dosfstools +# The following deps on libs are for test-dlopen-so whereas the +# pkgconfig ones are used by test-funtions to find the libs on the +# host and install them in the image, see install_missing_libraries() +# for details. +%if %{with resolved} +Requires: libidn2 pkgconfig(libidn2) +%endif +%if %{with experimental} +Requires: libpwquality1 pkgconfig(pwquality) +Requires: libqrencode4 pkgconfig(libqrencode) +%endif +Requires: %{name} = %{version}-%{release} +Requires: attr +Requires: busybox-static +Requires: cryptsetup +Requires: dhcp-client +Requires: dosfstools +Requires: libcap-progs +Requires: lz4 +Requires: net-tools-deprecated +Requires: qemu-kvm +Requires: quota +Requires: socat +Requires: squashfs +Requires: systemd-container +Requires: libfido2 pkgconfig(libfido2) +Requires: libtss2-esys0 pkgconfig(tss2-esys) +Requires: libtss2-mu0 pkgconfig(tss2-mu) +Requires: libtss2-rc0 pkgconfig(tss2-rc) +%if %{with coredump} +Requires: systemd-coredump +%endif +%if %{with experimental} +Requires: systemd-experimental +%endif +%if %{with journal_remote} +Requires: systemd-journal-remote +%endif +%if %{with portabled} +Requires: systemd-portable +%endif +Requires: xz -%description tests -This package contains the unit tests used to check various internal -functions used by systemd and all its components. +%description testsuite +This package contains the unit tests as well as the extended +testsuite. The unit tests are used to check various internal functions +used by systemd whereas the extended testsuite is used to test various +functionalities of systemd and all its components. -The python script /usr/lib/systemd/tests/run-unit-tests.py can be used -to run all unit tests at once. +Note that the extended testsuite only works with UID=0. + +Run the following python script to run all unit tests at once: +$ %{_testsuitedir}/run-unit-tests.py + +To run the full extended testsuite do the following: +$ NO_BUILD=1 %{_testsuitedir}/test/run-integration-tests.sh + +Or to run one specific integration test: +$ NO_BUILD=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run + +For more details on the available options to run the extended +testsuite, please refer to %{_testsuitedir}/test/README.testsuite. %endif %if %{with experimental} @@ -558,7 +615,9 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ +%if !0%{?usrmerged} -Dsplit-usr=true \ +%endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ @@ -625,7 +684,7 @@ Have fun with these services at your own risk. -Dsysvinit-path= \ -Dsysvrcnd-path= \ %endif -%if %{with tests} +%if %{with testsuite} -Dtests=unsafe \ -Dinstall-tests=true \ %else @@ -837,6 +896,10 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket +%if %{with testsuite} +cp -a test %{buildroot}%{_testsuitedir}/ +%endif + %if ! 0%{?bootstrap} %find_lang systemd %endif @@ -1759,9 +1822,11 @@ fi %{_mandir}/man*/systemd-portabled* %endif -%if %{with tests} -%files tests -%{_prefix}/lib/systemd/tests +%if %{with testsuite} +%files testsuite +%defattr(-,root,root) +%{_testsuitedir} +%doc %{_testsuitedir}/test/README.testsuite %endif %if %{with experimental} diff --git a/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz b/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz deleted file mode 100644 index a72a623b..00000000 --- a/systemd-v248.6+suse.45.g73e9e6fb84.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f3750afd054f03b6868463ffd663441ead475d31dcd83d429c36580e7c6f748a -size 7123304 diff --git a/systemd-v249.4+suse.32.g40bda18e34.tar.xz b/systemd-v249.4+suse.32.g40bda18e34.tar.xz new file mode 100644 index 00000000..d130d483 --- /dev/null +++ b/systemd-v249.4+suse.32.g40bda18e34.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fddc0b0846c692af8bae3673728a0d95bfdcc448846c218e850b6b93e5493c2a +size 7265384 diff --git a/systemd.changes b/systemd.changes index 25dbc3d6..a93d76e2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,48 @@ +------------------------------------------------------------------- +Wed Sep 1 11:54:23 UTC 2021 - Franck Bui + +- Configure split-usr=true only when %usrmerged is not defined + +------------------------------------------------------------------- +Wed Sep 1 09:56:55 UTC 2021 - Franck Bui + +- Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/7f23815a706cf2b2df3eac2eb2f8220736b8f427...40bda18e346ff45132ccd6f8f8e96de78dcf3470 + +------------------------------------------------------------------- +Mon Aug 23 15:12:10 UTC 2021 - Franck Bui + +- Rework the test (sub)package: + - it's been renamed into 'systemd-testsuite' + - it includes the extended tests too + - the relevant commits have been backported to SUSE/v249 so no SUSE + specific patch is needed to run the extended tests (see below) + - the deps needed by the extended tests have been added + +- Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427 + + ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too + 088fbb71d0 test: adapt install_pam() for openSUSE + 4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE" + ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static" + 6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only + 278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set + 3bba2f876a test: add support for NO_BUILD=1 on openSUSE + d77cbc1b64 test: make busybox TEST-13-only dependency + +------------------------------------------------------------------- +Mon Aug 2 12:54:44 UTC 2021 - Franck Bui + +- Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719) + + See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for + details. + + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch + 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch + ------------------------------------------------------------------- Thu Jul 29 13:12:48 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f55e9088..af809ac7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,8 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.45.g73e9e6fb84 +%define suse_version +suse.32.g40bda18e34 +%define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi %if 0%{?bootstrap} @@ -37,7 +38,7 @@ %bcond_with resolved %bcond_with sysvcompat %bcond_with experimental -%bcond_with tests +%bcond_with testsuite %else %bcond_without coredump %ifarch %{ix86} x86_64 @@ -51,12 +52,12 @@ %bcond_without resolved %bcond_without sysvcompat %bcond_without experimental -%bcond_without tests +%bcond_without testsuite %endif Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 248.6 +Version: 249.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -96,6 +97,7 @@ BuildRequires: libmount-devel >= 2.27.1 BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel +BuildRequires: python3-jinja2 # regenerate_initrd_post macro is expanded during build, hence this # BR. Also this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 @@ -485,22 +487,77 @@ This package contains systemd-journal-gatewayd, systemd-journal-remote, and systemd-journal-upload. %endif -%if %{with tests} -%package tests -Summary: Unit tests for systemd +%if %{with testsuite} +%package testsuite +Summary: Testsuite for systemd +# Unit tests dependencies License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} Recommends: python3 Recommends: python3-colorama # Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) Recommends: dosfstools +# The following deps on libs are for test-dlopen-so whereas the +# pkgconfig ones are used by test-funtions to find the libs on the +# host and install them in the image, see install_missing_libraries() +# for details. +%if %{with resolved} +Requires: libidn2 pkgconfig(libidn2) +%endif +%if %{with experimental} +Requires: libpwquality1 pkgconfig(pwquality) +Requires: libqrencode4 pkgconfig(libqrencode) +%endif +Requires: %{name} = %{version}-%{release} +Requires: attr +Requires: busybox-static +Requires: cryptsetup +Requires: dhcp-client +Requires: dosfstools +Requires: libcap-progs +Requires: lz4 +Requires: net-tools-deprecated +Requires: qemu-kvm +Requires: quota +Requires: socat +Requires: squashfs +Requires: systemd-container +Requires: libfido2 pkgconfig(libfido2) +Requires: libtss2-esys0 pkgconfig(tss2-esys) +Requires: libtss2-mu0 pkgconfig(tss2-mu) +Requires: libtss2-rc0 pkgconfig(tss2-rc) +%if %{with coredump} +Requires: systemd-coredump +%endif +%if %{with experimental} +Requires: systemd-experimental +%endif +%if %{with journal_remote} +Requires: systemd-journal-remote +%endif +%if %{with portabled} +Requires: systemd-portable +%endif +Requires: xz -%description tests -This package contains the unit tests used to check various internal -functions used by systemd and all its components. +%description testsuite +This package contains the unit tests as well as the extended +testsuite. The unit tests are used to check various internal functions +used by systemd whereas the extended testsuite is used to test various +functionalities of systemd and all its components. -The python script /usr/lib/systemd/tests/run-unit-tests.py can be used -to run all unit tests at once. +Note that the extended testsuite only works with UID=0. + +Run the following python script to run all unit tests at once: +$ %{_testsuitedir}/run-unit-tests.py + +To run the full extended testsuite do the following: +$ NO_BUILD=1 %{_testsuitedir}/test/run-integration-tests.sh + +Or to run one specific integration test: +$ NO_BUILD=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run + +For more details on the available options to run the extended +testsuite, please refer to %{_testsuitedir}/test/README.testsuite. %endif %if %{with experimental} @@ -556,7 +613,9 @@ Have fun with these services at your own risk. -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ -Drootprefix=/usr \ +%if !0%{?usrmerged} -Dsplit-usr=true \ +%endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ @@ -623,7 +682,7 @@ Have fun with these services at your own risk. -Dsysvinit-path= \ -Dsysvrcnd-path= \ %endif -%if %{with tests} +%if %{with testsuite} -Dtests=unsafe \ -Dinstall-tests=true \ %else @@ -835,6 +894,10 @@ cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket +%if %{with testsuite} +cp -a test %{buildroot}%{_testsuitedir}/ +%endif + %if ! 0%{?bootstrap} %find_lang systemd %endif @@ -1757,9 +1820,11 @@ fi %{_mandir}/man*/systemd-portabled* %endif -%if %{with tests} -%files tests -%{_prefix}/lib/systemd/tests +%if %{with testsuite} +%files testsuite +%defattr(-,root,root) +%{_testsuitedir} +%doc %{_testsuitedir}/test/README.testsuite %endif %if %{with experimental} From a923caa084aab5203f67e8858292d8f170ae93f2419c35dd30736da279d58dbd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 11 Sep 2021 20:24:21 +0000 Subject: [PATCH 078/124] Accepting request 917666 from Base:System - Don't reexecute user manager instances on package update yet This can't be done until users have their user instance updated to the new version that supports reexecuting with SIGRTMIN+25 because this signal terminates the user managers for the previous versions. - Import commit ec72db9ee0f8ce061f83624d7148ff38a5993b11 3b1aa2f79f manager: reexecute on SIGRTMIN+25, user instances only fd46c81922 test: make sure to include all haveged unit files - systemd.spec: reexec user manager instances on package updates - Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) - Drop dependency on m4 (replaced by Jinja2) OBS-URL: https://build.opensuse.org/request/show/917666 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=336 --- systemd-mini.changes | 29 +++++++++++++++++++++++ systemd-mini.spec | 28 +++++++++++++++++----- systemd-v249.4+suse.32.g40bda18e34.tar.xz | 3 --- systemd-v249.4+suse.35.gec72db9ee0.tar.xz | 3 +++ systemd.changes | 29 +++++++++++++++++++++++ systemd.spec | 28 +++++++++++++++++----- 6 files changed, 105 insertions(+), 15 deletions(-) delete mode 100644 systemd-v249.4+suse.32.g40bda18e34.tar.xz create mode 100644 systemd-v249.4+suse.35.gec72db9ee0.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index a93d76e2..d28a872f 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Sep 8 17:01:58 UTC 2021 - Franck Bui + +- Don't reexecute user manager instances on package update yet + + This can't be done until users have their user instance updated to + the new version that supports reexecuting with SIGRTMIN+25 because + this signal terminates the user managers for the previous versions. + +------------------------------------------------------------------- +Wed Sep 8 13:21:34 UTC 2021 - Franck Bui + +- Import commit ec72db9ee0f8ce061f83624d7148ff38a5993b11 + + 3b1aa2f79f manager: reexecute on SIGRTMIN+25, user instances only + fd46c81922 test: make sure to include all haveged unit files + +- systemd.spec: reexec user manager instances on package updates + +------------------------------------------------------------------- +Fri Sep 3 09:38:23 UTC 2021 - Franck Bui + +- Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) + +------------------------------------------------------------------- +Thu Sep 2 10:01:23 UTC 2021 - Franck Bui + +- Drop dependency on m4 (replaced by Jinja2) + ------------------------------------------------------------------- Wed Sep 1 11:54:23 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index 1112b547..2de1c70e 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.32.g40bda18e34 +%define suse_version +suse.35.gec72db9ee0 %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi @@ -96,7 +96,6 @@ BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel BuildRequires: python3-jinja2 @@ -277,13 +276,14 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: %{name} = %{version}-%{release} +%systemd_requires Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -369,12 +369,12 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved -%systemd_requires %description network Systemd tools to manage network settings using networkd and @@ -567,6 +567,7 @@ testsuite, please refer to %{_testsuitedir}/test/README.testsuite. Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2 Recommends: libpwquality1 @@ -578,7 +579,6 @@ BuildRequires: pkgconfig(pwquality) # fdisk and openssl are build requirements for home stuff and repart BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(openssl) -%systemd_requires %description experimental This package contains optional extra services that are considered as @@ -941,7 +941,23 @@ pam-config --add --systemd || : [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : -systemctl daemon-reexec || : +systemctl daemon-reexec || : + +# Reexecute user manager instances (if any). It is asynchronous but it +# shouldn't be a problem in practice: a problem would arise only if +# the new version of a user service has a brand new option that is +# only understood by the latest version of the user manager and the +# user service is started before the user manager get reexecuted. But +# this case is very unlikely especially since we don't restart any +# user service for now on. +# +# Before doing this, we unfortunately have to wait until users will +# reexec their user manager (by either rebooting or restarting their +# session) to a version that supports SIGRTMIN+25 otherwise sending +# the signal to an old version will kill the manager which means +# tearing down the user session. +# +# systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : %journal_catalog_update %tmpfiles_create diff --git a/systemd-v249.4+suse.32.g40bda18e34.tar.xz b/systemd-v249.4+suse.32.g40bda18e34.tar.xz deleted file mode 100644 index d130d483..00000000 --- a/systemd-v249.4+suse.32.g40bda18e34.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fddc0b0846c692af8bae3673728a0d95bfdcc448846c218e850b6b93e5493c2a -size 7265384 diff --git a/systemd-v249.4+suse.35.gec72db9ee0.tar.xz b/systemd-v249.4+suse.35.gec72db9ee0.tar.xz new file mode 100644 index 00000000..d8ceb7cf --- /dev/null +++ b/systemd-v249.4+suse.35.gec72db9ee0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d581f2ec411b41826c395147fe9a040b0e916de7fdeeaae0681f43be8b92bb82 +size 7266280 diff --git a/systemd.changes b/systemd.changes index a93d76e2..d28a872f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Wed Sep 8 17:01:58 UTC 2021 - Franck Bui + +- Don't reexecute user manager instances on package update yet + + This can't be done until users have their user instance updated to + the new version that supports reexecuting with SIGRTMIN+25 because + this signal terminates the user managers for the previous versions. + +------------------------------------------------------------------- +Wed Sep 8 13:21:34 UTC 2021 - Franck Bui + +- Import commit ec72db9ee0f8ce061f83624d7148ff38a5993b11 + + 3b1aa2f79f manager: reexecute on SIGRTMIN+25, user instances only + fd46c81922 test: make sure to include all haveged unit files + +- systemd.spec: reexec user manager instances on package updates + +------------------------------------------------------------------- +Fri Sep 3 09:38:23 UTC 2021 - Franck Bui + +- Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) + +------------------------------------------------------------------- +Thu Sep 2 10:01:23 UTC 2021 - Franck Bui + +- Drop dependency on m4 (replaced by Jinja2) + ------------------------------------------------------------------- Wed Sep 1 11:54:23 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index af809ac7..336ac697 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.32.g40bda18e34 +%define suse_version +suse.35.gec72db9ee0 %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi @@ -94,7 +94,6 @@ BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: m4 BuildRequires: meson >= 0.43 BuildRequires: pam-devel BuildRequires: python3-jinja2 @@ -275,13 +274,14 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +Requires: %{name} = %{version}-%{release} +%systemd_requires Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun): coreutils -%systemd_requires Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 @@ -367,12 +367,12 @@ and systemd-importd. Summary: Systemd tools for networkd and resolved License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved -%systemd_requires %description network Systemd tools to manage network settings using networkd and @@ -565,6 +565,7 @@ testsuite, please refer to %{_testsuitedir}/test/README.testsuite. Summary: Experimental systemd features License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} +%systemd_requires # These Recommends because some symbols of these libs are dlopen()ed by home stuff Recommends: libfido2 Recommends: libpwquality1 @@ -576,7 +577,6 @@ BuildRequires: pkgconfig(pwquality) # fdisk and openssl are build requirements for home stuff and repart BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(openssl) -%systemd_requires %description experimental This package contains optional extra services that are considered as @@ -939,7 +939,23 @@ pam-config --add --systemd || : [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : -systemctl daemon-reexec || : +systemctl daemon-reexec || : + +# Reexecute user manager instances (if any). It is asynchronous but it +# shouldn't be a problem in practice: a problem would arise only if +# the new version of a user service has a brand new option that is +# only understood by the latest version of the user manager and the +# user service is started before the user manager get reexecuted. But +# this case is very unlikely especially since we don't restart any +# user service for now on. +# +# Before doing this, we unfortunately have to wait until users will +# reexec their user manager (by either rebooting or restarting their +# session) to a version that supports SIGRTMIN+25 otherwise sending +# the signal to an old version will kill the manager which means +# tearing down the user session. +# +# systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : %journal_catalog_update %tmpfiles_create From 2d3de572ba27907f39a1b4ba451f28ac734373824ed93c647036ef9b731c5802 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 4 Oct 2021 16:39:17 +0000 Subject: [PATCH 079/124] Accepting request 922217 from Base:System - Work around rpmlint complaining about /var/log/journal shipped with setgid bit This setgid bit has been already reviewed in the past and wasn't a concern. However we want the mode/ownership adjusted by tmpfiles and avoid the duplication of these info in rpm. - Don't ghost own any directories created dynamically by tmpfiles Again rpmlint complains but it doesn't seem to make sense to try to track all paths (including theirs perms, ownerships...) created dynamically. And 'rpm -V' is likely to report issues later with these paths anyway. This effectively partially reverts the two previous commits. - Make sure the build process won't create /var/log/journal - /var/log/journal/remote is owned by systemd-journal-remote - systemd.spec: fix a bunch of rpmlint errors/warnings - Drop systemd-logger This sub package was introduced in order to configure persistent journal and also to make sure that another syslog provider (such as rsyslog) couldn't be installed at the same time: each syslog provider conflicts with each others. However this mechanism didn't work since uninstalling systemd-logger wasn't magically turning off persistent logging because /var/log/journal is likely to be populated hence not removed. Moreover using a subpackage to configure the mode of journald was overkill and the usual ways (main conf file or drop-ins) should be preferred. - Import commit 7a5801342fe2f53e5c2a8578d6db132c0eca2d97 8d65ec4a66 test: wc is needed by test/units/testsuite-50.sh OBS-URL: https://build.opensuse.org/request/show/922217 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=337 --- systemd-mini-rpmlintrc | 31 ++------ systemd-mini.changes | 88 ++++++++++++++++++++++- systemd-mini.spec | 68 ++++++------------ systemd-rpmlintrc | 31 ++------ systemd-v249.4+suse.35.gec72db9ee0.tar.xz | 3 - systemd-v249.4+suse.39.g7a5801342f.tar.xz | 3 + systemd.changes | 88 ++++++++++++++++++++++- systemd.spec | 68 ++++++------------ 8 files changed, 233 insertions(+), 147 deletions(-) delete mode 100644 systemd-v249.4+suse.35.gec72db9ee0.tar.xz create mode 100644 systemd-v249.4+suse.39.g7a5801342f.tar.xz diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc index 9bc3777f..86edf488 100644 --- a/systemd-mini-rpmlintrc +++ b/systemd-mini-rpmlintrc @@ -1,32 +1,11 @@ -addFilter("invalid-pkgconfig-file") -addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") -addFilter(".*dangling-symlink .* /dev/null.*") -addFilter(".*files-duplicate .*/reboot\.8.*") -addFilter(".*files-duplicate .*/sd_is_socket\.3.*") -addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion\.sh") -addFilter("non-conffile-in-etc /etc/rpm/macros\.systemd") +addFilter(".*filelist-forbidden-systemd-userdirs /etc/systemd/.*\.conf") addFilter(".*dbus-policy-allow-receive") -addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*") -addFilter(".*dangling-symlink /lib/udev/devices/core.*") -addFilter(".*dangling-symlink /lib/udev/devices/fd.*") -addFilter(".*incoherent-init-script-name boot\.udev.*") -addFilter(".init-script-without-%stop_on_removal-preun /etc/init\.d/boot\.udev") -addFilter(".init-script-without-%restart_on_update-postun /etc/init\.d/boot\.udev") addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") -addFilter(".*libgudev-.*shlib-fixed-dependency.*") -addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") -addFilter("libudev-mini.*shlib-policy-name-error.*") -addFilter("nss-systemd.*shlib-policy-name-error.*") -addFilter("nss-myhostname.*shlib-policy-name-error.*") -addFilter("nss-mymachines.*shlib-policy-name-error.*") -addFilter("nss-resolve.*shlib-policy-name-error.*") -addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") -addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") -addFilter(".*files-duplicate.*/systemd-logger.*") addFilter(".*missing-call-to-setgroups-before-setuid.*") -addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") -addFilter(".*shlib-policy-missing-suffix.*") -addFilter(".*suse-missing-rclink.*") addFilter("env-script-interpreter") +addFilter(".*files-duplicate /usr/lib/systemd/.*") +addFilter(".*files-duplicated-waste.*") +addFilter(".*explicit-lib-dependency .*") +addFilter(".*tmpfile-not-in-filelist .*") diff --git a/systemd-mini.changes b/systemd-mini.changes index d28a872f..49998b05 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,80 @@ +------------------------------------------------------------------- +Wed Sep 29 10:04:38 UTC 2021 - Franck Bui + +- Work around rpmlint complaining about /var/log/journal shipped with setgid bit + + This setgid bit has been already reviewed in the past and wasn't a + concern. However we want the mode/ownership adjusted by tmpfiles and + avoid the duplication of these info in rpm. + +- Don't ghost own any directories created dynamically by tmpfiles + + Again rpmlint complains but it doesn't seem to make sense to try to + track all paths (including theirs perms, ownerships...) created + dynamically. And 'rpm -V' is likely to report issues later with + these paths anyway. + + This effectively partially reverts the two previous commits. + +------------------------------------------------------------------- +Fri Sep 24 12:56:31 UTC 2021 - Franck Bui + +- Make sure the build process won't create /var/log/journal + +- /var/log/journal/remote is owned by systemd-journal-remote + +------------------------------------------------------------------- +Fri Sep 24 09:28:38 UTC 2021 - Franck Bui + +- systemd.spec: fix a bunch of rpmlint errors/warnings + +------------------------------------------------------------------- +Fri Sep 24 07:27:58 UTC 2021 - Franck Bui + +- Drop systemd-logger + + This sub package was introduced in order to configure persistent + journal and also to make sure that another syslog provider (such as + rsyslog) couldn't be installed at the same time: each syslog + provider conflicts with each others. + + However this mechanism didn't work since uninstalling systemd-logger + wasn't magically turning off persistent logging because + /var/log/journal is likely to be populated hence not removed. + + Moreover using a subpackage to configure the mode of journald was + overkill and the usual ways (main conf file or drop-ins) should be + preferred. + +------------------------------------------------------------------- +Wed Sep 22 13:41:34 UTC 2021 - Franck Bui + +- Import commit 7a5801342fe2f53e5c2a8578d6db132c0eca2d97 + + 8d65ec4a66 test: wc is needed by test/units/testsuite-50.sh + 1527bcc5dd test: make the installation of the debug tools optional in the image + f4e6bf0b37 journalctl: never fail at flushing when the flushed flag is set (bsc#1188588) + +------------------------------------------------------------------- +Wed Sep 22 13:25:26 UTC 2021 - Franck Bui + +- Update the dependencies of the testsuite package + + The debug tools are optional thus no more required. + + OTOH strip(1) is needed when building the test image and nc(1) is + needed by some tests. + +------------------------------------------------------------------- +Fri Sep 10 13:30:14 UTC 2021 - Franck Bui + +- Drop git internal files from the testsuite sub-package + +------------------------------------------------------------------- +Fri Sep 10 09:51:06 UTC 2021 - Franck Bui + +- Adjust pam macros + ------------------------------------------------------------------- Wed Sep 8 17:01:58 UTC 2021 - Franck Bui @@ -69,6 +146,10 @@ Mon Aug 2 12:54:44 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for details. + This includes the following bug fixes: + + - upstream commit 6fb61918ccdd0610b425d5b0e5417751f8f8f783 (bsc#1182870) + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -310,6 +391,11 @@ Mon Apr 26 16:25:38 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for details. + This includes the following bug fixes: + + - upstream commit 4327574fc1093513badc2177f71cede2fc88c13c (bsc#1166028) + - upstream commit 3573e032f26724949e86626eace058d006b8bf70 (bsc#1186411) + - A couple runtime dependencies on libraries are now tracked manually (with Recommends:) due to the fact that some symbols of these libs are dynamically loaded with dlopen() (heck!) @@ -974,7 +1060,7 @@ Mon Apr 27 14:50:36 UTC 2020 - Franck Bui ------------------------------------------------------------------- Mon Apr 27 14:33:35 UTC 2020 - Franck Bui -- Drop most of the tmpfiles that deal with generic paths (bsc#1078466) +- Drop most of the tmpfiles that deal with generic paths (bsc#1078466 bsc#1181831) They are problematic because some of them conflict with SUSE defaults. Therefore it seems better to let the revelant packages diff --git a/systemd-mini.spec b/systemd-mini.spec index 2de1c70e..c7cf5326 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,7 +26,7 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.35.gec72db9ee0 +%define suse_version +suse.39.g7a5801342f %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi @@ -154,10 +154,12 @@ Conflicts: kiwi Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Obsoletes: systemd-analyze < 201 +Provides: systemd-logger = %{version}-%{release} +Obsoletes: systemd-logger < %{version}-%{release} Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 +Obsoletes: systemd-analyze < 201 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user @@ -236,7 +238,7 @@ Summary: System V init tools License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Provides: sbin_init -Conflicts: otherproviders(sbin_init) +Conflicts: sbin_init Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init @@ -398,21 +400,9 @@ More information can be found online: http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES - %endif %if ! 0%{?bootstrap} -%package logger -Summary: Journal only logging -License: LGPL-2.1-or-later -Provides: syslog -Provides: sysvinit(syslog) -Requires(post): /usr/bin/systemctl -Conflicts: otherproviders(syslog) - -%description logger -This package marks the installation to not use syslog but only the journal. - %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -511,13 +501,13 @@ Requires: libqrencode4 pkgconfig(libqrencode) %endif Requires: %{name} = %{version}-%{release} Requires: attr +Requires: binutils Requires: busybox-static Requires: cryptsetup -Requires: dhcp-client Requires: dosfstools Requires: libcap-progs Requires: lz4 -Requires: net-tools-deprecated +Requires: netcat Requires: qemu-kvm Requires: quota Requires: socat @@ -621,14 +611,15 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_distconfdir}/pam.d \ - -Dpamlibdir=%{_pamdir} \ + -Dpamconfdir=%{_pam_vendordir} \ + -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ + -Dcreate-log-dirs=false \ -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ @@ -752,7 +743,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d +install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -782,10 +773,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -# Create the /var/log/journal directory to change the volatile journal -# to a persistent one -mkdir -p %{buildroot}%{_localstatedir}/log/journal/ - # This dir must be owned (and thus created) by systemd otherwise the # build system will complain. This is odd since we simply own a ghost # file in it... @@ -898,6 +885,7 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} cp -a test %{buildroot}%{_testsuitedir}/ +find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif %if ! 0%{?bootstrap} @@ -905,7 +893,7 @@ cp -a test %{buildroot}%{_testsuitedir}/ %endif # Build of installation images uses a hard coded list of packages with -# a %pre that needs to be run during the build. systemd is one of them +# a %%pre that needs to be run during the build. systemd is one of them # so keep the section even if it's empty. %pre : @@ -934,7 +922,7 @@ pam-config --add --systemd || : %endif # systemd-sysusers is not available in %pre so this needs to be done -# in %post. However this shouldn't be an issue since all files the +# in %%post. However this shouldn't be an issue since all files the # main package ships are owned by root. %sysusers_create systemd.conf @@ -959,6 +947,11 @@ systemctl daemon-reexec || : # # systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : +if [ "$1" -eq 1 ]; then + # Persistent journal is the default + mkdir -p %{_localstatedir}/log/journal +fi + %journal_catalog_update %tmpfiles_create @@ -1102,13 +1095,6 @@ fi %endif %if ! 0%{?bootstrap} -%post logger -%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ -if [ "$1" -eq 1 ]; then - # tell journal to start logging on disk if directory didn't exist before - systemctl --no-block restart systemd-journal-flush.service >/dev/null || : -fi - %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig @@ -1226,8 +1212,6 @@ fi %service_del_postun systemd-homed.service %endif -%clean - %files %defattr(-,root,root) %license LICENSE* @@ -1379,7 +1363,7 @@ fi %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -%{_pamdir}/pam_systemd.so +%{_pam_moduledir}/pam_systemd.so %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1421,7 +1405,7 @@ fi %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%{_distconfdir}/pam.d/systemd-user +%{_pam_vendordir}/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1558,7 +1542,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html - # /bootstrap %endif @@ -1734,12 +1717,6 @@ fi %if ! 0%{?bootstrap} %files lang -f systemd.lang -%files logger -%defattr(-,root,root) -# package without explicit setgid bit / attrs (see bsc#1172550) -%dir %{_localstatedir}/log/journal/ -%doc %{_localstatedir}/log/README - %files -n nss-myhostname %defattr(-, root, root) %{_libdir}/*nss_myhostname* @@ -1808,6 +1785,7 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service +# Some files created at runtime %endif %if %{with resolved} %{_bindir}/resolvectl @@ -1869,7 +1847,7 @@ fi %{_prefix}/lib/systemd/systemd-homework %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-homed-activate.service -%{_pamdir}/pam_systemd_home.so +%{_pam_moduledir}/pam_systemd_home.so %{_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 diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 9bc3777f..86edf488 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -1,32 +1,11 @@ -addFilter("invalid-pkgconfig-file") -addFilter(".*dangling-symlink /sbin/(halt|init|poweroff|telinit|shutdown|runlevel|reboot).*") -addFilter(".*dangling-symlink .* /dev/null.*") -addFilter(".*files-duplicate .*/reboot\.8.*") -addFilter(".*files-duplicate .*/sd_is_socket\.3.*") -addFilter("non-conffile-in-etc /etc/bash_completion.d/systemd-bash-completion\.sh") -addFilter("non-conffile-in-etc /etc/rpm/macros\.systemd") +addFilter(".*filelist-forbidden-systemd-userdirs /etc/systemd/.*\.conf") addFilter(".*dbus-policy-allow-receive") -addFilter(".*dangling-symlink /lib/udev/devices/std(in|out|err).*") -addFilter(".*dangling-symlink /lib/udev/devices/core.*") -addFilter(".*dangling-symlink /lib/udev/devices/fd.*") -addFilter(".*incoherent-init-script-name boot\.udev.*") -addFilter(".init-script-without-%stop_on_removal-preun /etc/init\.d/boot\.udev") -addFilter(".init-script-without-%restart_on_update-postun /etc/init\.d/boot\.udev") addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") -addFilter(".*libgudev-.*shlib-fixed-dependency.*") -addFilter(".*suse-filelist-forbidden-systemd-userdirs.*") -addFilter("libudev-mini.*shlib-policy-name-error.*") -addFilter("nss-systemd.*shlib-policy-name-error.*") -addFilter("nss-myhostname.*shlib-policy-name-error.*") -addFilter("nss-mymachines.*shlib-policy-name-error.*") -addFilter("nss-resolve.*shlib-policy-name-error.*") -addFilter("systemd-logger.*useless-provides sysvinit(syslog).*") addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") -addFilter(".*script-without-shebang.*/usr/lib/udev/rule_generator.functions.*") -addFilter(".*files-duplicate.*/systemd-logger.*") addFilter(".*missing-call-to-setgroups-before-setuid.*") -addFilter(".*missing-call-to-chdir-with-chroot.*") addFilter(".*systemd-service-without-service.*") -addFilter(".*shlib-policy-missing-suffix.*") -addFilter(".*suse-missing-rclink.*") addFilter("env-script-interpreter") +addFilter(".*files-duplicate /usr/lib/systemd/.*") +addFilter(".*files-duplicated-waste.*") +addFilter(".*explicit-lib-dependency .*") +addFilter(".*tmpfile-not-in-filelist .*") diff --git a/systemd-v249.4+suse.35.gec72db9ee0.tar.xz b/systemd-v249.4+suse.35.gec72db9ee0.tar.xz deleted file mode 100644 index d8ceb7cf..00000000 --- a/systemd-v249.4+suse.35.gec72db9ee0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d581f2ec411b41826c395147fe9a040b0e916de7fdeeaae0681f43be8b92bb82 -size 7266280 diff --git a/systemd-v249.4+suse.39.g7a5801342f.tar.xz b/systemd-v249.4+suse.39.g7a5801342f.tar.xz new file mode 100644 index 00000000..5000653b --- /dev/null +++ b/systemd-v249.4+suse.39.g7a5801342f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:253802820cf7090eb06e26f5dc23dfd9dfd967fc20b8c85350ea4856fe99442d +size 7266304 diff --git a/systemd.changes b/systemd.changes index d28a872f..49998b05 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,80 @@ +------------------------------------------------------------------- +Wed Sep 29 10:04:38 UTC 2021 - Franck Bui + +- Work around rpmlint complaining about /var/log/journal shipped with setgid bit + + This setgid bit has been already reviewed in the past and wasn't a + concern. However we want the mode/ownership adjusted by tmpfiles and + avoid the duplication of these info in rpm. + +- Don't ghost own any directories created dynamically by tmpfiles + + Again rpmlint complains but it doesn't seem to make sense to try to + track all paths (including theirs perms, ownerships...) created + dynamically. And 'rpm -V' is likely to report issues later with + these paths anyway. + + This effectively partially reverts the two previous commits. + +------------------------------------------------------------------- +Fri Sep 24 12:56:31 UTC 2021 - Franck Bui + +- Make sure the build process won't create /var/log/journal + +- /var/log/journal/remote is owned by systemd-journal-remote + +------------------------------------------------------------------- +Fri Sep 24 09:28:38 UTC 2021 - Franck Bui + +- systemd.spec: fix a bunch of rpmlint errors/warnings + +------------------------------------------------------------------- +Fri Sep 24 07:27:58 UTC 2021 - Franck Bui + +- Drop systemd-logger + + This sub package was introduced in order to configure persistent + journal and also to make sure that another syslog provider (such as + rsyslog) couldn't be installed at the same time: each syslog + provider conflicts with each others. + + However this mechanism didn't work since uninstalling systemd-logger + wasn't magically turning off persistent logging because + /var/log/journal is likely to be populated hence not removed. + + Moreover using a subpackage to configure the mode of journald was + overkill and the usual ways (main conf file or drop-ins) should be + preferred. + +------------------------------------------------------------------- +Wed Sep 22 13:41:34 UTC 2021 - Franck Bui + +- Import commit 7a5801342fe2f53e5c2a8578d6db132c0eca2d97 + + 8d65ec4a66 test: wc is needed by test/units/testsuite-50.sh + 1527bcc5dd test: make the installation of the debug tools optional in the image + f4e6bf0b37 journalctl: never fail at flushing when the flushed flag is set (bsc#1188588) + +------------------------------------------------------------------- +Wed Sep 22 13:25:26 UTC 2021 - Franck Bui + +- Update the dependencies of the testsuite package + + The debug tools are optional thus no more required. + + OTOH strip(1) is needed when building the test image and nc(1) is + needed by some tests. + +------------------------------------------------------------------- +Fri Sep 10 13:30:14 UTC 2021 - Franck Bui + +- Drop git internal files from the testsuite sub-package + +------------------------------------------------------------------- +Fri Sep 10 09:51:06 UTC 2021 - Franck Bui + +- Adjust pam macros + ------------------------------------------------------------------- Wed Sep 8 17:01:58 UTC 2021 - Franck Bui @@ -69,6 +146,10 @@ Mon Aug 2 12:54:44 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for details. + This includes the following bug fixes: + + - upstream commit 6fb61918ccdd0610b425d5b0e5417751f8f8f783 (bsc#1182870) + - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch @@ -310,6 +391,11 @@ Mon Apr 26 16:25:38 UTC 2021 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for details. + This includes the following bug fixes: + + - upstream commit 4327574fc1093513badc2177f71cede2fc88c13c (bsc#1166028) + - upstream commit 3573e032f26724949e86626eace058d006b8bf70 (bsc#1186411) + - A couple runtime dependencies on libraries are now tracked manually (with Recommends:) due to the fact that some symbols of these libs are dynamically loaded with dlopen() (heck!) @@ -974,7 +1060,7 @@ Mon Apr 27 14:50:36 UTC 2020 - Franck Bui ------------------------------------------------------------------- Mon Apr 27 14:33:35 UTC 2020 - Franck Bui -- Drop most of the tmpfiles that deal with generic paths (bsc#1078466) +- Drop most of the tmpfiles that deal with generic paths (bsc#1078466 bsc#1181831) They are problematic because some of them conflict with SUSE defaults. Therefore it seems better to let the revelant packages diff --git a/systemd.spec b/systemd.spec index 336ac697..bd5c5924 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,7 +24,7 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.35.gec72db9ee0 +%define suse_version +suse.39.g7a5801342f %define _testsuitedir /usr/lib/systemd/tests %bcond_with gnuefi @@ -152,10 +152,12 @@ Conflicts: kiwi Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Obsoletes: systemd-analyze < 201 +Provides: systemd-logger = %{version}-%{release} +Obsoletes: systemd-logger < %{version}-%{release} Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 +Obsoletes: systemd-analyze < 201 Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: %{name}-rpmlintrc Source2: systemd-user @@ -234,7 +236,7 @@ Summary: System V init tools License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} Provides: sbin_init -Conflicts: otherproviders(sbin_init) +Conflicts: sbin_init Provides: systemd-sysvinit = %{version}-%{release} Provides: sysvinit:/sbin/init @@ -396,21 +398,9 @@ More information can be found online: http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES - %endif %if ! 0%{?bootstrap} -%package logger -Summary: Journal only logging -License: LGPL-2.1-or-later -Provides: syslog -Provides: sysvinit(syslog) -Requires(post): /usr/bin/systemctl -Conflicts: otherproviders(syslog) - -%description logger -This package marks the installation to not use syslog but only the journal. - %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -509,13 +499,13 @@ Requires: libqrencode4 pkgconfig(libqrencode) %endif Requires: %{name} = %{version}-%{release} Requires: attr +Requires: binutils Requires: busybox-static Requires: cryptsetup -Requires: dhcp-client Requires: dosfstools Requires: libcap-progs Requires: lz4 -Requires: net-tools-deprecated +Requires: netcat Requires: qemu-kvm Requires: quota Requires: socat @@ -619,14 +609,15 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_distconfdir}/pam.d \ - -Dpamlibdir=%{_pamdir} \ + -Dpamconfdir=%{_pam_vendordir} \ + -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ -Drc-local=/etc/init.d/boot.local \ + -Dcreate-log-dirs=false \ -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ -Dseccomp=auto \ @@ -750,7 +741,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_distconfdir}/pam.d +install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -780,10 +771,6 @@ rm -f %{buildroot}%{_sysusersdir}/basic.conf # in this directory... oh well. rm -f %{buildroot}/etc/init.d/README -# Create the /var/log/journal directory to change the volatile journal -# to a persistent one -mkdir -p %{buildroot}%{_localstatedir}/log/journal/ - # This dir must be owned (and thus created) by systemd otherwise the # build system will complain. This is odd since we simply own a ghost # file in it... @@ -896,6 +883,7 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} cp -a test %{buildroot}%{_testsuitedir}/ +find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif %if ! 0%{?bootstrap} @@ -903,7 +891,7 @@ cp -a test %{buildroot}%{_testsuitedir}/ %endif # Build of installation images uses a hard coded list of packages with -# a %pre that needs to be run during the build. systemd is one of them +# a %%pre that needs to be run during the build. systemd is one of them # so keep the section even if it's empty. %pre : @@ -932,7 +920,7 @@ pam-config --add --systemd || : %endif # systemd-sysusers is not available in %pre so this needs to be done -# in %post. However this shouldn't be an issue since all files the +# in %%post. However this shouldn't be an issue since all files the # main package ships are owned by root. %sysusers_create systemd.conf @@ -957,6 +945,11 @@ systemctl daemon-reexec || : # # systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : +if [ "$1" -eq 1 ]; then + # Persistent journal is the default + mkdir -p %{_localstatedir}/log/journal +fi + %journal_catalog_update %tmpfiles_create @@ -1100,13 +1093,6 @@ fi %endif %if ! 0%{?bootstrap} -%post logger -%tmpfiles_create -- --prefix=%{_localstatedir}/log/journal/ -if [ "$1" -eq 1 ]; then - # tell journal to start logging on disk if directory didn't exist before - systemctl --no-block restart systemd-journal-flush.service >/dev/null || : -fi - %post -n nss-myhostname -p /sbin/ldconfig %postun -n nss-myhostname -p /sbin/ldconfig @@ -1224,8 +1210,6 @@ fi %service_del_postun systemd-homed.service %endif -%clean - %files %defattr(-,root,root) %license LICENSE* @@ -1377,7 +1361,7 @@ fi %dir %{_prefix}/lib/systemd/system-shutdown/ %dir %{_prefix}/lib/systemd/system-sleep/ -%{_pamdir}/pam_systemd.so +%{_pam_moduledir}/pam_systemd.so %if %{with gnuefi} %dir %{_prefix}/lib/systemd/boot @@ -1419,7 +1403,7 @@ fi %dir %{_distconfdir}/X11/xinit/xinitrc.d %{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh -%{_distconfdir}/pam.d/systemd-user +%{_pam_vendordir}/systemd-user %config(noreplace) %{_sysconfdir}/systemd/journald.conf %config(noreplace) %{_sysconfdir}/systemd/logind.conf @@ -1556,7 +1540,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html - # /bootstrap %endif @@ -1732,12 +1715,6 @@ fi %if ! 0%{?bootstrap} %files lang -f systemd.lang -%files logger -%defattr(-,root,root) -# package without explicit setgid bit / attrs (see bsc#1172550) -%dir %{_localstatedir}/log/journal/ -%doc %{_localstatedir}/log/README - %files -n nss-myhostname %defattr(-, root, root) %{_libdir}/*nss_myhostname* @@ -1806,6 +1783,7 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service +# Some files created at runtime %endif %if %{with resolved} %{_bindir}/resolvectl @@ -1867,7 +1845,7 @@ fi %{_prefix}/lib/systemd/systemd-homework %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-homed-activate.service -%{_pamdir}/pam_systemd_home.so +%{_pam_moduledir}/pam_systemd_home.so %{_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 From f18549028951697750ce567d14ace8589298f1ff81190031d1e3a49ca7872918 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 20 Oct 2021 18:22:38 +0000 Subject: [PATCH 080/124] Accepting request 925519 from Base:System - Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d - Import commit 355e113ce193e5e2d195278c57d47f9a1b00ae46 3b4a005095 meson: add missing include directory when using xkbcommon 4c4e642712 meson: allow extra net naming schemes to be defined during configuration (jsc#SLE-18514) 78466e4464 meson: drop the list of valid net naming schemes b9a2098f9d netif-naming: inline one iterator variable d7fbbc5e74 Add remaining supported schemes as options for default-net-naming-scheme - Rename %{gnu-efi} into %{sd_boot} Build conditionals (%bcond_with and %bcond_without) are used to define a specific feature of systemd. "gnu-efi" is rather an implemenation detail. Also not really sure what "efi" option alone is useful for since systemd-boot & co depends on "gnu-efi". - Enable sd_boot support for aarch64 - Ghost own directories /var/log/journal and /var/log/journal/remote again rpmlint no more complain about the setgid bit, see sr#923496. - Overwriting rootprefix= is only required when split-usr is enabled - Rename %usrmerged into %split_usr - Suppress PAM warning when the credentials for user@.service service are established (bsc#1190515) systemd-user PAM service needs to define a default implementation of pam_setcred() otherwise the fallback (defined by /etc/pam.d/other) is used, which consists of pam_warn.so + pam_deny.so, and will throw OBS-URL: https://build.opensuse.org/request/show/925519 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=338 --- systemd-mini.changes | 66 +++++++++++++++++++++++ systemd-mini.spec | 44 +++++++++------ systemd-user | 17 +++++- systemd-v249.4+suse.39.g7a5801342f.tar.xz | 3 -- systemd-v249.5+suse.47.g8521f8d22f.tar.xz | 3 ++ systemd.changes | 66 +++++++++++++++++++++++ systemd.spec | 44 +++++++++------ 7 files changed, 204 insertions(+), 39 deletions(-) delete mode 100644 systemd-v249.4+suse.39.g7a5801342f.tar.xz create mode 100644 systemd-v249.5+suse.47.g8521f8d22f.tar.xz diff --git a/systemd-mini.changes b/systemd-mini.changes index 49998b05..e24b4142 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri Oct 15 12:09:44 UTC 2021 - Franck Bui + +- Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d + +------------------------------------------------------------------- +Fri Oct 15 11:54:34 UTC 2021 - Franck Bui + +- Import commit 355e113ce193e5e2d195278c57d47f9a1b00ae46 + + 3b4a005095 meson: add missing include directory when using xkbcommon + 4c4e642712 meson: allow extra net naming schemes to be defined during configuration (jsc#SLE-18514) + 78466e4464 meson: drop the list of valid net naming schemes + b9a2098f9d netif-naming: inline one iterator variable + d7fbbc5e74 Add remaining supported schemes as options for default-net-naming-scheme + +------------------------------------------------------------------- +Fri Oct 15 11:38:41 UTC 2021 - Franck Bui + +- Rename %{gnu-efi} into %{sd_boot} + + Build conditionals (%bcond_with and %bcond_without) are used to + define a specific feature of systemd. "gnu-efi" is rather an + implemenation detail. Also not really sure what "efi" option alone + is useful for since systemd-boot & co depends on "gnu-efi". + +- Enable sd_boot support for aarch64 + +------------------------------------------------------------------- +Fri Oct 15 09:27:00 UTC 2021 - Franck Bui + +- Ghost own directories /var/log/journal and /var/log/journal/remote again + + rpmlint no more complain about the setgid bit, see sr#923496. + +------------------------------------------------------------------- +Fri Oct 8 11:14:20 UTC 2021 - Franck Bui + +- Overwriting rootprefix= is only required when split-usr is enabled + +------------------------------------------------------------------- +Fri Oct 8 09:01:59 UTC 2021 - Franck Bui + +- Rename %usrmerged into %split_usr + +------------------------------------------------------------------- +Wed Oct 6 07:40:24 UTC 2021 - Franck Bui + +- Suppress PAM warning when the credentials for user@.service service + are established (bsc#1190515) + + systemd-user PAM service needs to define a default implementation of + pam_setcred() otherwise the fallback (defined by /etc/pam.d/other) + is used, which consists of pam_warn.so + pam_deny.so, and will throw + a warning each time a user logs in. + +------------------------------------------------------------------- +Mon Oct 4 14:40:12 UTC 2021 - Franck Bui + +- No need to install upstream pam configuration file "systemd-user" + + It's overwritten by the SUSE version anyway. + ------------------------------------------------------------------- Wed Sep 29 10:04:38 UTC 2021 - Franck Bui diff --git a/systemd-mini.spec b/systemd-mini.spec index c7cf5326..e2e18d20 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,10 +26,9 @@ ##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### %define mini -mini %define min_kernel_version 4.5 -%define suse_version +suse.39.g7a5801342f +%define suse_version +suse.47.g8521f8d22f %define _testsuitedir /usr/lib/systemd/tests -%bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump %bcond_with importd @@ -38,28 +37,33 @@ %bcond_with networkd %bcond_with portabled %bcond_with resolved +%bcond_with sd_boot %bcond_with sysvcompat %bcond_with experimental %bcond_with testsuite %else %bcond_without coredump -%ifarch %{ix86} x86_64 -%bcond_without gnuefi -%endif %bcond_without importd %bcond_without journal_remote %bcond_without machined %bcond_without networkd %bcond_without portabled %bcond_without resolved +%ifarch %{ix86} x86_64 aarch64 +%bcond_without sd_boot +%else +%bcond_with sd_boot +%endif %bcond_without sysvcompat %bcond_without experimental %bcond_without testsuite %endif +# Kept to ease migrations toward SLE +%bcond_with split_usr Name: systemd-mini URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.4 +Version: 249.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -115,7 +119,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif -%if %{with gnuefi} +%if %{with sd_boot} BuildRequires: gnu-efi %endif @@ -604,14 +608,14 @@ Have fun with these services at your own risk. -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ +%if %{with split_usr} -Drootprefix=/usr \ -%if !0%{?usrmerged} -Dsplit-usr=true \ %endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_pam_vendordir} \ + -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ @@ -650,8 +654,12 @@ Have fun with these services at your own risk. %if %{without coredump} -Dcoredump=false \ %endif -%if %{without gnuefi} +%if %{without sd_boot} + -Defi=false \ -Dgnu-efi=false \ +%else + -Defi=true \ + -Dgnu-efi=true \ %endif %if %{without importd} -Dimportd=false \ @@ -723,7 +731,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -%if !0%{?usrmerged} +%if %{with split_usr} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -743,7 +751,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} +install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{S:2} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -1215,8 +1223,10 @@ fi %files %defattr(-,root,root) %license LICENSE* -%{_bindir}/busctl +%if %{with sd_boot} %{_bindir}/bootctl +%endif +%{_bindir}/busctl %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl @@ -1365,7 +1375,7 @@ fi %{_pam_moduledir}/pam_systemd.so -%if %{with gnuefi} +%if %{with sd_boot} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi %{_prefix}/lib/systemd/boot/efi/*.efi @@ -1433,6 +1443,7 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1542,7 +1553,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html -# /bootstrap %endif %files devel @@ -1557,7 +1567,7 @@ fi %files sysvinit %defattr(-,root,root,-) -%if !0%{?usrmerged} +%if %{with split_usr} /sbin/init /sbin/reboot /sbin/halt @@ -1764,6 +1774,7 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd +%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} @@ -1785,7 +1796,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -# Some files created at runtime %endif %if %{with resolved} %{_bindir}/resolvectl diff --git a/systemd-user b/systemd-user index f1d252b7..3907c885 100644 --- a/systemd-user +++ b/systemd-user @@ -2,8 +2,21 @@ # # Used by systemd --user instances. -account include common-account +# This is not about authentication per se (user@.service is a system +# service anyway) but to give the possibility to user services +# (especially those like gnome-terminal, see [1]) to have theirs +# credentials extended similar to the ones received by a user when he +# logs in (and the full PAM authentication stack is run). See [2] and +# [3] for details. +# +# [1] https://gitlab.gnome.org/GNOME/gdm/-/issues/393 +# [2] https://github.com/systemd/systemd/issues/11198 +# [3] https://bugzilla.suse.com/show_bug.cgi?id=1190515 +# +auth include common-auth + +account include common-account session required pam_selinux.so close session required pam_selinux.so nottys open -session include common-session +session include common-session diff --git a/systemd-v249.4+suse.39.g7a5801342f.tar.xz b/systemd-v249.4+suse.39.g7a5801342f.tar.xz deleted file mode 100644 index 5000653b..00000000 --- a/systemd-v249.4+suse.39.g7a5801342f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:253802820cf7090eb06e26f5dc23dfd9dfd967fc20b8c85350ea4856fe99442d -size 7266304 diff --git a/systemd-v249.5+suse.47.g8521f8d22f.tar.xz b/systemd-v249.5+suse.47.g8521f8d22f.tar.xz new file mode 100644 index 00000000..5c5dfb3d --- /dev/null +++ b/systemd-v249.5+suse.47.g8521f8d22f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8a0ffb611331f565bf6bc5b7ec30cf9725cf462b08dae3c2b7bd344d1c9ed7c +size 7268136 diff --git a/systemd.changes b/systemd.changes index 49998b05..e24b4142 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,69 @@ +------------------------------------------------------------------- +Fri Oct 15 12:09:44 UTC 2021 - Franck Bui + +- Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d + +------------------------------------------------------------------- +Fri Oct 15 11:54:34 UTC 2021 - Franck Bui + +- Import commit 355e113ce193e5e2d195278c57d47f9a1b00ae46 + + 3b4a005095 meson: add missing include directory when using xkbcommon + 4c4e642712 meson: allow extra net naming schemes to be defined during configuration (jsc#SLE-18514) + 78466e4464 meson: drop the list of valid net naming schemes + b9a2098f9d netif-naming: inline one iterator variable + d7fbbc5e74 Add remaining supported schemes as options for default-net-naming-scheme + +------------------------------------------------------------------- +Fri Oct 15 11:38:41 UTC 2021 - Franck Bui + +- Rename %{gnu-efi} into %{sd_boot} + + Build conditionals (%bcond_with and %bcond_without) are used to + define a specific feature of systemd. "gnu-efi" is rather an + implemenation detail. Also not really sure what "efi" option alone + is useful for since systemd-boot & co depends on "gnu-efi". + +- Enable sd_boot support for aarch64 + +------------------------------------------------------------------- +Fri Oct 15 09:27:00 UTC 2021 - Franck Bui + +- Ghost own directories /var/log/journal and /var/log/journal/remote again + + rpmlint no more complain about the setgid bit, see sr#923496. + +------------------------------------------------------------------- +Fri Oct 8 11:14:20 UTC 2021 - Franck Bui + +- Overwriting rootprefix= is only required when split-usr is enabled + +------------------------------------------------------------------- +Fri Oct 8 09:01:59 UTC 2021 - Franck Bui + +- Rename %usrmerged into %split_usr + +------------------------------------------------------------------- +Wed Oct 6 07:40:24 UTC 2021 - Franck Bui + +- Suppress PAM warning when the credentials for user@.service service + are established (bsc#1190515) + + systemd-user PAM service needs to define a default implementation of + pam_setcred() otherwise the fallback (defined by /etc/pam.d/other) + is used, which consists of pam_warn.so + pam_deny.so, and will throw + a warning each time a user logs in. + +------------------------------------------------------------------- +Mon Oct 4 14:40:12 UTC 2021 - Franck Bui + +- No need to install upstream pam configuration file "systemd-user" + + It's overwritten by the SUSE version anyway. + ------------------------------------------------------------------- Wed Sep 29 10:04:38 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index bd5c5924..17246d92 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,10 +24,9 @@ %define bootstrap 0 %define mini %nil %define min_kernel_version 4.5 -%define suse_version +suse.39.g7a5801342f +%define suse_version +suse.47.g8521f8d22f %define _testsuitedir /usr/lib/systemd/tests -%bcond_with gnuefi %if 0%{?bootstrap} %bcond_with coredump %bcond_with importd @@ -36,28 +35,33 @@ %bcond_with networkd %bcond_with portabled %bcond_with resolved +%bcond_with sd_boot %bcond_with sysvcompat %bcond_with experimental %bcond_with testsuite %else %bcond_without coredump -%ifarch %{ix86} x86_64 -%bcond_without gnuefi -%endif %bcond_without importd %bcond_without journal_remote %bcond_without machined %bcond_without networkd %bcond_without portabled %bcond_without resolved +%ifarch %{ix86} x86_64 aarch64 +%bcond_without sd_boot +%else +%bcond_with sd_boot +%endif %bcond_without sysvcompat %bcond_without experimental %bcond_without testsuite %endif +# Kept to ease migrations toward SLE +%bcond_with split_usr Name: systemd URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.4 +Version: 249.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -113,7 +117,7 @@ BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(libcurl) BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 %endif -%if %{with gnuefi} +%if %{with sd_boot} BuildRequires: gnu-efi %endif @@ -602,14 +606,14 @@ Have fun with these services at your own risk. -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ -Ddocdir=%{_docdir}/systemd \ +%if %{with split_usr} -Drootprefix=/usr \ -%if !0%{?usrmerged} -Dsplit-usr=true \ %endif -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ - -Dpamconfdir=%{_pam_vendordir} \ + -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ @@ -648,8 +652,12 @@ Have fun with these services at your own risk. %if %{without coredump} -Dcoredump=false \ %endif -%if %{without gnuefi} +%if %{without sd_boot} + -Defi=false \ -Dgnu-efi=false \ +%else + -Defi=true \ + -Dgnu-efi=true \ %endif %if %{without importd} -Dimportd=false \ @@ -721,7 +729,7 @@ for s in %{S:100} %{S:101} %{S:102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done -%if !0%{?usrmerged} +%if %{with split_usr} # Legacy sysvinit tools mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init @@ -741,7 +749,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 %{S:2} %{buildroot}%{_pam_vendordir} +install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{S:2} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -1213,8 +1221,10 @@ fi %files %defattr(-,root,root) %license LICENSE* -%{_bindir}/busctl +%if %{with sd_boot} %{_bindir}/bootctl +%endif +%{_bindir}/busctl %{_bindir}/hostnamectl %{_bindir}/kernel-install %{_bindir}/localectl @@ -1363,7 +1373,7 @@ fi %{_pam_moduledir}/pam_systemd.so -%if %{with gnuefi} +%if %{with sd_boot} %dir %{_prefix}/lib/systemd/boot %dir %{_prefix}/lib/systemd/boot/efi %{_prefix}/lib/systemd/boot/efi/*.efi @@ -1431,6 +1441,7 @@ fi %{_modprobedir}/systemd.conf # Some files created at runtime. +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %config(noreplace) %{_sysconfdir}/locale.conf @@ -1540,7 +1551,6 @@ fi %defattr(-,root,root,-) %dir %{_docdir}/systemd %{_docdir}/systemd/html -# /bootstrap %endif %files devel @@ -1555,7 +1565,7 @@ fi %files sysvinit %defattr(-,root,root,-) -%if !0%{?usrmerged} +%if %{with split_usr} /sbin/init /sbin/reboot /sbin/halt @@ -1762,6 +1772,7 @@ fi %{_mandir}/man8/systemd-journal-remote.* %{_mandir}/man8/systemd-journal-upload.* %{_datadir}/systemd/gatewayd +%ghost %dir %{_localstatedir}/log/journal/remote %endif %if %{with networkd} || %{with resolved} @@ -1783,7 +1794,6 @@ fi %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service -# Some files created at runtime %endif %if %{with resolved} %{_bindir}/resolvectl From ab8271254f775794f4a73d77c7ee8f2d1e1b895d74e8d9c3c9ea638356a96e6c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 8 Nov 2021 16:23:58 +0000 Subject: [PATCH 081/124] Accepting request 928747 from Base:System - Add 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch Temporarly revert commit ed8fbbf1745c6a2dc0b8cd560ac8a3353f72e979 until the regression it introduced [1] is addressed by upstream and a fix is released via the stable tree. [1] https://github.com/systemd/systemd/issues/21025 - Disable nss-systemd and translations features for the mini flavour - Really enable libiptc for masquerading support (bsc#1191651) Currently used by systemd-nspawn and systemd-networkd. - Convert systemd package to multibuild 8de173ff93 mount-util: fix fd_is_mount_point() when both the parent and directory are network fs (bsc#1190984) [...] OBS-URL: https://build.opensuse.org/request/show/928747 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=339 --- ...eck-unit-start-rate-limiting-earlier.patch | 486 + _multibuild | 3 + pre_checkin.sh | 15 - systemd-mini-rpmlintrc | 11 - systemd-mini.changes | 11493 ---------------- systemd-mini.spec | 1871 --- systemd.changes | 31 + systemd.spec | 21 +- 8 files changed, 534 insertions(+), 13397 deletions(-) create mode 100644 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch create mode 100644 _multibuild delete mode 100644 pre_checkin.sh delete mode 100644 systemd-mini-rpmlintrc delete mode 100644 systemd-mini.changes delete mode 100644 systemd-mini.spec diff --git a/0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch b/0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch new file mode 100644 index 00000000..379aaab3 --- /dev/null +++ b/0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch @@ -0,0 +1,486 @@ +From 4fa9d8f14523982482386d398d2b2669902f2098 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Mon, 18 Oct 2021 14:11:53 +0900 +Subject: [PATCH 1/1] Revert "core: Check unit start rate limiting earlier" + +This reverts commit ed8fbbf1745c6a2dc0b8cd560ac8a3353f72e979. + +This was causing problems during boot, see +https://bodhi.fedoraproject.org/updates/FEDORA-2021-a1a52487e6, +https://bugzilla.redhat.com/show_bug.cgi?id=2013386. +https://github.com/systemd/systemd/issues/21025 +--- + src/core/automount.c | 23 ++++++----------------- + src/core/mount.c | 23 ++++++----------------- + src/core/path.c | 23 ++++++----------------- + src/core/service.c | 25 +++++++------------------ + src/core/socket.c | 23 ++++++----------------- + src/core/swap.c | 23 ++++++----------------- + src/core/timer.c | 23 ++++++----------------- + src/core/unit.c | 7 ------- + src/core/unit.h | 4 ---- + test/TEST-63-ISSUE-17433/Makefile | 1 - + test/TEST-63-ISSUE-17433/test.sh | 9 --------- + test/meson.build | 2 -- + test/testsuite-10.units/test10.service | 3 --- + test/testsuite-63.units/test63.path | 2 -- + test/testsuite-63.units/test63.service | 5 ----- + test/units/testsuite-63.service | 16 ---------------- + 16 files changed, 43 insertions(+), 169 deletions(-) + delete mode 120000 test/TEST-63-ISSUE-17433/Makefile + delete mode 100755 test/TEST-63-ISSUE-17433/test.sh + delete mode 100644 test/testsuite-63.units/test63.path + delete mode 100644 test/testsuite-63.units/test63.service + delete mode 100644 test/units/testsuite-63.service + +diff --git a/src/core/automount.c b/src/core/automount.c +index 0722abef23..edc9588165 100644 +--- a/src/core/automount.c ++++ b/src/core/automount.c +@@ -814,6 +814,12 @@ static int automount_start(Unit *u) { + if (r < 0) + return r; + ++ r = unit_test_start_limit(u); ++ if (r < 0) { ++ automount_enter_dead(a, AUTOMOUNT_FAILURE_START_LIMIT_HIT); ++ return r; ++ } ++ + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; +@@ -1059,21 +1065,6 @@ static bool automount_supported(void) { + return supported; + } + +-static int automount_test_start_limit(Unit *u) { +- Automount *a = AUTOMOUNT(u); +- int r; +- +- assert(a); +- +- r = unit_test_start_limit(u); +- if (r < 0) { +- automount_enter_dead(a, AUTOMOUNT_FAILURE_START_LIMIT_HIT); +- return r; +- } +- +- return 0; +-} +- + static const char* const automount_result_table[_AUTOMOUNT_RESULT_MAX] = { + [AUTOMOUNT_SUCCESS] = "success", + [AUTOMOUNT_FAILURE_RESOURCES] = "resources", +@@ -1136,6 +1127,4 @@ const UnitVTable automount_vtable = { + [JOB_FAILED] = "Failed to unset automount %s.", + }, + }, +- +- .test_start_limit = automount_test_start_limit, + }; +diff --git a/src/core/mount.c b/src/core/mount.c +index 9bec190cb6..af39db214b 100644 +--- a/src/core/mount.c ++++ b/src/core/mount.c +@@ -1168,6 +1168,12 @@ static int mount_start(Unit *u) { + + assert(IN_SET(m->state, MOUNT_DEAD, MOUNT_FAILED)); + ++ r = unit_test_start_limit(u); ++ if (r < 0) { ++ mount_enter_dead(m, MOUNT_FAILURE_START_LIMIT_HIT); ++ return r; ++ } ++ + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; +@@ -2137,21 +2143,6 @@ static int mount_can_clean(Unit *u, ExecCleanMask *ret) { + return exec_context_get_clean_mask(&m->exec_context, ret); + } + +-static int mount_test_start_limit(Unit *u) { +- Mount *m = MOUNT(u); +- int r; +- +- assert(m); +- +- r = unit_test_start_limit(u); +- if (r < 0) { +- mount_enter_dead(m, MOUNT_FAILURE_START_LIMIT_HIT); +- return r; +- } +- +- return 0; +-} +- + static const char* const mount_exec_command_table[_MOUNT_EXEC_COMMAND_MAX] = { + [MOUNT_EXEC_MOUNT] = "ExecMount", + [MOUNT_EXEC_UNMOUNT] = "ExecUnmount", +@@ -2249,6 +2240,4 @@ const UnitVTable mount_vtable = { + [JOB_TIMEOUT] = "Timed out unmounting %s.", + }, + }, +- +- .test_start_limit = mount_test_start_limit, + }; +diff --git a/src/core/path.c b/src/core/path.c +index 2b659696a4..e098e83a31 100644 +--- a/src/core/path.c ++++ b/src/core/path.c +@@ -590,6 +590,12 @@ static int path_start(Unit *u) { + if (r < 0) + return r; + ++ r = unit_test_start_limit(u); ++ if (r < 0) { ++ path_enter_dead(p, PATH_FAILURE_START_LIMIT_HIT); ++ return r; ++ } ++ + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; +@@ -805,21 +811,6 @@ static void path_reset_failed(Unit *u) { + p->result = PATH_SUCCESS; + } + +-static int path_test_start_limit(Unit *u) { +- Path *p = PATH(u); +- int r; +- +- assert(p); +- +- r = unit_test_start_limit(u); +- if (r < 0) { +- path_enter_dead(p, PATH_FAILURE_START_LIMIT_HIT); +- return r; +- } +- +- return 0; +-} +- + static const char* const path_type_table[_PATH_TYPE_MAX] = { + [PATH_EXISTS] = "PathExists", + [PATH_EXISTS_GLOB] = "PathExistsGlob", +@@ -874,6 +865,4 @@ const UnitVTable path_vtable = { + .reset_failed = path_reset_failed, + + .bus_set_property = bus_path_set_property, +- +- .test_start_limit = path_test_start_limit, + }; +diff --git a/src/core/service.c b/src/core/service.c +index 701c145565..7b90822f68 100644 +--- a/src/core/service.c ++++ b/src/core/service.c +@@ -2456,6 +2456,13 @@ static int service_start(Unit *u) { + + assert(IN_SET(s->state, SERVICE_DEAD, SERVICE_FAILED)); + ++ /* Make sure we don't enter a busy loop of some kind. */ ++ r = unit_test_start_limit(u); ++ if (r < 0) { ++ service_enter_dead(s, SERVICE_FAILURE_START_LIMIT_HIT, false); ++ return r; ++ } ++ + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; +@@ -4451,22 +4458,6 @@ static const char *service_finished_job(Unit *u, JobType t, JobResult result) { + return NULL; + } + +-static int service_test_start_limit(Unit *u) { +- Service *s = SERVICE(u); +- int r; +- +- assert(s); +- +- /* Make sure we don't enter a busy loop of some kind. */ +- r = unit_test_start_limit(u); +- if (r < 0) { +- service_enter_dead(s, SERVICE_FAILURE_START_LIMIT_HIT, false); +- return r; +- } +- +- return 0; +-} +- + static const char* const service_restart_table[_SERVICE_RESTART_MAX] = { + [SERVICE_RESTART_NO] = "no", + [SERVICE_RESTART_ON_SUCCESS] = "on-success", +@@ -4629,6 +4620,4 @@ const UnitVTable service_vtable = { + }, + .finished_job = service_finished_job, + }, +- +- .test_start_limit = service_test_start_limit, + }; +diff --git a/src/core/socket.c b/src/core/socket.c +index 31d88b71ff..f362a5baa8 100644 +--- a/src/core/socket.c ++++ b/src/core/socket.c +@@ -2515,6 +2515,12 @@ static int socket_start(Unit *u) { + + assert(IN_SET(s->state, SOCKET_DEAD, SOCKET_FAILED)); + ++ r = unit_test_start_limit(u); ++ if (r < 0) { ++ socket_enter_dead(s, SOCKET_FAILURE_START_LIMIT_HIT); ++ return r; ++ } ++ + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; +@@ -3423,21 +3429,6 @@ static int socket_can_clean(Unit *u, ExecCleanMask *ret) { + return exec_context_get_clean_mask(&s->exec_context, ret); + } + +-static int socket_test_start_limit(Unit *u) { +- Socket *s = SOCKET(u); +- int r; +- +- assert(s); +- +- r = unit_test_start_limit(u); +- if (r < 0) { +- socket_enter_dead(s, SOCKET_FAILURE_START_LIMIT_HIT); +- return r; +- } +- +- return 0; +-} +- + static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = { + [SOCKET_EXEC_START_PRE] = "ExecStartPre", + [SOCKET_EXEC_START_CHOWN] = "ExecStartChown", +@@ -3564,6 +3555,4 @@ const UnitVTable socket_vtable = { + [JOB_TIMEOUT] = "Timed out stopping %s.", + }, + }, +- +- .test_start_limit = socket_test_start_limit, + }; +diff --git a/src/core/swap.c b/src/core/swap.c +index b25f68fb7d..3843b19500 100644 +--- a/src/core/swap.c ++++ b/src/core/swap.c +@@ -933,6 +933,12 @@ static int swap_start(Unit *u) { + if (UNIT(other)->job && UNIT(other)->job->state == JOB_RUNNING) + return -EAGAIN; + ++ r = unit_test_start_limit(u); ++ if (r < 0) { ++ swap_enter_dead(s, SWAP_FAILURE_START_LIMIT_HIT); ++ return r; ++ } ++ + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; +@@ -1582,21 +1588,6 @@ static int swap_can_clean(Unit *u, ExecCleanMask *ret) { + return exec_context_get_clean_mask(&s->exec_context, ret); + } + +-static int swap_test_start_limit(Unit *u) { +- Swap *s = SWAP(u); +- int r; +- +- assert(s); +- +- r = unit_test_start_limit(u); +- if (r < 0) { +- swap_enter_dead(s, SWAP_FAILURE_START_LIMIT_HIT); +- return r; +- } +- +- return 0; +-} +- + static const char* const swap_exec_command_table[_SWAP_EXEC_COMMAND_MAX] = { + [SWAP_EXEC_ACTIVATE] = "ExecActivate", + [SWAP_EXEC_DEACTIVATE] = "ExecDeactivate", +@@ -1692,6 +1683,4 @@ const UnitVTable swap_vtable = { + [JOB_TIMEOUT] = "Timed out deactivating swap %s.", + }, + }, +- +- .test_start_limit = swap_test_start_limit, + }; +diff --git a/src/core/timer.c b/src/core/timer.c +index 5ecc9f35cf..e064ad9a2d 100644 +--- a/src/core/timer.c ++++ b/src/core/timer.c +@@ -635,6 +635,12 @@ static int timer_start(Unit *u) { + if (r < 0) + return r; + ++ r = unit_test_start_limit(u); ++ if (r < 0) { ++ timer_enter_dead(t, TIMER_FAILURE_START_LIMIT_HIT); ++ return r; ++ } ++ + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; +@@ -895,21 +901,6 @@ static int timer_can_clean(Unit *u, ExecCleanMask *ret) { + return 0; + } + +-static int timer_test_start_limit(Unit *u) { +- Timer *t = TIMER(u); +- int r; +- +- assert(t); +- +- r = unit_test_start_limit(u); +- if (r < 0) { +- timer_enter_dead(t, TIMER_FAILURE_START_LIMIT_HIT); +- return r; +- } +- +- return 0; +-} +- + static const char* const timer_base_table[_TIMER_BASE_MAX] = { + [TIMER_ACTIVE] = "OnActiveSec", + [TIMER_BOOT] = "OnBootSec", +@@ -969,6 +960,4 @@ const UnitVTable timer_vtable = { + .timezone_change = timer_timezone_change, + + .bus_set_property = bus_timer_set_property, +- +- .test_start_limit = timer_test_start_limit, + }; +diff --git a/src/core/unit.c b/src/core/unit.c +index 69ed43578e..38d3eb703f 100644 +--- a/src/core/unit.c ++++ b/src/core/unit.c +@@ -1851,13 +1851,6 @@ int unit_start(Unit *u) { + + assert(u); + +- /* Check start rate limiting early so that failure conditions don't cause us to enter a busy loop. */ +- if (UNIT_VTABLE(u)->test_start_limit) { +- int r = UNIT_VTABLE(u)->test_start_limit(u); +- if (r < 0) +- return r; +- } +- + /* If this is already started, then this will succeed. Note that this will even succeed if this unit + * is not startable by the user. This is relied on to detect when we need to wait for units and when + * waiting is finished. */ +diff --git a/src/core/unit.h b/src/core/unit.h +index 9babd07188..759104ffa7 100644 +--- a/src/core/unit.h ++++ b/src/core/unit.h +@@ -649,10 +649,6 @@ typedef struct UnitVTable { + * of this type will immediately fail. */ + bool (*supported)(void); + +- /* If this function is set, it's invoked first as part of starting a unit to allow start rate +- * limiting checks to occur before we do anything else. */ +- int (*test_start_limit)(Unit *u); +- + /* The strings to print in status messages */ + UnitStatusMessageFormats status_message_formats; + +diff --git a/test/TEST-63-ISSUE-17433/Makefile b/test/TEST-63-ISSUE-17433/Makefile +deleted file mode 120000 +index e9f93b1104..0000000000 +--- a/test/TEST-63-ISSUE-17433/Makefile ++++ /dev/null +@@ -1 +0,0 @@ +-../TEST-01-BASIC/Makefile +\ No newline at end of file +diff --git a/test/TEST-63-ISSUE-17433/test.sh b/test/TEST-63-ISSUE-17433/test.sh +deleted file mode 100755 +index c595a9f2de..0000000000 +--- a/test/TEST-63-ISSUE-17433/test.sh ++++ /dev/null +@@ -1,9 +0,0 @@ +-#!/usr/bin/env bash +-set -e +- +-TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/17433" +- +-# shellcheck source=test/test-functions +-. "${TEST_BASE_DIR:?}/test-functions" +- +-do_test "$@" +diff --git a/test/meson.build b/test/meson.build +index 6f8f257c2d..47c7f4d49a 100644 +--- a/test/meson.build ++++ b/test/meson.build +@@ -33,8 +33,6 @@ if install_tests + install_dir : testdata_dir) + install_subdir('testsuite-52.units', + install_dir : testdata_dir) +- install_subdir('testsuite-63.units', +- install_dir : testdata_dir) + + testsuite08_dir = testdata_dir + '/testsuite-08.units' + install_data('testsuite-08.units/-.mount', +diff --git a/test/testsuite-10.units/test10.service b/test/testsuite-10.units/test10.service +index 2fb476b986..d0be786b01 100644 +--- a/test/testsuite-10.units/test10.service ++++ b/test/testsuite-10.units/test10.service +@@ -1,9 +1,6 @@ + [Unit] + Requires=test10.socket + ConditionPathExistsGlob=/tmp/nonexistent +-# Make sure we hit the socket trigger limit in the test and not the service start limit. +-StartLimitInterval=1000 +-StartLimitBurst=1000 + + [Service] + ExecStart=true +diff --git a/test/testsuite-63.units/test63.path b/test/testsuite-63.units/test63.path +deleted file mode 100644 +index a6573bda0a..0000000000 +--- a/test/testsuite-63.units/test63.path ++++ /dev/null +@@ -1,2 +0,0 @@ +-[Path] +-PathExists=/tmp/test63 +diff --git a/test/testsuite-63.units/test63.service b/test/testsuite-63.units/test63.service +deleted file mode 100644 +index c83801874d..0000000000 +--- a/test/testsuite-63.units/test63.service ++++ /dev/null +@@ -1,5 +0,0 @@ +-[Unit] +-ConditionPathExists=!/tmp/nonexistent +- +-[Service] +-ExecStart=true +diff --git a/test/units/testsuite-63.service b/test/units/testsuite-63.service +deleted file mode 100644 +index 04122723d4..0000000000 +--- a/test/units/testsuite-63.service ++++ /dev/null +@@ -1,16 +0,0 @@ +-[Unit] +-Description=TEST-63-ISSUE-17433 +- +-[Service] +-ExecStartPre=rm -f /failed /testok +-Type=oneshot +-ExecStart=rm -f /tmp/nonexistent +-ExecStart=systemctl start test63.path +-ExecStart=touch /tmp/test63 +-# Make sure systemd has sufficient time to hit the start limit for test63.service. +-ExecStart=sleep 2 +-ExecStart=sh -x -c 'test "$(systemctl show test63.service -P ActiveState)" = failed' +-ExecStart=sh -x -c 'test "$(systemctl show test63.service -P Result)" = start-limit-hit' +-ExecStart=sh -x -c 'test "$(systemctl show test63.path -P ActiveState)" = failed' +-ExecStart=sh -x -c 'test "$(systemctl show test63.path -P Result)" = unit-start-limit-hit' +-ExecStart=sh -x -c 'echo OK >/testok' +-- +2.31.1 + diff --git a/_multibuild b/_multibuild new file mode 100644 index 00000000..bb1e9966 --- /dev/null +++ b/_multibuild @@ -0,0 +1,3 @@ + + mini + diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index c033554d..00000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/sh - -# This script is based on libcdio_spec-prepare.sh (thanks to sbrabec@suse.cz) -# create a -mini spec for systemd for bootstrapping - -ORIG_SPEC=systemd -EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the ${ORIG_SPEC}.spec! #####\n" -sed "s/^%define bootstrap .*$/${EDIT_WARNING}%define bootstrap 1/; - s/^%define mini .*$/${EDIT_WARNING}%define mini -mini/; - s/^Name:.*/&-mini/ - " < ${ORIG_SPEC}.spec > ${ORIG_SPEC}-mini.spec -cp ${ORIG_SPEC}.changes ${ORIG_SPEC}-mini.changes -cp ${ORIG_SPEC}-rpmlintrc ${ORIG_SPEC}-mini-rpmlintrc - -osc service localrun format_spec_file diff --git a/systemd-mini-rpmlintrc b/systemd-mini-rpmlintrc deleted file mode 100644 index 86edf488..00000000 --- a/systemd-mini-rpmlintrc +++ /dev/null @@ -1,11 +0,0 @@ -addFilter(".*filelist-forbidden-systemd-userdirs /etc/systemd/.*\.conf") -addFilter(".*dbus-policy-allow-receive") -addFilter(".*devel-file-in-non-devel-package.*udev.pc.*") -addFilter("devel-file-in-non-devel-package.*/usr/share/pkgconfig/(udev|systemd)\.pc.*") -addFilter(".*missing-call-to-setgroups-before-setuid.*") -addFilter(".*systemd-service-without-service.*") -addFilter("env-script-interpreter") -addFilter(".*files-duplicate /usr/lib/systemd/.*") -addFilter(".*files-duplicated-waste.*") -addFilter(".*explicit-lib-dependency .*") -addFilter(".*tmpfile-not-in-filelist .*") diff --git a/systemd-mini.changes b/systemd-mini.changes deleted file mode 100644 index e24b4142..00000000 --- a/systemd-mini.changes +++ /dev/null @@ -1,11493 +0,0 @@ -------------------------------------------------------------------- -Fri Oct 15 12:09:44 UTC 2021 - Franck Bui - -- Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d - -------------------------------------------------------------------- -Fri Oct 15 11:54:34 UTC 2021 - Franck Bui - -- Import commit 355e113ce193e5e2d195278c57d47f9a1b00ae46 - - 3b4a005095 meson: add missing include directory when using xkbcommon - 4c4e642712 meson: allow extra net naming schemes to be defined during configuration (jsc#SLE-18514) - 78466e4464 meson: drop the list of valid net naming schemes - b9a2098f9d netif-naming: inline one iterator variable - d7fbbc5e74 Add remaining supported schemes as options for default-net-naming-scheme - -------------------------------------------------------------------- -Fri Oct 15 11:38:41 UTC 2021 - Franck Bui - -- Rename %{gnu-efi} into %{sd_boot} - - Build conditionals (%bcond_with and %bcond_without) are used to - define a specific feature of systemd. "gnu-efi" is rather an - implemenation detail. Also not really sure what "efi" option alone - is useful for since systemd-boot & co depends on "gnu-efi". - -- Enable sd_boot support for aarch64 - -------------------------------------------------------------------- -Fri Oct 15 09:27:00 UTC 2021 - Franck Bui - -- Ghost own directories /var/log/journal and /var/log/journal/remote again - - rpmlint no more complain about the setgid bit, see sr#923496. - -------------------------------------------------------------------- -Fri Oct 8 11:14:20 UTC 2021 - Franck Bui - -- Overwriting rootprefix= is only required when split-usr is enabled - -------------------------------------------------------------------- -Fri Oct 8 09:01:59 UTC 2021 - Franck Bui - -- Rename %usrmerged into %split_usr - -------------------------------------------------------------------- -Wed Oct 6 07:40:24 UTC 2021 - Franck Bui - -- Suppress PAM warning when the credentials for user@.service service - are established (bsc#1190515) - - systemd-user PAM service needs to define a default implementation of - pam_setcred() otherwise the fallback (defined by /etc/pam.d/other) - is used, which consists of pam_warn.so + pam_deny.so, and will throw - a warning each time a user logs in. - -------------------------------------------------------------------- -Mon Oct 4 14:40:12 UTC 2021 - Franck Bui - -- No need to install upstream pam configuration file "systemd-user" - - It's overwritten by the SUSE version anyway. - -------------------------------------------------------------------- -Wed Sep 29 10:04:38 UTC 2021 - Franck Bui - -- Work around rpmlint complaining about /var/log/journal shipped with setgid bit - - This setgid bit has been already reviewed in the past and wasn't a - concern. However we want the mode/ownership adjusted by tmpfiles and - avoid the duplication of these info in rpm. - -- Don't ghost own any directories created dynamically by tmpfiles - - Again rpmlint complains but it doesn't seem to make sense to try to - track all paths (including theirs perms, ownerships...) created - dynamically. And 'rpm -V' is likely to report issues later with - these paths anyway. - - This effectively partially reverts the two previous commits. - -------------------------------------------------------------------- -Fri Sep 24 12:56:31 UTC 2021 - Franck Bui - -- Make sure the build process won't create /var/log/journal - -- /var/log/journal/remote is owned by systemd-journal-remote - -------------------------------------------------------------------- -Fri Sep 24 09:28:38 UTC 2021 - Franck Bui - -- systemd.spec: fix a bunch of rpmlint errors/warnings - -------------------------------------------------------------------- -Fri Sep 24 07:27:58 UTC 2021 - Franck Bui - -- Drop systemd-logger - - This sub package was introduced in order to configure persistent - journal and also to make sure that another syslog provider (such as - rsyslog) couldn't be installed at the same time: each syslog - provider conflicts with each others. - - However this mechanism didn't work since uninstalling systemd-logger - wasn't magically turning off persistent logging because - /var/log/journal is likely to be populated hence not removed. - - Moreover using a subpackage to configure the mode of journald was - overkill and the usual ways (main conf file or drop-ins) should be - preferred. - -------------------------------------------------------------------- -Wed Sep 22 13:41:34 UTC 2021 - Franck Bui - -- Import commit 7a5801342fe2f53e5c2a8578d6db132c0eca2d97 - - 8d65ec4a66 test: wc is needed by test/units/testsuite-50.sh - 1527bcc5dd test: make the installation of the debug tools optional in the image - f4e6bf0b37 journalctl: never fail at flushing when the flushed flag is set (bsc#1188588) - -------------------------------------------------------------------- -Wed Sep 22 13:25:26 UTC 2021 - Franck Bui - -- Update the dependencies of the testsuite package - - The debug tools are optional thus no more required. - - OTOH strip(1) is needed when building the test image and nc(1) is - needed by some tests. - -------------------------------------------------------------------- -Fri Sep 10 13:30:14 UTC 2021 - Franck Bui - -- Drop git internal files from the testsuite sub-package - -------------------------------------------------------------------- -Fri Sep 10 09:51:06 UTC 2021 - Franck Bui - -- Adjust pam macros - -------------------------------------------------------------------- -Wed Sep 8 17:01:58 UTC 2021 - Franck Bui - -- Don't reexecute user manager instances on package update yet - - This can't be done until users have their user instance updated to - the new version that supports reexecuting with SIGRTMIN+25 because - this signal terminates the user managers for the previous versions. - -------------------------------------------------------------------- -Wed Sep 8 13:21:34 UTC 2021 - Franck Bui - -- Import commit ec72db9ee0f8ce061f83624d7148ff38a5993b11 - - 3b1aa2f79f manager: reexecute on SIGRTMIN+25, user instances only - fd46c81922 test: make sure to include all haveged unit files - -- systemd.spec: reexec user manager instances on package updates - -------------------------------------------------------------------- -Fri Sep 3 09:38:23 UTC 2021 - Franck Bui - -- Make sure the versions of both udev and systemd packages are always the same (bsc#1189480) - -------------------------------------------------------------------- -Thu Sep 2 10:01:23 UTC 2021 - Franck Bui - -- Drop dependency on m4 (replaced by Jinja2) - -------------------------------------------------------------------- -Wed Sep 1 11:54:23 UTC 2021 - Franck Bui - -- Configure split-usr=true only when %usrmerged is not defined - -------------------------------------------------------------------- -Wed Sep 1 09:56:55 UTC 2021 - Franck Bui - -- Import commit 40bda18e346ff45132ccd6f8f8e96de78dcf3470 (merge of v249.4) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/7f23815a706cf2b2df3eac2eb2f8220736b8f427...40bda18e346ff45132ccd6f8f8e96de78dcf3470 - -------------------------------------------------------------------- -Mon Aug 23 15:12:10 UTC 2021 - Franck Bui - -- Rework the test (sub)package: - - it's been renamed into 'systemd-testsuite' - - it includes the extended tests too - - the relevant commits have been backported to SUSE/v249 so no SUSE - specific patch is needed to run the extended tests (see below) - - the deps needed by the extended tests have been added - -- Import commit 7f23815a706cf2b2df3eac2eb2f8220736b8f427 - - ad216581b6 test: if haveged is part of initrd it needs to be installed in the image too - 088fbb71d0 test: adapt install_pam() for openSUSE - 4d631c1f0c Revert "test: adapt TEST-13-NSPAWN-SMOKE for SUSE" - ef956eb8a2 test: on openSUSE the static linked version of busybox is named "busybox-static" - 6f7ce633b0 TEST-13-*: in busybox container sleep(1) takes a delay in seconds only - 278baaa3ec test: don't try to find BUILD_DIR when NO_BUILD is set - 3bba2f876a test: add support for NO_BUILD=1 on openSUSE - d77cbc1b64 test: make busybox TEST-13-only dependency - -------------------------------------------------------------------- -Mon Aug 2 12:54:44 UTC 2021 - Franck Bui - -- Upgrade to v249.2 (commit c0bb2fcbc26f6aacde574656159504f263916719) - - See https://github.com/openSUSE/systemd/blob/SUSE/v249/NEWS for - details. - - This includes the following bug fixes: - - - upstream commit 6fb61918ccdd0610b425d5b0e5417751f8f8f783 (bsc#1182870) - - - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch - 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch - -------------------------------------------------------------------- -Thu Jul 29 13:12:48 UTC 2021 - Franck Bui - -- Avoid the error message when udev is updated due to udev being - already active when the sockets are started again (bsc#1188291) - -------------------------------------------------------------------- -Mon Jul 26 10:54:10 UTC 2021 - Franck Bui - -- Import commit 73e9e6fb847513c6d62f2fb445778ef5bc0fe516 (merge of v248.6) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/cb29bcc5ef2c0ee659686c5d229646a6ba98ec50...73e9e6fb847513c6d62f2fb445778ef5bc0fe516 - -------------------------------------------------------------------- -Tue Jul 20 16:26:39 UTC 2021 - Franck Bui - -- Drop 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch - - Commit 81107b8419c39f726fd2805517a5b9faab204e59 fixes - https://github.com/systemd/systemd/issues/19464 which makes the - aforementioned patch not needed anymore. - -------------------------------------------------------------------- -Tue Jul 20 16:22:46 UTC 2021 - Franck Bui - -- Drop 1003-basic-unit-name-adjust-comments.patch - - It's been merged in SUSE/v248 branch - -------------------------------------------------------------------- -Tue Jul 20 15:51:47 UTC 2021 - Franck Bui - -- Import commit cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 (merge of v248.5) - - 4a1c5f34bd basic/unit-name: do not use strdupa() on a path (bsc#1188063 CVE-2021-33910) - [...] - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/94efce2ee59fca15a48ff9c232c8dd7cf930c0a0...cb29bcc5ef2c0ee659686c5d229646a6ba98ec50 - -- Drop 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch as it - was merged in v248.5. - -------------------------------------------------------------------- -Tue Jul 20 15:25:38 UTC 2021 - Franck Bui - -- Import commit 94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 (merge of v248.4) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/c0aecee593511e49638579cb2b9ac8aaf1f8e6c8...94efce2ee59fca15a48ff9c232c8dd7cf930c0a0 - -- Drop 1001-unit-name-generate-a-clear-error-code-when-convertin.patch - as it was merged in v248.4. - -------------------------------------------------------------------- -Tue Jul 20 15:10:41 UTC 2021 - Franck Bui - -- Import commit c0aecee593511e49638579cb2b9ac8aaf1f8e6c8 - - 42ec1d537a login: use a hwdb entry for tagging Parallels' fb devices with 'master-of-seat' tag - ecc7c7b462 login: use a hwdb entry for tagging HyperV's fb devices with 'master-of-seat' tag - a4cfd70476 login: XGI Z7/Z9 (XG20 core) graphic chip requires master-of-seat to be set (bsc#1187154) - ef553e0199 sd-dhcp-client: tentatively ignore FORCERENEW command (bsc#1185972 CVE-2020-13529) - aae6c575fc sd-dhcp-client: logs when dhcp client unexpectedly gains a new lease - 258a3d2043 sd-dhcp-client: shorten code a bit - 0a80303114 sd-dhcp-client: check error earlier and reduce indentation - -------------------------------------------------------------------- -Thu Jul 8 18:04:31 UTC 2021 - Franck Bui - -- Added patches to fix CVE-2021-33910 (bsc#1188063) - - Added 1001-unit-name-generate-a-clear-error-code-when-convertin.patch - Added 1002-basic-unit-name-do-not-use-strdupa-on-a-path.patch - Added 1003-basic-unit-name-adjust-comments.patch - - These patches will be moved to the git repo once the bug will become - public. - -------------------------------------------------------------------- -Mon Jul 5 09:03:07 UTC 2021 - Franck Bui - -- systemd-hwdb-update.service should be shipped by the udev package - -------------------------------------------------------------------- -Thu Jul 1 07:47:31 UTC 2021 - Franck Bui - -- Finally don't create /run/lock/subsys anymore - - This effectively reverts the fix for bsc#1187292 made earlier. This - directory is specific to RH sysvinit and since we're going to fade - the support of SysV init script away the directory has no future. - -------------------------------------------------------------------- -Mon Jun 28 16:45:04 UTC 2021 - Franck Bui - -- Import commit e9a23d9e064c2e7ac21a1b984d116bcf15327e63 - - 8dd19c6ee3 sd-device: allow to read sysattr which contains embedded NUL - d52409e5fe pid1: only add a Wants= type dependency on /tmp when PrivateTmp=yes (bsc#1181970 - -------------------------------------------------------------------- -Mon Jun 28 12:46:04 UTC 2021 - Fabian Vogt - -- Enable TPM2 support - -------------------------------------------------------------------- -Thu Jun 24 13:39:30 UTC 2021 - Franck Bui - -- Import commit fcdb8dce591db2f5fc3c1e3eeb7abe9a2090b401 - - aa2d840a3b compat-rules: fix warning: "label ‘out’ defined but not used" in path_id_compat.c - -- Restore 61-persistent-storage-compat.rules that was mistakenly - dropped during the merge of v248. - -------------------------------------------------------------------- -Fri Jun 18 12:53:34 UTC 2021 - Franck Bui - -- Create /run/lock/subsys again (bsc#1187292) - - The creation of this directory was mistakenly dropped when - 'filesystem' package took the initialization of the generic paths - over. - - Paths under /run/lock are still managed by systemd for lack of - better place. - -------------------------------------------------------------------- -Fri Jun 4 13:10:30 UTC 2021 - Franck Bui - -- Drop systemd's dependency on udev (jsc#PM-2677) - - In some environments (i.e. containers) udev is usually not necessary - but pulls in unnecessary packages. - -------------------------------------------------------------------- -Fri Jun 4 07:32:16 UTC 2021 - Franck Bui - -- Now that chkconfig/insserv are history, let's implement the strict - minimum in systemd-sysv-install to enable/disable SysV init scripts - (bsc#1186595 bsc#1186359) - - Indeed there's no much point in dropping SysV support completely - until upstream will do especially since 3rd party applications such - as vmware still rely on it, see bsc#1186359). - -------------------------------------------------------------------- -Tue May 25 16:30:40 UTC 2021 - Franck Bui - -- Allow the sysusers config files shipped by systemd rpms to be - overriden during system installation (bsc#1171962) - -- While at it, add a comment to explain why we don't use - %sysusers_create in %pre and why it should be safe in %post. - -------------------------------------------------------------------- -Thu May 20 20:19:27 UTC 2021 - Franck Bui - -- udev requires systemd in its %post (bsc#1185958) - - udevadm, called in udev's %post, requires libsystemd-shared-248.so. - -------------------------------------------------------------------- -Thu May 20 18:52:53 UTC 2021 - Franck Bui - -- Restore all "License:" tags - - udev uses a different license (GPL-2.0-only) than the main package - and "osc service localrun format_spec_file" has the good taste to - restore the license tags for all other subpackages if one of the - subpackage tag differs. - -------------------------------------------------------------------- -Thu May 20 15:47:38 UTC 2021 - Franck Bui - -- Expect 644 permissions for /usr/lib/udev/compat-symlink-generation (bsc#1185807) - -------------------------------------------------------------------- -Wed May 19 06:54:57 UTC 2021 - Franck Bui - -- Spec file minor cleanups: - - - Drop all "Group:" tags as they are deprecated. - - - Drop "License:" tags from all subpackages and make it inherited - from the main package. - - - Drop "%bcond_with parentpathid" as it's not used. - -------------------------------------------------------------------- -Tue May 18 18:31:20 UTC 2021 - Franck Bui - -- Introduce subpackage systemd-tests - - This subpackage is mainly used before submitting a new version of - the systemd packages. As such it's not intended for regular users - hence can be removed/renamed at any time. One might wonder why the - unit tests are not executed during package builds (%check)... the - reason is that the environment used to build package (chroot) is too - limited and therefore only a subset of the unit tests would be - executed in this environment. - - To disable the build of the subpackage, use "--without=tests". - -------------------------------------------------------------------- -Tue May 18 10:04:16 UTC 2021 - Franck Bui - -- Add 0001-Revert-core-prevent-excessive-proc-self-mountinfo-pa.patch - - A temporary patch until - https://github.com/systemd/systemd/issues/19464 is solved. - -------------------------------------------------------------------- -Tue May 18 08:19:57 UTC 2021 - Franck Bui - -- Import commit bc08011f04ac4f12569ec05965149f665a0b110b (merge of v248.3) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/6f5c11b28f5739b901390f22c2bf4c003cadedaa...bc08011f04ac4f12569ec05965149f665a0b110b - -------------------------------------------------------------------- -Mon May 10 13:12:56 UTC 2021 - Franck Bui - -- Import commit 6f5c11b28f5739b901390f22c2bf4c003cadedaa (merge of v248.2) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/e5f93c9d2e9e26dd0dff430c4c072a547357ae7d...6f5c11b28f5739b901390f22c2bf4c003cadedaa - -------------------------------------------------------------------- -Mon Apr 26 16:25:38 UTC 2021 - Franck Bui - -- Upgrade to v248 (commit 5d3d934a5c2f4593207497db94e6f313348e89e7) - - See https://github.com/openSUSE/systemd/blob/SUSE/v248/NEWS for - details. - - This includes the following bug fixes: - - - upstream commit 4327574fc1093513badc2177f71cede2fc88c13c (bsc#1166028) - - upstream commit 3573e032f26724949e86626eace058d006b8bf70 (bsc#1186411) - - - A couple runtime dependencies on libraries are now tracked - manually (with Recommends:) due to the fact that some symbols of - these libs are dynamically loaded with dlopen() (heck!) - - - oomd is left disablde for now - - - pam configuration file 'systemd-user' is now shipped in - /usr/etc/pam.d - - - Rebased 0001-conf-parser-introduce-early-drop-ins.patch - 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch - 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch - - - Dropped 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch - as it is SLE specific. - -- Clean systemd-experimental up: - - - Enclose "%package/%descriptoin experimental" within a "%if - %experimental/%endif" block condition - - - List the build requirements in the sub-package instead of listing - them in the main package. - - - Enable support for fido2, pwquality and qrencode in the home - stuff - - - Improve the package description - -------------------------------------------------------------------- -Wed Apr 7 08:59:15 UTC 2021 - Franck Bui - -- systemd.spec: clean some of the build deps up: - - - libpcre is redundant with libpcre2 (only required by the full - build) and the mini variant needs none of them. Hence drop the ref - to libpcre. - - - normally libidn2 is needed by some optional features in - systemd-network (only). But it's implicitly pulled in by libgnutls - (required by the main package). Let's make sure the related - features won't be disabled inadvertently in the future by making - the dep explicit. - -------------------------------------------------------------------- -Tue Mar 30 13:35:38 UTC 2021 - Franck Bui - -- Import commit 14581e01203df7aa63c7c8383a12e6ebe258476f (merge of v246.13) - - 423b1e759c Revert "resolved: gracefully handle with packets with too large RR count" (bsc#1183745) - 4723778738 meson.build: make xinitrcdir configurable (bsc#1183408) - [...] - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/9753d1c17545a5d46530696cb14254f5f12024f1...14581e01203df7aa63c7c8383a12e6ebe258476f - -- Drop 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch - as it's part of v246.13. - -- Make use of the new build option to ship xinitrc in - /usr/etc/X11/xinit/xinitrc.d (bsc#1183408) - -------------------------------------------------------------------- -Wed Mar 24 07:05:22 UTC 2021 - Franck Bui - -- Add 0001-Revert-resolved-gracefully-handle-with-packets-with-.patch - - Temporary workaround for bsc#1183745 (upstream issue 18917) until an - actual fix is found. - -------------------------------------------------------------------- -Tue Mar 23 14:11:03 UTC 2021 - Ludwig Nussel - -- enable libiptc for masquerading support in networkd - -------------------------------------------------------------------- -Mon Mar 22 21:12:40 UTC 2021 - Neal Gompa - -- Default to the "unified" cgroup hierarchy. At this point, most - users of cgroup (such as docker, libvirt, kubernetes) should be - ready for this change. It's still possible to switch back to the - old "hybrid" hierarchy by passing "systemd.unified_cgroup_hierarchy=0" - option to the kernel command line. - -------------------------------------------------------------------- -Mon Mar 15 15:56:45 UTC 2021 - Franck Bui - -- Import commit 9753d1c17545a5d46530696cb14254f5f12024f1 (merge of v246.11) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/134cf1c8bc3e361a2641161aa11ac2b5b990480b...9753d1c17545a5d46530696cb14254f5f12024f1 - -- Rebase 0001-conf-parser-introduce-early-drop-ins.patch - -------------------------------------------------------------------- -Mon Mar 15 11:06:54 UTC 2021 - Franck Bui - -- Import commit 13bc08870147b35f87cefb074aec22e767b7ac04 - - 846d61e0a1 boot: Move console declarations to missing_efi.h - 171a37228b boot: Add startswith() and endswith() functions with no_case variants - 0fad9f309a boot: Drop unnecessary braces - c38bbb0874 boot: Fix void pointer arithmetic warning - 438210924b boot: Replace raw efivar gets with typed variants - e46cb3e4a0 boot: Add efivar_get/set_uint64_le() functions - e16bee35c8 boot: Rename efivar_get/set_int() to efivar_get/set_uint_string() - 2808d0e9a3 boot: Tighten scope of variables used in loops - d3f3d57743 boot: Add efivar_get_boolean_u8() - 0551ecce71 boot: Make all efivar util functions take the guid as an argument - 8376ba3b9f boot: Turn all guid constants into C99 compound initializers - 166fc2dad2 boot: Enable C99 - c87d66e261 boot: Move Secure Boot logic to new file - da7bba9438 udev: fix memleak - e06139117c nspawn: make rootfs relative to oci bundle path (bsc#1182598) - 8ba587d46c PATCH] Always free deserialized_subscribed on reload (bsc#1180020) - -------------------------------------------------------------------- -Thu Mar 11 16:58:44 UTC 2021 - Ludwig Nussel - -- create subpackage systemd-experimental to host pstore, repart, - userdb and homed - -------------------------------------------------------------------- -Thu Mar 11 09:51:53 UTC 2021 - Franck Bui - -- Make sure the udev socket units are reloaded during udev package updates - -------------------------------------------------------------------- -Wed Mar 10 09:10:03 UTC 2021 - Franck Bui - -- fix-machines-btrfs-subvol.sh is only shipped when machined is built - -------------------------------------------------------------------- -Mon Feb 22 20:20:43 UTC 2021 - Franck Bui - -- systemd requires aaa_base >= 13.2 - - This dependency is required because 'systemctl - {is-enabled,enable,disable} " ends up calling - systemd-sysv-install which in its turn calls "chkconfig - --no-systemctl". - - aaa_base package has a weird versioning but the '--no-systemctl' - option has been introduced starting from SLE12-SP2-GA, which shipped - version "13.2+git20140911.61c1681". - - Spotted in bsc#1180083. - -------------------------------------------------------------------- -Fri Feb 19 13:34:01 UTC 2021 - Franck Bui - -- Add 0001-conf-parser-introduce-early-drop-ins.patch - - Introduce early configuration drop-in file. This type of drop-ins - are reserved for vendor own purposes only and should never been used - by users. It might be removed in the future without any notice. - -------------------------------------------------------------------- -Wed Feb 17 10:30:43 UTC 2021 - Franck Bui - -- Drop use of %systemd_postun in %postun - - This macro is supposed to operate on units but it was used without - passing any parameters. This call was probably used for issuing a - daemon-reload but the following calls to - %systemd_postun_with_restart imply that already. So let's simply - drop it. - -------------------------------------------------------------------- -Fri Feb 5 13:02:58 UTC 2021 - Franck Bui - -- systemd-sysv-convert: handle the case when services are migrated - from SysV scripts to systemd units and are renamed at the same - time (bsc#1181788) - - The list of such services is hard coded and contains only the - 'ntp->ntpd' translation. - -------------------------------------------------------------------- -Wed Feb 3 09:57:58 UTC 2021 - Franck Bui - -- Import commit 134cf1c8bc3e361a2641161aa11ac2b5b990480b (merge of v246.10) - - 25f220eafb sysusers: flush nscd's caches whenever /etc/{passwd,group} are modified (bsc#1181121) - 4a543f0257 journal: send journald logs to kmsg again - 26df96473f busctl: add a timestamp to the output of the busctl monitor command (bsc#1180225) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/520e53b6d85087b05892ee637ae93f1b269e7e52...134cf1c8bc3e361a2641161aa11ac2b5b990480b - -------------------------------------------------------------------- -Wed Jan 13 10:37:16 UTC 2021 - Ludwig Nussel - -- prepare usrmerge (boo#1029961) - * don't install legacy symlinks to / - * use %_pamdir to install pam modules - * leave nss files in /usr/lib*, glibc loads them from there just - fine independent of usrmerge - -------------------------------------------------------------------- -Fri Dec 18 08:54:20 UTC 2020 - Franck Bui - -- Import commit 520e53b6d85087b05892ee637ae93f1b269e7e52 (merge of v246.9) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/2401461e5f0e32922823d954c56106f96344070e...520e53b6d85087b05892ee637ae93f1b269e7e52 - -------------------------------------------------------------------- -Fri Dec 18 08:41:04 UTC 2020 - Franck Bui - -- Import commit 2401461e5f0e32922823d954c56106f96344070e - - 6131548b0f udev: link_update() should fail if the entry in symlink dir couldn't have been created - f6cb8c7d79 udev: make algorithm that selects highest priority devlink less susceptible to race conditions (bsc#1084748) - fc64e47291 basic/stat-util: make mtime check stricter and use entire timestamp - ae91d45d3d test/sys-script.py: add missing DEVNAME entries to uevents - 09e3473a7a test/udev_test.pl: add "expected good" count - fc89379b5b test/udev-test.pl: suppress umount error message at startup - d9e114f10d test/sd-script.py: new helper script for udev testing - f2672eae66 test/udev-test.pl: generator for large list of block devices - 42b68e43e2 test/udev-test.pl: add repeat count - eec8ec375a tests/udev-test.pl: add multiple device test - 73b8f3cf93 test/udev-test.pl: count "good" results - ee04d70bb6 test/udev-test.pl: merge import parent tests into one - 03942c8fbc test/udev-test.pl: merge "space and var with space" tests - ec95546189 test/udev-test.pl: remove bogus rules from magic subsys test - f704429217 test/udev-test.pl: Make some tests a little harder - ce1a877dc0 test/udev-test.pl: last_rule is unsupported - 913c72ff2d test/udev-test.pl: fix wrong test descriptions - eeb25a1be6 test/udev-test.pl: allow checking multiple symlinks - 00ab4292da test/udev-test.pl: test correctness of symlink targets - 5b71ee2911 test/udev-test.pl: use computed devnode name - 2e04bb9ae8 test/udev-test.pl: allow concurrent additions and removals - 8816dd593c test/udev-test.pl: create rules only once - 214418632d test/udev-test.pl: allow multiple devices per test - 1eb6b23f27 udev-test: do not rely on "mail" group being defined - 4a0a4dcf10 udev: Fix sound.target dependency (bsc#1179363) - -------------------------------------------------------------------- -Wed Dec 16 10:40:48 UTC 2020 - Franck Bui - -- Enable support for zstd compression - - systemd-journald will now use zstd for compressing large fields in - journal files. systemd-coredump will also use this algorithm to - compress coredump files. - - Please note that systemd older than v246 won't be able to read new - journal files as zstd algorithm is not supported by these versions. - - This incompatible change was actually not the only one introduced by - v246 since the hash tables in journal files have been hardened - against hash collisions too in an incompatible way with older - versions. - -------------------------------------------------------------------- -Mon Dec 14 07:55:03 UTC 2020 - Dominique Leuenberger - -- Explicitly require group(kvm) by udev: the group used to be - created by system-users-hardware, but has been split/moved to - qemu/kvm, where it is more logical. The file - /usr/lib/udev/rules.d/50-udev-default.rules references this - group, thus we should make sure the group exists. Otherwise there - are errors in the journal in the form of: - /usr/lib/udev/rules.d/50-udev-default.rules:86 Unknown group 'kvm', ignoring - -------------------------------------------------------------------- -Wed Dec 9 16:08:26 UTC 2020 - Franck Bui - -- Import commit d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 (merge of v246.7) - - 450792497e sd-event: fix delays assert brain-o (#17790) - 1040a19d08 udevadm: rename option '--log-priority' into '--log-level' - a7b41e19bd udev: rename kernel option 'log_priority' into 'log_level' - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/f6104ea5f554233e34b94ffd92da8332c3bd7d8f...d5e7958d35dc7758fe2e87e0a8193b93ce1a1b15 - -------------------------------------------------------------------- -Tue Dec 1 09:42:11 UTC 2020 - Franck Bui - -- Import commit f6104ea5f554233e34b94ffd92da8332c3bd7d8f - - 617aed9236 scope: on unified, make sure to unwatch all PIDs once they've been moved to the cgroup scope - -------------------------------------------------------------------- -Tue Nov 24 13:39:28 UTC 2020 - Franck Bui - -- Don't post-require systemd-default-settings-branding anymore - - This is actually not needed now that the branding package issues a - PID1 reloading every times it's being updated. - -------------------------------------------------------------------- -Mon Nov 23 17:20:28 UTC 2020 - Franck Bui - -- Import commit 49caf8e37aba04841e5493ccc25e7edab462d95b - - f8f7286527 units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-config.mount - e9c7158dc7 units: wait until some fs modules are entirely loaded before mounting their corresponding filesystem (bsc#1178631) - ac7ddc4201 Revert "units: skip modprobe@.service if the unit appears to be already loaded" - 17310a1d19 core: serialize u->pids until the processes have been moved to the scope cgroup (bsc#1174436) - 1416965614 meson: add option to skip installing to $sysconfdir - f71a1ef5d0 systemctl: give a nice hint about org.freedesktop.LogControl1 when applicable - 20a3f9fd95 systemctl: immediately reject invalid log levels - 9f67d2e57b systemctl: merge log_target(), log_level(), service_log_setting() - ddf7cf4872 systemctl: add service-log-{level,target} verbs - 026d7d156d systemctl: list unit introspection verbs first, modification second - -------------------------------------------------------------------- -Fri Nov 20 14:54:55 UTC 2020 - Franck Bui - -- systemd-default-settings is needed by %post scriptlet - -------------------------------------------------------------------- -Tue Nov 17 08:44:10 UTC 2020 - Franck Bui - -- Revert the change that dropped %{release} from the package version - constraints used in Requires: - - The release number is actually relevant since it can be increased - when some patches, which might touch multiple sub-packages of - systemd, are added/modified. - - However the %{release} is still no more used in conflicts. - -------------------------------------------------------------------- -Fri Nov 6 08:34:18 UTC 2020 - Franck Bui - -- Import commit fdce77ce2067f9dd90d816bad28b51efed0b6dc1 - - 05fff5bd02 generator: use kmsg in system-level generators, journal otherwise - ecc07954de log: normalize log target condition check - d32ceea42b log: update comment - 2ebad02b60 basic/virt: Detect PowerVM hypervisor (bsc#1176800) - -------------------------------------------------------------------- -Mon Nov 2 15:17:20 UTC 2020 - Franck Bui - -- Simplify systemd-sysv-convert - - - the previous code incorrectly assumed that the sysv init scripts - were uninstalled before %post get executed. It therefore save the - enablement state in %pre and restore it in %post. Now all is done - in %post (making --save option useless) and there's no more need - to remember the enablement state. - - - "--save" option is a NOP but is still kept for backward - compatibility. - - - the previous simplifcation made /var/lib/systemd/migrated no more - used. - - - we do not search for units in /lib/systemd anymore, this shouldn't - be needed anymore these days especially since this path was only - used when systemd was introduced in openSUSE and it was never used - in SLE (checked SLE12-GA). - - - the option --show has been dropped. It's never been used even - internally. - - - the DB is populated only once even if the script was enabled at - multiple runlevels. The runlevel info was never used. A dummy - value is still added to keep the same format just in case. - -------------------------------------------------------------------- -Wed Oct 21 09:52:38 UTC 2020 - Franck Bui - -- No more need to clean the journal-upload stuff with --without=journal_remote - - Since -Dremote build option has been introduced with meson, this - workaround is no more needed. - -------------------------------------------------------------------- -Mon Oct 19 19:53:48 UTC 2020 - Franck Bui - -- Move journal-{remote,upload}.conf.5.gz man pages into systemd-journal_remote sub package - -------------------------------------------------------------------- -Mon Oct 19 18:50:38 UTC 2020 - Franck Bui - -- Explicitly list files in /usr/lib/sysusers.d shipped by the main package - - Currently only one config file is shipped in this directory and we - want to check any new files that may be added in the future. - -------------------------------------------------------------------- -Mon Oct 19 17:29:38 UTC 2020 - Franck Bui - -- Use %{_modulesloaddir}, %{_environmentdir} and %{_modprobedir} wherever appropriate - -------------------------------------------------------------------- -Tue Oct 13 09:29:40 UTC 2020 - Franck Bui - -- Do not include %{release} in a few places where we explicitly mention package versions - - It's usually not a good idea especially when used with conflicts. - -------------------------------------------------------------------- -Tue Oct 13 08:50:13 UTC 2020 - Franck Bui - -- Rely on systemd-default-settings for overriding system default settings (bsc#1172517) - - The new branding packages now ships the drop-ins to customize - systemd either for an openSUSE or a SLE ditro. - -------------------------------------------------------------------- -Wed Sep 30 19:09:59 UTC 2020 - Franck Bui - -- Import commit d7b5ac76dc95ddf30e707d26998e36303e9f52a7 (merge of v246.6) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/1cab0d44584687ace92d1df30eadf264231e3b65...d7b5ac76dc95ddf30e707d26998e36303e9f52a7 - -------------------------------------------------------------------- -Tue Sep 29 16:37:40 UTC 2020 - Franck Bui - -- Ship {/usr/lib,/etc}/systemd/network directories in the main package - - These directories can be used by both udevd and networkd. - -------------------------------------------------------------------- -Thu Sep 17 15:12:48 UTC 2020 - Franck Bui - -- Remove dangling symlink - /usr/lib/systemd/system/sockets.target.wants/systemd-journald-audit.socket - - Otherwise the build system complains. - -------------------------------------------------------------------- -Thu Sep 17 12:50:27 UTC 2020 - Franck Bui - -- Import commit 1cab0d44584687ace92d1df30eadf264231e3b65 (include v246.5) - - 304ec2c7ab fstab-generator: add 'nofail' when NFS 'bg' option is used (bsc#1176513) - 6ae277fb37 test: adapt TEST-21-SYSUSERS for SUSE - acd8bfd2cc test: adapt TEST-13-NSPAWN-SMOKE for SUSE - [...] - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/a4e393eecb9dbe140a6c7d57419c291d786155cf...1cab0d44584687ace92d1df30eadf264231e3b65 - -------------------------------------------------------------------- -Wed Sep 16 14:07:56 UTC 2020 - Franck Bui - -- Drop 0001-udev-temporarly-restore-the-creation-a-few-symlinks-.patch - - linuxrc has already been fixed. - -------------------------------------------------------------------- -Wed Sep 16 13:42:04 UTC 2020 - Franck Bui - -- Add 0001-udev-temporarly-restore-the-creation-a-few-symlinks-.patch - - A temporary patch until the installer environment is updated to - create some of the symlinks that udevd used to create during its - startup but now udevd relies on the init system to do so. - -------------------------------------------------------------------- -Thu Sep 10 12:59:54 UTC 2020 - Franck Bui - -- Rework how we prevent journald from both enabling auditd and - recording audit messages - - journald.conf gained a new setting Audit= to control whether - journald enables audit during the boot process. So let's use it and - make sure it's disabled by default by shipping a drop-in that - overrides upstream default. - - Also we used to patch systemd to prevent journald from reading the - audit messages. There's still no way for downstream to configure - that properly (we would need to mask systemd-journald-audit.socket - meaning shipping a symlink in /etc) but I think dropping - systemd-journald-audit.socket from the package is a nicer way to do - that as some users might choose to reenable this setting (by - reintroducing the socket unit in /etc). - -------------------------------------------------------------------- -Thu Sep 10 09:02:13 UTC 2020 - Franck Bui - -- Enable audit support (bsc#1175883) - - Enabling audit support in systemd will only make PID1 (and some of - its services) to generate some audit records for certain events. But - it doesn't affect journald, which has been prevented from recording - audit messages in the journal (SUSE specific behavior). - -------------------------------------------------------------------- -Wed Sep 2 10:14:10 UTC 2020 - Franck Bui - -- Upgrade to v246.4 (commit f1344d5b7f31e98aedb01e606f41d74d3caaf446) - - See https://github.com/openSUSE/systemd/blob/SUSE/v246/NEWS for - details. - - Now that the number of SUSE specific patches has been shrinked and - is pretty low (12 at the time of this writing), they are no more - tracked by the git repo and are now handled at the package - level. Hence It is easier to maintain and identify them. This - effectively means that SUSE/v246 will contain upstream commits only. - - Added 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch - Added 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch - Added 0003-strip-the-domain-part-from-etc-hostname-when-setting.patch - Added 0004-tmpfiles-support-exclude-statements-based-on-file-ow.patch - Added 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch - Added 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch - Added 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch - Added 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch - Added 0009-pid1-handle-console-specificities-weirdness-for-s390.patch - Added 0010-journald-disable-audit-support-completely-from-the-j.patch - Added 0011-core-disable-session-keyring-per-system-sevice-entir.patch - Added 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch - -------------------------------------------------------------------- -Thu Aug 27 12:51:15 UTC 2020 - Fabian Vogt - -- Adjust %pre and %post for the restoration of upstream tmp.mount (boo#1175779) - -------------------------------------------------------------------- -Wed Aug 26 09:46:46 UTC 2020 - Franck Bui - -- Import commit a4e393eecb9dbe140a6c7d57419c291d786155cf - - d8e3bd4e22 Revert "core: don't send SIGKILL to user@.service immediatly during shutdown" - -------------------------------------------------------------------- -Tue Aug 25 14:32:16 UTC 2020 - Franck Bui - -- Drop requirement on 'sysvinit-tools' - - It was used to workaround bug #886599 by explicitly calling - vhangup(8) from getty@.service so when this service was stopped a - virtually hangup on the specified terminal when were stopped to give - the shell a few seconds to save its history. - - But this workaround was dropped since it had no effect (SLE12-GM was - released with it but was still suffering from the bug) and was - replaced by commit e9db43d5910717a108, which was released from v226 - and backported to SLE12/SLE12-SP1. - -------------------------------------------------------------------- -Thu Aug 20 10:24:37 UTC 2020 - Franck Bui - -- Import commit 6d6d92930acad63f9b9029c305a672c32c550d2d (include merge of v245.7) - - 797ad47d3e vconsole-setup: downgrade log message when setting font fails on dummy console (bsc#1172195 bsc#1173539) - [...] - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/b12cd8b89b4bccfcf972b47153a2b01cd7775932...6d6d92930acad63f9b9029c305a672c32c550d2d - -- Drop 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch - - Upstream finally reverted it and it's part of both v245.7 and master. - -------------------------------------------------------------------- -Tue Jul 28 13:38:09 UTC 2020 - Richard Brown - -- Restore default upstream tmp.mount (/tmp as tmpfs) behaviour (boo#1173461) - -------------------------------------------------------------------- -Wed Jun 24 06:33:33 UTC 2020 - Franck Bui - -- migrate-sysconfig-i18n.sh: fix marker handling (bsc#1173229) - - The marker is used to make sure the script is run only once. Instead - of storing it in /usr, use /var which is more appropriate for such - file. - - Also make it owned by systemd package. - -------------------------------------------------------------------- -Tue Jun 23 13:29:18 UTC 2020 - Franck Bui - -- Fix inconsistent file modes for some ghost files (bsc#1173227) - - Ghost files are assumed by rpm to have mode 000 by default which is - not consistent with file permissions set at runtime. - - Also /var/lib/systemd/random-seed was tracked wrongly as a - directory. - - Also don't track (ghost) /etc/systemd/system/runlevel*.target - aliases since we're not supposed to track units or aliases user - might define/override. - -------------------------------------------------------------------- -Fri Jun 19 09:59:29 UTC 2020 - Franck Bui - -- Include in the package version the stable minor (if any). - - Also update the version shown by various command such as 'systemctl - --version' to show the stable number. - -------------------------------------------------------------------- -Wed Jun 17 18:54:11 UTC 2020 - Franck Bui - -- Don't restart udevd sockets during package update - - Otherwise we might miss kernel events as the daemon need to be - stopped as well. - -------------------------------------------------------------------- -Wed Jun 17 09:03:40 UTC 2020 - Franck Bui - -- Import commit b12cd8b89b4bccfcf972b47153a2b01cd7775932 (include merge of v245.6) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/a6d31d1a02c2718a064bbbc40d003668acf72769...b12cd8b89b4bccfcf972b47153a2b01cd7775932 - -------------------------------------------------------------------- -Thu Jun 4 15:29:03 UTC 2020 - matthias.gerstner@suse.com - -- no longer explicitly package setgid directory /var/log/journal (bsc#1172550). - The bit will be set during %post by way of the systemd-tmpfiles invocation. - This avoids a conflict with the permissions package and an rpmlint error - popping up. - -------------------------------------------------------------------- -Fri May 29 14:32:41 UTC 2020 - Franck Bui - -- Fix build when resolved is disabled - - While at it sort the build conditionals. - -------------------------------------------------------------------- -Thu May 28 09:30:33 UTC 2020 - Franck Bui - -- Import commit a6d31d1a02c2718a064bbbc40d003668acf72769 - - bb6e2f7906 pid1: update manager settings on reload too (bsc#1163109) - e9e8907b06 watchdog: reduce watchdog pings in timeout interval - 385a8f9846 udev: rename the persistent link for ATA devices (bsc#1164538) - 66018a12ae tmpfiles: remove unnecessary assert (bsc#1171145) - -------------------------------------------------------------------- -Mon May 25 08:47:22 UTC 2020 - Franck Bui - -- Disable bump of /proc/sys/fs/nr-open - - Hopefully a _temporary_ workaround until bsc#1165351 is fixed - otherwise user instances crashes the system is using NIS (and the - nscd cache is empty). - -------------------------------------------------------------------- -Mon Apr 27 15:45:50 UTC 2020 - Franck Bui - -- Drop legacy /sbin/{udevd,udevadm) symlinks hopefully for good - - Since boo#1160890 has been fixed since a couple of months now. - -------------------------------------------------------------------- -Mon Apr 27 14:50:36 UTC 2020 - Franck Bui - -- Drop content of /usr/share/factory/ (bsc#1170146) - - systemd ships several files in /usr/share/factory/etc that are - copied to /etc in case those files are missing there. Unfortunately - the content does not match the openSUSE defaults. - -------------------------------------------------------------------- -Mon Apr 27 14:33:35 UTC 2020 - Franck Bui - -- Drop most of the tmpfiles that deal with generic paths (bsc#1078466 bsc#1181831) - - They are problematic because some of them conflict with SUSE - defaults. Therefore it seems better to let the revelant packages - owning these paths to provide their own definitions instead. - - Meanwhile we still keep the homeless definitions in suse.conf until - a better place is found for them. - - Drop 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch - Drop 0001-SUSE-policy-do-not-clean-tmp-by-default.patch - -------------------------------------------------------------------- -Fri Apr 24 07:38:48 UTC 2020 - Franck Bui - -- Drop %tmpfiles_create portables.conf from %post of networkd sub-package - - It was probably mistakenly added because systemd-portable served as - template for systemd-network. - -------------------------------------------------------------------- -Thu Apr 23 14:17:31 UTC 2020 - Franck Bui - -- Import commit 08cd65ac385c884ed6e4bd71128a0796f56ecd17 (include merge of v245.5) - - 1ceedf8535 meson: fix build of udev 'path_id_compat' builtin with meson 0.54 - e61569d4a9 pid1: by default make user units inherit their umask from the user manager (bsc#1162698) - 64fdacd5f1 user-util: rework how we validate user names (bsc#1170272) - [...] - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/c5aa158173ced05201182d1cc18632a25cf43b94...08cd65ac385c884ed6e4bd71128a0796f56ecd17 - -------------------------------------------------------------------- -Thu Apr 23 14:00:42 UTC 2020 - Franck Bui - -- Drop 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch - - It's been merged in 'openSUSE-Factory' branch otherwise this branch - won't build anymore since meson has been upgraded to version 0.54 in - Factory. - -------------------------------------------------------------------- -Wed Apr 15 19:06:27 UTC 2020 - Franck Bui - -- Switch back to the hybrid hierarchy - - Unfortunately Kubernetes and runc are not yet ready for - cgroupsv2. Let's reconsider the unified hierarchy in a couple of - months. - -------------------------------------------------------------------- -Mon Apr 6 12:42:01 UTC 2020 - Franck Bui - -- Import commit c5aa158173ced05201182d1cc18632a25cf43b94 (merge v245.4) - -------------------------------------------------------------------- -Mon Apr 6 10:02:33 UTC 2020 - Franck Bui - -- Add 0001-meson-fix-build-of-udev-path_id_compat-builtin-with-.patch - -------------------------------------------------------------------- -Thu Mar 19 09:32:41 UTC 2020 - Franck Bui - -- Import commit 31f82b39c811b4f731c80c2c2e7c56a0ca924a5b (merge v245.2) - - d1d3f2aa15 docs: Add syntax for templated units to systemd.preset man page - 3c69813c69 man: add a tiny bit of markup - bf595e788c home: fix segfault when parsing arguments in PAM module - e110f4dacb test: wait a bit after starting the test service - e8df08cfdb fix journalctl regression (#15099) - eb3a38cc23 NEWS: add late note about job trimming issue - 405f0fcfdd systemctl: hide the 'glyph' column when --no-legend is requested - 1c7de81f89 format-table: allow hiding a specific column - b7f2308bda core: transition to FINAL_SIGTERM state after ExecStopPost= - 2867dfbf70 journalctl: show duplicate entries if they are from the same file (#14898) - [...] - -------------------------------------------------------------------- -Wed Mar 18 14:09:57 UTC 2020 - Franck Bui - -- Upgrade to v245 (commit 74e2e834b4282c9bbdc12014f6ccf8d86e542b8d) - - See https://github.com/openSUSE/systemd/blob/SUSE/v245/NEWS for - details. - - This includes the following bug fixes: - - - upstream commit 7f56982289275ce84e20f0554475864953e6aaab (CVE-2020-1712) - - upstream commit 66a19d85a533b15ed32f4066ec880b5a8c06babd (bsc#1157315) - - upstream commit 7f56982289275ce84e20f0554475864953e6aaab (bsc#1162108) - - The new tools provided by systemd repart, userdb, homed, fdisk, - pwquality, p11kit feature have been disabled for now as they require - reviews first. - - Default to the "unified" cgroup hierarchy. Indeed most prominent - users of cgroup (such as libvirt, kubic) should be ready for such - change. It's still possible to switch back to the old "hybrid" - hierarchy by passing "systemd.unified_cgroup_hierarchy=0" option to - the kernel command line though. - - Added 0001-Revert-job-Don-t-mark-as-redundant-if-deps-are-relev.patch: - upstream commit 097537f07a2fab3cb73aef7bc59f2a66aa93f533 has been - reverted for now on as it introduced a behavior change which has - impacted plymouth at least. - -------------------------------------------------------------------- -Fri Mar 13 13:15:10 UTC 2020 - Elisei Roca - -- add systemd-network-generator.service file together with systemd-network-generator binary - -------------------------------------------------------------------- -Wed Feb 19 17:24:35 UTC 2020 - Ludwig Nussel - -- move html documentation to sparate package to save space -- move networkd and resolved binaries into correct subpackage - -------------------------------------------------------------------- -Thu Feb 6 14:15:01 UTC 2020 - Franck Bui - -- Import commit f8adabc2b1f3e3ad150e7a3bfa88341eda5a8a57 (merge v244.2) - - 77c04ce5c2 hwdb: update to v245-rc1 - b4eb884824 Fix typo in function name - e2d4cb9843 polkit: when authorizing via PK let's re-resolve callback/userdata instead of caching it - 83bfc0d8dd sd-bus: introduce API for re-enqueuing incoming messages - 5926f9f172 polkit: use structured initialization - 0697d0d972 polkit: on async pk requests, re-validate action/details - 2589995acd polkit: reuse some common bus message appending code - 5b2442d5c3 bus-polkit: rename return error parameter to ret_error - 0a19ff7004 shared: split out polkit stuff from bus-util.c → bus-polkit.c - 1325dfb577 test: adapt to the new capsh format - 3538fafb47 meson: update efi path detection to gnu-efi-3.0.11 - 3034855a5b presets: "disable" all passive targets by default - c2e3046819 shared/sysctl-util: normalize repeated slashes or dots to a single value - 6f4364046f dhcp6: do not use T1 and T2 longer than one provided by the lease - 0ed6cda28d network: fix implicit type conversion warning by GCC-10 - f6a5c02d26 bootspec: parse random-seed-mode line in loader.conf - ddc5dca8a7 sd-boot: fix typo - 2bbbe9ae41 test: Synchronize journal before reading from it - 072485d661 sd-bus: fix introspection bug in signal parameter names - 80af3cf5e3 efi: fix build. - [...] - -------------------------------------------------------------------- -Mon Feb 3 14:52:51 UTC 2020 - Franck Bui - -- Use suse.pool.ntp.org server pool on SLE (jsc#SLE-7683) - -------------------------------------------------------------------- -Tue Jan 21 16:01:09 UTC 2020 - Franck Bui - -- Drop scripts-udev-convert-lib-udev-path.sh - - Nobody should need it these days. - -------------------------------------------------------------------- -Tue Jan 14 14:21:40 UTC 2020 - Franck Bui - -- Temporarily restore /sbin/{udevd,udevadm) obsolete symlinks - - They're restored until YaST stop using them (see boo#1160890) - -------------------------------------------------------------------- -Tue Jan 14 13:56:31 UTC 2020 - Franck Bui - -- Import commit 8254b8d9646f3e0f5f8057d1ffb5d6c20f079aaa (merge v244.1) - - 639dc9f4bf network: set ipv6 mtu after link-up or device mtu change - cbced49daa man: fix typo in net-naming-scheme man page - 7dd04c99b0 network: tc: drop unused element - bf4b7d07ba man: fix typos (#14304) - 1ba2e7a730 ipv4ll: do not reset conflict counter on restart - 49806bb310 macro: avoid subtraction overflow in ALIGN_POWER2() - c4c1600689 test-network: add a test case for SendOption= - 6f15b45949 network: fix segfault in parsing SendOption= - 2e531b830d seccomp: real syscall numbers are >= 0 - f7616ed52b network: fix copy and paste mistake - e8b53300c4 network: do not drop foreign config if interface is in initialized state - 00f05813bf seccomp: mmap test results depend on kernel/libseccomp/glibc - 4de1909e61 seccomp: use per arch shmat_syscall - d83010521d seccomp: ensure rules are loaded in seccomp_memory_deny_write_execute - 2c6568221a seccomp: fix multiplexed system calls - bcf0aa02bf Fix typo (duplicate "or") - 96d7083c54 network: if /sys is rw, then udev should be around - e874419902 nspawn: do not fail if udev is not running - 29c9144655 Create parent directories when creating systemd-private subdirs - 9cbb8b5254 network: do not return error but return UINT64_MAX if speed meter is disabled - c08429ae33 core: swap priority can be negative - f25c0be335 networkctl: fix to show BSSID - 65fd2fce59 systemctl: enhance message about kexec missing kernel - bdd0af5f81 Fixup typo in NEWS - -------------------------------------------------------------------- -Wed Dec 11 17:20:04 UTC 2019 - Franck Bui - -- Manually set system-uid-max and system-gid-max to 499 - - It used to be detected automatically by meson but it's been broken - by the migration of login.defs from /etc to /usr/etc. - -------------------------------------------------------------------- -Wed Dec 11 17:01:57 UTC 2019 - Franck Bui - -- Import commit d8f6a204858bff68b8e0e7be86b418c36087ab2e - - 6c5e492a65 cryptsetup: umount encrypted devices before detaching it during shutdown - -------------------------------------------------------------------- -Thu Dec 5 14:00:03 UTC 2019 - Franck Bui - -- Upgrade to v244 (commit 090da85161ceb1ba0b4c208963c7156a8fdf10c6) - - See https://github.com/openSUSE/systemd/blob/SUSE/v244/NEWS for - details. - - This includes the following bug fixes: - - - upstream commit b49e14d5f3081dfcd363d8199a14c0924ae9152f (bsc#1139459) - - upstream commit 22683674716fd0e5b016ce5a7d8fd90df5f9f9e7 (bsc#1151377) - - upstream commit faf205de3ba9a11b0ba17682123d7f3fedc7da24 (bsc#1151377) - - upstream commit 27c3112dcbd1b5f171c36c32550d9c6331375b0b (bsc#1155574) - - upstream commit 21b40f16622f171a9969dc334d74fb5eb2f575c2 (bsc#1159814) - - upstream commit 9b88bb5023dfa3cea406c14fdaa3d8e3e320907a (jsc#SLE-7689) - - upstream commit bc9ecd484f1ebfe0de8b567c90f6cd867fbd5894 (bsc#1141597) - - Legacy and obsolete symlinks have been finally dropped. - - Dropped 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch. - Users were notified about the deprecation of UserTasksMax option and - how to move to the new mechanism. The dropin replacement for - UserTasksMax is therefore no more generated but its use still - produces a warning. - - Added 0001-SUSE-policy-do-not-clean-tmp-by-default.patch and - 0001-Fix-run-lock-group-to-follow-openSUSE-policy.patch. - These patches were extracted from the git repo because it's not - clear where the SUSE tmpfiles specificities should be located. - -------------------------------------------------------------------- -Tue Dec 3 16:56:31 UTC 2019 - Franck Bui - -- Import commit dbb1d4734daffa62e0eddecfa4f784c84a9d8e76 - - 1439d72a72 udevd: don't use monitor after manager_exit() - 99288dd778 Revert "udevd: fix crash when workers time out after exit is signal caught" - 152577d6d0 udevd: fix crash when workers time out after exit is signal caught - f854991504 udevd: wait for workers to finish when exiting (bsc#1106383) - - Changes from the v243-stable (84 commits): - - e51d9bf9e5 man: add entry about SpeedMeter= - aa1fc791c7 udev: silence warning about PROGRAM+= or IMPORT+= rules - b9a619bb67 udevadm: ignore EROFS and return earlier - 1ec5b9f80c basic: add vmware hypervisor detection from device-tree - 7fa7080248 umount: be happy if /proc/swaps doesn't exist - [...] - 47d0e23d26 udev: fix memleak caused by wrong cleanup function - a6fb0542c5 parse_hwdb: fix compatibility with pyparsing 2.4.* - cb1d892f17 parse_hwdb: process files in order - -------------------------------------------------------------------- -Tue Nov 12 14:15:03 UTC 2019 - Franck Bui - -- Import commit 0b715187a87907e18edf98eab9d0a50fced4a424 - - 9dbdbc2f10 logind: fix (again) the race that might happen when logind restores VT (bsc#1101591 bsc#1140081) - c848bec110 libblkid: open device in nonblock mode. (bsc#1084671) - b70ad6c927 resolved: check for IP in certificate when using DoT with GnuTLS (bsc#1155539 CVE-2018-21029) - bbedf3d557 resolved: require at least version 3.6.0 of GnuTLS for DNS-over-TLS - eb732c2e29 resolved: fix connection failures with TLS 1.3 and GnuTLS - 4e45084ac5 shared/install: failing with -ELOOP can be due to the use of an alias in install_error() - 2e297f0d87 shared/install: fix error codes returned by install_context_apply() - dd29d70d32 man: alias names can't be used with enable command - -------------------------------------------------------------------- -Tue Nov 5 10:56:54 UTC 2019 - Franck Bui - -- Fix %{_libexecdir} misuses of /usr/lib - -------------------------------------------------------------------- -Thu Oct 31 07:38:55 UTC 2019 - Franck Bui - -- Drop 0001-compat-rules-escape-when-used-for-shell-expansion.patch - - It's part of the previous import. - -------------------------------------------------------------------- -Thu Oct 31 07:32:47 UTC 2019 - Franck Bui - -- Import commit b7467b7b553d6d0d6f92758d966b69f1a88b6b42 - - 441f44f371 fileio: introduce read_full_virtual_file() for reading virtual files in sysfs, procfs (bsc#1133495) - 8a1bb5c66b swap: do not make swap units wanted by its device unit anymore - -------------------------------------------------------------------- -Tue Oct 29 10:35:03 UTC 2019 - Franck Bui - -- Import commit 5df9000899ef7d45ddbcacd0fdf73afa07a40f6b - - f0ed7237e4 udev/cdrom_id: Do not open CD-rom in exclusive mode. (bsc#1154256) - b37054aa5a compat-rules: escape '$' when used for shell expansion - - Changes from the v243-stable: - - ef677436aa test: Pass personality test even when i686 userland runs on x86_64 kernel - 3f6398c450 docs: fix inadvertent change in uid range - 25bb377a73 cgroup: fix typo in BPF firewall support warning message - 6d97aca0d5 fix build with compilers with default stack-protector enabled - fbad077cec nspawn: surrender controlling terminal to PID2 when using the PID1 stub - 0553c3c668 pid1: fix DefaultTasksMax initialization - f406a691a7 src/core/automount: use DirectoryMode when calling mkdir -p - 20438f96c3 udevadm trigger: do not propagate EACCES and ENODEV - 6480630bc3 hwdb: Correct WWWW Pattern In Documentation Comment - 9d8e889810 nspawn: consistenly fail if parsing the environment fails - 40e169b304 nspawn: default to unified hierarchy if --as-pid2 is used - b5df1037a0 cgroup: Mark memory protections as explicitly set in transient units - f14e3e02cc cgroup: Respect DefaultMemoryMin when setting memory.min - ea248e53bf cgroup: Check ancestor memory min for unified memory config - de1d25a506 cgroup: docs: memory.high doc fixups - 2ab45f38d8 cgroup: docs: Mention unbounded protection for memory.{low,min} - 19a43dc38a Consider smb3 as remote filesystem - 5c0224c7bf Handle d_type == DT_UNKNOWN correctly - 8282bc61df util-lib: Don't propagate EACCES from find_binary PATH lookup to caller - 9d0ae987a6 network: drop noisy log message - f67f0e4ec4 Updated log message when the timesync happens for the first time (#13624) - e151bf4674 units: make systemd-binfmt.service easier to work with no autofs - 2b8e574d82 Corect man page reference in systemd-nologin.conf comments - a0577353f1 man: Add a missing space in machinectl(1) - 693e983988 log: Add missing "%" in "%m" log format strings - ea7151b8c4 pid1: do not warn if /run/systemd/relabel-extra.d/ doesn't exist - b90549290e man: fix typo - -------------------------------------------------------------------- -Tue Oct 22 22:25:34 UTC 2019 - Stefan Brüns - -- Remove intltool BuildRequires, not needed since v237 -- Use python3-base BuildRequires instead of full python3 - -------------------------------------------------------------------- -Mon Oct 21 10:33:27 UTC 2019 - Franck Bui - -- Add 0001-compat-rules-escape-when-used-for-shell-expansion.patch (bsc#1153648) - - Added to the quaratine area to avoid uploading a new tar ball just - for that single change. It will be dropped during the next import. - -------------------------------------------------------------------- -Mon Oct 21 09:06:10 UTC 2019 - Ludwig Nussel - -- don't package locales in -mini package - -------------------------------------------------------------------- -Fri Oct 4 14:26:59 UTC 2019 - Franck Bui - -- Import commit 428b937f917ae177f2315e8469800941885e441a - - 0026b58744 pid1: fix DefaultTasksMax initialization - -------------------------------------------------------------------- -Mon Sep 30 10:43:28 UTC 2019 - Franck Bui - -- Import commit ed81f69153488279957268e247a5c81b678da491 (changes from v243-stable) - - fab6f010ac dhcp6: use unaligned_read_be32() - f2d9af4322 dhcp6: add missing option length check - ccf797511e ndisc: make first solicit delayed randomly - f2275b6e12 dhcp6: read OPTION_INFORMATION_REFRESH_TIME option - 6dfbe58ee7 l10n: update Czech Translation - d4cd0e9d32 sd-radv: if lifetime < SD_RADV_DEFAULT_MAX_TIMEOUT_USEC, adjust timeout (#13491) - dbefe59259 polkit: fix typo - a321507476 sd-netlink: fix invalid assertion - 45dca7fe86 network: do not enter failed state if device's sysfs entry does not exist yet - dd83d58796 network: add missing link->network checks - b294305888 path: stop watching path specs once we triggered the target unit - 2cd636c437 hwdb: add Medion Akoya E2292 (#13498) - d133bdd1fa po: update Brazilian Portuguese translation - 530e09b594 po: update Polish translation - 0c5c3e34c1 polkit: change "revert settings" to "reset settings" - 73e0f372d8 man: fix description of ARPIntervalSec= units - 5412cc54a1 hwdb: axis override for Dell 9360 touchpad - 9d4e658529 test: drop the missed || exit 1 expression - 7ed7ea82f6 udevadm: use usec_add() - 477bf86c91 udevadm: missing initialization of descriptor - 19ac31c989 networkd: unbreak routing_policy_rule_compare_func() - a20a2157a8 core: coldplug possible nop_job - eb55241742 tty-ask-pwd-agent: fix message forwarded to wall(1) - 1a3c53c06c core: Fix setting StatusUnitFormat from config files - 91db81e4dd network DHCP4: Dont mislead the logs. - 6af590838b Update m4 for selective utmp support. modified: tmpfiles.d/systemd.conf.m4 - 6823c907cf core: restore initialization of u->source_mtime - 29308bcc13 mount-setup: relabel items mentioned directly in relabel-extra.d - 8ca1e56165 Call getgroups() to know size of supplementary groups array to allocate - 5d84a7ad1c test: add test cases for empty string match - 1536348cc8 udev: fix multi match - 3ccafef0ad man: move TimeoutCleanSec= entry from .service to .exec - 8c0c30a820 zsh: udpate bootctl completions - 0556c247a2 resolved: fix abort when recv() returns 0 - 9a25d75520 man: remove repeated words - be3be29347 hwdb: Also mark lis3lv02d sensors in "HP" laptops as being in the base - 4b92ffccaa udev: also logs file permission - 75a2845e5a udev: add missing flag for OPTIONS=static_node - 19e9fc4262 network: do not abort execution when a config file cannot be loaded - 3e1267cf50 fileio: update warning message - 1b3156edd2 pstore: fix use after free - f500d2fa81 journal: Make the output of --update-catalog deterministic - 64d0f7042d travis: protect the systemd organization on Fuzzit from forks - 4247938ee1 hwdb: Mark lis3lv02d sensors in HP laptops as being in the base - 379158684a po: update Japanese translation - 31e1bbd1ca docs: fix push recipe in RELEASE.md - f06530d86b man/systemctl.xml: fix missing "not" - 22aba2b969 docs: fix typo in boot loader doc - 000e08ca70 pstore: fix typo in error message - directoy -> directory - f7f9c69ac5 Fix typo in comment: overide -> override - ca8ba8f8c0 po: update Polish translation - -------------------------------------------------------------------- -Mon Sep 23 11:45:18 UTC 2019 - Franck Bui - -- Some files related to the portable stuff were missing some %exclude - -------------------------------------------------------------------- -Thu Sep 19 08:49:59 UTC 2019 - Martin Vidner - -- Allow YaST to select Iranian (Persian, Farsi) keyboard layout - (bsc#1092920) - -------------------------------------------------------------------- -Wed Sep 18 14:59:16 UTC 2019 - Ludwig Nussel - -- split off networkd and resolved into separate network subpackage -- use separate lang package for translations - -------------------------------------------------------------------- -Wed Sep 18 12:17:37 UTC 2019 - Franck Bui - -- Import commit 9e41d7ec3572d8d5ea1e00f683e9fbf8108e85b4 - - fb1b9d54f9 tty-ask-pwd-agent: fix message forwarded to wall(1) - dd14da3bb6 core: restore initialization of u->source_mtime - d62f30f647 resolved: create /etc/resolv.conf symlink at runtime - -------------------------------------------------------------------- -Wed Sep 18 11:33:16 UTC 2019 - Franck Bui - -- Slighly rework (mostly reorganization) the portable stuff - -------------------------------------------------------------------- -Fri Sep 6 06:20:11 UTC 2019 - Franck Bui - -- Track 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch - in the git repo - - This patch has been in the quarantine area long enough, so let's - move it in the git repo. - -------------------------------------------------------------------- -Tue Sep 3 15:10:10 UTC 2019 - Franck Bui - -- Upgrade to v243 (commit e0b24c4356aa0c1c56ff274ff72228f33482a5be) - - See https://github.com/openSUSE/systemd/blob/SUSE/v243/NEWS for - details. - - This includes the following bug fixes: - - - upstream commit b2774a3ae692113e1f47a336a6c09bac9cfb49ad (CVE-2019-20386 bsc#1161436) - - upstream commit 5406c36844b35504a64e9f05fc74b8e5e5a09143 (bsc#1132400) - - upstream commit 83a32ea7b03d6707b8e5bb90a0b3a6eb868ef633 (bsc#1132721) - - upstream commit 7cc5ef5f1811c539ae7f20255c2a093f413cc64f (bsc#1172824 bsc#1142733) - - upstream commit 83cb24ac20baf19f7834931dcf6e03486b4c9c30 (bsc#1156213) - - upstream commit a2dcb1d78737d3daa301ee63fbdd02837acb71a8 (bsc#1158485) - - upstream commit 08185cff19efcb1d7d9fb7b546e7f516ab6dae91 (bsc#1165011) - - upstream commit 59c55e73eaee345e1ee67c23eace8895ed499693 (bsc#1177510) - - Drop 0001-Revert-insserv.conf-generator.patch as it's been dropped - from branch SUSE/v243 while we were rebasing. - - Drop 0001-rc-local-generator-deprecate-halt.local-support.patch as - this functionality had been deprecated during the previous release - and now have been dropped by upstream. - -------------------------------------------------------------------- -Wed Aug 14 14:25:43 UTC 2019 - Ludwig Nussel - -- enable systemd-portabled - -------------------------------------------------------------------- -Wed Jul 31 14:38:13 UTC 2019 - Franck Bui - -- systemd-container creates and owns /etc/systemd/nspawn now - -------------------------------------------------------------------- -Mon Jul 22 15:29:51 UTC 2019 - Franck Bui - -- Import commit 0f9271c1336c5c9055e75389732a44745d796851 (changes from v242-stable) - - 07f0549ffe network: do not send ipv6 token to kernel - 9d34e79ae8 systemd-mount: don't check for non-normalized WHAT for network FS - 5af677680c core: set fs.file-max sysctl to LONG_MAX rather than ULONG_MAX (bsc#1142099) - 29dda7597a random-util: eat up bad RDRAND values seen on AMD CPUs - eb6c17c178 util-lib: fix a typo in rdrand - 829c20dc8e random-util: rename "err" to "success" - 5442366fbf man: rework the description of Aliases and .wants/.requires directories - ae71c6f634 docs: typo in arg name replace-irreversible -> replace-irreversibly - 09774a5fcb meson: make nologin path build time configurable - 69ffeeb0b1 man: add note about systemctl stop return value - 4cf14b5513 shared/conf-parser: say "key name" not "lvalue", add dot - 4481ca7f86 shared/conf-parser: emit a nicer warning for something like "======" - 46f3db894b shared/conf-parser: be nice and ignore lines without "=" - 7d928995f7 nspawn: fix memleak in argument parsing - 7727e6c0ae resolve: fix memleak - 7f32a81976 journal: properly read unaligned le64 integers - fa419099e5 activate: move array allocation to heap - 815a9fef2a systemctl: print non-elapsing timers as "n/a" not "(null)" - a4fc3c88f1 factory: include pam_keyinit.so in PAM factory configuration - a453d63315 factory: add comment to PAM file, explaining that the defaults are not useful - d9a5a70a59 factory: tighten PAM configuration - 5e2d3bf80b test: make sure colors don't confuse our test - 5fe3be1334 wait-online: change log level - c49b6959d5 systemctl: emit warning when we get an invalid process entry from pid1 and continue - 3c9f43eb03 systemctl: do not suggest passing --all if the user passed --state= - 5964d1474e man: offline-updates: make dependence on system-update.target explicit - a04dd26e03 alloc-util: drop _alloc_ decorator from memdup_suffix0() - 7c46a694ca man: add example for setting multiple properties at once - 1d72789271 man: CPUShares= is so 2015 - 45da304673 man: document that WakeSystem= requires privs - bed58a06e4 man: document that "systemd-analyze blame/critical-chain" is not useful to track down job latency - c5461f31b3 man: be more explicit that Type=oneshot services are not "active" after starting - 455ee07abe man: document that the supplementary groups list is initialized from User='s database entry - 5f0cb2616a alloc-util: drop _alloc_(2, 3) decorator from memdup_suffix0_multiply() - 7bc336794d generator: downgrade Requires= → Wants= of fsck from /usr mount unit - 66465c4381 systemctl: allow "cat" on units with bad settings - ca937b49da pid1: fix serialization/deserialization of commmands with spaces - 4bb3113023 growfs: call crypt_set_debug_level() correctly, skip if not needed - 0db716771e cryptsetup: enable libcryptsetup debug logging if we want it - c8b9b3956f cryptsetup: set libcryptsetup global log callback too - 679b3f6b7f basic/log: fix SYSTEMD_LOG_* parsing error messages - 8d6b5158aa units: add SystemCallErrorNumber=EPERM to systemd-portabled.service - 6681fcd445 network: fix the initial value of the counter for brvlan - 853ec5f458 man: Add some notes about variable $prefix for StateDirectory= - e6d23358e9 sd-netlink: fix inverted log message - 6feb862407 blockdev: filter out invalid block devices early - 9f7c0dbc75 blockdev-util: propagate actual error - 3f5355bcb9 man: document tmpfiles.d/ user/group resolvability needs - c15b92cd98 man: fix wrong udev property name - 9768a900d6 meson: drop duplicated source - 15194f22ed cryptsetup-generator: fix luks-* entry parsing from crypttab - c2475390b4 core: skip whitespace after "|" and "!" in the condition parser - fdc754aeb7 shared/condition: fix printing of ConditionNull= - 572385e135 test: add testcase for issue #12883 - 9aa1edddb0 conf-parser: fix continuation handling - 8fbc72f45f networkd: fix link_up() (#12505) - -------------------------------------------------------------------- -Mon Jul 1 15:14:58 UTC 2019 - Franck Bui - -- State directory of systemd-timesync might become inaccessible after upgrading to v240+ (bsc#1137341) - - This happens for users who had previously used systemd-timesync with - DynamicUser=true, ie the ones who upgraded from a systemd version - between v235 and v239 to systemd v240 and later (v240 was the - version where DynamicUser was switched back to OFF). - -------------------------------------------------------------------- -Tue May 28 11:53:30 UTC 2019 - Franck Bui - -- Import commit eaa7b8b148927d471609de75e542dffcc1b36df4 - - 7e58b89136 udevd: change the default value of udev.children-max (again) (bsc#1107617) - -------------------------------------------------------------------- -Tue May 28 09:51:30 UTC 2019 - Franck Bui - -- Add 0001-rc-local-generator-deprecate-halt.local-support.patch - - /etc/init.d/halt.local support will removed from the next systemd - version (v243) so for now on warn (hopefully the few) users who rely - on this script so they have a chance to switch to systemd-shutdown - interface. - -------------------------------------------------------------------- -Mon May 27 09:33:45 UTC 2019 - Franck Bui - -- Add 0001-Revert-insserv.conf-generator.patch (bsc#1052837) - - All remaining packages have been fixed so they don't rely on the - insser-generator to generate proper deps. So let's drop it as all - services should carry the proper dependencies itself. - -------------------------------------------------------------------- -Mon May 27 09:30:05 UTC 2019 - Franck Bui - -- Drop debug-only-remove-new-policies.patch - - The new DBUS methods have been reviewed by the security team. - -------------------------------------------------------------------- -Tue May 14 14:27:12 UTC 2019 - Franck Bui - -- Import commit 9984a86d0d2259d54c7060f9c09f214202b4efa7 - - f2459bf373 random-util: eat up bad RDRAND values seen on AMD CPUs - c90a2e9793 util-lib: fix a typo in rdrand - 4db1cc9d46 random-util: rename "err" to "success" - 981a62a102 random-util: hash AT_RANDOM getauxval() value before using it - 64a9c3d918 random-util: use gcc's bit_RDRND definition if it exists - c5d6ecfdca random-util: rename RANDOM_DONT_DRAIN → RANDOM_MAY_FAIL - 298d13df7e network: remove redunant link name in message - 77cbde31f2 hwdb: Align airplane mode toggle key mapping for all Acer series - 460f03794e Revert "hwdb: Apply Acer mappings to all Gateway and Packard Bell models" - fe9271ad84 test: return a non-zero return code when 'nobody' user doesn't exist - 29d355e755 fstab-generator: Prevent double free of reused FILE* - f30f1adc11 meson: make source files including nspawn-settings.h depend on libseccomp - 84bab914b8 alloc-util: don't use malloc_usable_size() to determine allocated size - 5240972d8d units: drop reference to sushell man page - 0a26de5e33 codespell: fix spelling errors - 582de105c8 nspawn-expose-ports: fix a typo in error message - -------------------------------------------------------------------- -Mon May 13 08:46:38 UTC 2019 - Franck Bui - -- Buildrequire polkit so /usr/share/polkit-1/rules.d has an owner (bsc#1145023) - - Otherwise the "post build checks" would complain and would force - systemd to own this directory. The owner should still be "polkit" - and the perms should be in sync with the perm set by polkit - itself. - -------------------------------------------------------------------- -Thu May 9 07:13:44 UTC 2019 - Franck Bui - -- Add debug-only-remove-new-policies.patch - - A temporary patch to suppress the new DBUS methods introduced by - v242 until they are reviewed and whitelisted by the secteam. - -------------------------------------------------------------------- -Thu May 9 07:11:08 UTC 2019 - Franck Bui - -- Add a comment explaining why static enablement symlinks in /etc are suppressed - - Also remove any /etc/systemd/system/*.requires/ symlinks for the - same reason. - -------------------------------------------------------------------- -Thu May 2 15:24:45 UTC 2019 - Franck Bui - -- preset remote-cryptsetup.target during package installation - - This target is supposed to be part of the targets that should be - enabled (or not depending on the presets) at package installation. - -------------------------------------------------------------------- -Thu May 2 13:12:23 UTC 2019 - Franck Bui - -- Upgrade to v242 (commit 071c380dcc434dca2a0c8b6de0519cc9e816c6d6) - - See https://github.com/openSUSE/systemd/blob/SUSE/v242/NEWS for - details. - - This includes the following bug fixes: - - - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (CVE-2019-3843) - - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (CVE-2019-3844) - - upstream commit 37ed15d7edaf59a1fc7c9e3552cd93a83f3814ef (bsc#1124122) - - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (bsc#1133506) - - upstream commit bf65b7e0c9fc215897b676ab9a7c9d1c688143ba (bsc#1133509) - - upstream commit 1f82f5bb4237ed5f015daf93f818e9db95e764b8 (bsc#1150595) - - upstream commit e55bdf9b6c5f72475b258a7a4585a0480551cb60 (bsc#1173422) - -------------------------------------------------------------------- -Wed Apr 24 07:23:44 UTC 2019 - Franck Bui - -- Drop "BuildRequires: -post-build-checks" from the specfile (bsc#1130230) - - The syntax of this directive is obsolete and should be replaced by - "#!BuildIgnore: post-build-checks". - - However there's no good reasons to disable these SUSE extra checks, - so let's re-enable them and fix the few errors it detected. - -------------------------------------------------------------------- -Fri Apr 12 14:13:54 UTC 2019 - Franck Bui - -- Import commit 4e6e66ea94cf5125f9044f0869939a86801ed2d8 - - 430877e794 pam-systemd: use secure_getenv() rather than getenv() (bsc#1132348 CVE-2019-3842) - 3cff2e6514 man: document that if the main process exits after SIGTERM we go directly to SIGKILL - 26c4f7191c bus: fix memleak on invalid message - -------------------------------------------------------------------- -Tue Mar 19 16:11:44 UTC 2019 - Franck Bui - -- systemd-coredump: generate a stack trace of all core dumps (bsc#1128832 jsc#SLE-5933) - - This stack trace is logged to the journal. - -------------------------------------------------------------------- -Mon Mar 11 12:58:19 UTC 2019 - Franck Bui - -- Stop installing macros.systemd - - There're no points in installing this file if we remove it right - after. - -------------------------------------------------------------------- -Mon Mar 11 10:48:54 UTC 2019 - Franck Bui - -- Make sure systemd-network.rules take precedence over our polkit-default-privs (bsc#1125438) - -------------------------------------------------------------------- -Thu Mar 7 14:27:59 UTC 2019 - Franck Bui - -- Include the SUSE version along with the major version of systemd - - $ systemctl --version - systemd 241 (+suse.42.g15a1b4d58) - - Note that the SUSE version format maybe subject to change and as - such scripts should not try to parse it. - -------------------------------------------------------------------- -Wed Mar 6 14:59:22 UTC 2019 - Franck Bui - -- systemd-mini: explicitly disable some of the systemd components - - For some reasons, some build requirements get pulled in for the mini - variant now, enabling some parts of the code that were expected to - be turned OFF. - -------------------------------------------------------------------- -Tue Mar 5 17:51:02 UTC 2019 - Franck Bui - -- Upgrade to v241 (commit 15a1b4d58f1d2bc9c21c7cbab6fe63b58e48bda1) - - This includes the following bug fixes: - - - upstream commit c0d76959080e3ba6534bce1c7053c750668e8b55 (bsc#1160595) - - upstream commit 7334ade4a7e103b1a01d1c8fe1ea7c7a854a1c31 (bsc#1123892) - - upstream commit c7e93c4d15019323973baf12daa76357c83892c4 (boo#1111498) - - This also includes the following bug fixes released in v240: - - - upstream commit 2675747f3cdd6f1e6236bbb2f79abfa53fb307f1 (boo#1111498) - - upstream commit 9eb0fc32d6cb63e71f2cfc1e7dd34c3ede4b48a3 (bsc#1140631) - - upstream commit 1432d2dbdfa90963272a9b581dc4b55dd3ac514f (bsc#1155574) - - upstream commit 26e35b164b8d0603629b3d394554cfa728e8c3e4 (bsc#1169488) - - upstream commit a9fc640671ef60ac949f1ace6fa687ff242fc233 (fate#325697) - -------------------------------------------------------------------- -Tue Feb 19 11:08:13 UTC 2019 - Franck Bui - -- Import commit a1d86af7ed49dacef671e8ec8dae9472a8fa47f5 - - 92d860fc12 sysctl: Don't pass null directive argument to '%s' (bsc#1121563) - 1379e30d59 Allocate temporary strings to hold dbus paths on the heap (bsc#1125352 CVE-2019-6454) - b5569a03ae Refuse dbus message paths longer than BUS_PATH_SIZE_MAX limit. (bsc#1125352 CVE-2019-6454) - -------------------------------------------------------------------- -Fri Feb 15 09:58:17 UTC 2019 - Franck Bui - -- Import commit 01b4746d3c6f6cbf969fa2176c77ac3f616a7eda - - 7af53e005b sd-bus: if we receive an invalid dbus message, ignore and proceeed - 92dcbfdd7f bus: move BUS_DONT_DESTROY calls after asserts - a83e7b3b43 automount: don't pass non-blocking pipe to kernel. - 726127ea1d units: make sure initrd-cleanup.service terminates before switching to rootfs (bsc#1123333) - a6347a3cb6 core: Fix use after free case in load_from_path() (bsc#1121563) - 22e2550222 strv: rework FOREACH_STRING() macro (bsc#1121563) - 2ddd38f41a test,systemctl,nspawn: use "const char*" instead of "char*" as iterator for FOREACH_STRING() - c2c8333e0b strv: add new macro STARTSWITH_SET() - 1db243a601 Update systemd-system.conf.xml (bsc#1122000) - -------------------------------------------------------------------- -Tue Jan 15 09:04:47 UTC 2019 - Franck Bui - -- Import commit ad34cc45f63720ced69960dc66b47bddb146176d - - Import a bunch of fixes from stable/v239-stable: - - c8293f5af4 Revert "network: set DynamicUser= to systemd-networkd.service" - 7f605592e6 Revert "resolve: enable DynamicUser= for systemd-resolved.service" - 5a48e92e06 test: Fix networkd test for an already running service - 36eae1688b Revert "timesyncd: enable DynamicUser=" - 3a11f24cf0 Revert "unit: drop After=systemd-sysusers.service from timesyncd" - 23cfd15ce9 machinectl: fix verbosity of import-raw or friends - ba037daf29 Make bzip2 an optional dependency for systemd-importd - fb609d2721 pull: initialize libgcrypt before calling any functions provided by libgcrypt - c50857bc6b hwdb: remove stray 'i' in hwdb match string for the HP Spectre (#9571) - 9a12fd17f5 man: Mention that paths in unit files must be fully normalized. - 76fc2ab4a6 tree-wide: use instead of #ifdef for HAVE_* - fcc699c093 network: update log message - a4f497b2cd Use #if instead of #ifdef for ENABLE_GSHADOW - 121c662eb8 man: add missing option for system.conf - 564341146e core: add missing option and drop nonexistent option in system.conf - 7082a3599f journal: add missing option in journald.conf - 3c15efa9c1 basic: add missing comma in raw_clone assembly for sparc - 4c210b6dce cryptsetup: Add dependency on loopback setup to generated units - c777fbbe3e journal-gateway: use localStorage["cursor"] only when it has valid value - c5b1bef639 journal-gateway: explicitly declare local variables - 2361522ca6 analyze: actually select longest activated-time of services - 3e810d92d9 sd-bus: fix implicit downcast of bitfield reported by LGTM - aef660a4cf resolvconf: fixes for the compatibility interface - 06b3f54f50 install: fix error handling in is_symlink_with_known_name() - f70ab9a468 portable: fix error handling - d2c40d4e80 resolve: fix return value type of dns_answer_has_dname_for_cname() - 6f684e0670 resolve: dns_scope_network_good() does not returns negative errno - 15d83e1138 bus-util: fix error handling - ba0a1f3384 core: free lines after reading them - -------------------------------------------------------------------- -Thu Jan 10 15:54:22 UTC 2019 - Franck Bui - -- Import commit 3bece8a25ae11e8ec132cdecc7e72a00ee790994 - - 89a9721a47 Revert "logind: become the controlling terminal process before restoring VT" (bsc#1120836) - c3a8dc821b pam_systemd: reword message about not creating a session - 0ba0f5b3ef pam_systemd: suppress LOG_DEBUG log messages if debugging is off - -------------------------------------------------------------------- -Thu Jan 10 07:17:22 UTC 2019 - Franck Bui - -- Import commit a3b059a8c60622e4ec30aabda93c6b41d0953dc4 - - 9dbe9f12ec journal-remote: set a limit on the number of fields in a message (CVE-2018-16865 bsc#1120323) - 61d569ab1b journal-remote: verify entry length from header - a08760b26c µhttpd: use a cleanup function to call MHD_destroy_response - 43f46a1a3d journal-gateway: use _cleanup_ attribute to stop microhttpd daemon - 437b0b2d01 journald: lower the maximum entry size limit to ½ for non-sealed fds - ac9e209710 journald: when processing a native message, bail more quickly on overbig messages - ce103705b9 journald: set a limit on the number of fields (1k) (CVE-2018-16865 bsc#1120323) - 35538171c2 coredump: fix message when we fail to save a journald coredump - cfe247b555 basic/process-util: limit command line lengths to _SC_ARG_MAX - 9d59e6f6ee journald: do not store the iovec entry for process commandline on stack (CVE-2018-16864 bsc#1120323) - 8d650a68d4 journald: remove unnecessary {} - b608f532a4 coredump: remove duplicate MESSAGE= prefix from message - 0dbb2dc066 vconsole-setup: fonts copy will fail if the current terminal is in graphical mode (bsc#1114933) - e501d65540 Revert "systemctl: when removing enablement or mask symlinks, cover both /run and /etc" - d3ea69961f fs-util: rename safe_transition() into unsafe_transition() - 338470fdc9 tmpfiles: use CHASE_WARN in addition to CHASE_SAFE - d9ae1b30da fs-util: make chase_symlink() returns -ENOLINK when unsafe transitions are met - 8b76594d1f fs-util: add new CHASE_WARN flag to chase_symlinks() - -------------------------------------------------------------------- -Tue Dec 4 13:20:48 UTC 2018 - Franck Bui - -- Import commit 8ae56af7802ef8f91fac64fa244d62a4468fbbd5 - - 4474878178 udev-builtin-kmod: adjust logging - 805534aff5 core: use the generic module_load() function - ac7e902530 shared/module-util: fix preexisting mixup with errno sign - 415aa40793 udev-builtin-kmod: use the generic module_load() function - 8a36b4bac6 Move module-util.h to src/shared/ and load_module() to libshared - 999b910752 core/kmod-setup: restore comments - 1f2b822a21 logind: stop managing VT switches if no sessions are registered on that VT - 5ad8d374c5 terminal-util: introduce vt_release() helper - 145d492490 logind: become the controlling terminal process before restoring VT (bsc#1101591) - d4b5dbc033 terminal-util: introduce vt_restore() helper - 2e8af185f0 logind: make session_restore_vt() static - ff3048364f udev: downgrade message when we fail to set inotify watch up (bsc#1005023) - -------------------------------------------------------------------- -Fri Nov 23 13:30:03 UTC 2018 - Franck Bui - -- Fix the test for figuring out if /etc/machine-id is writable in %post (bsc#1117063) - - "test -w" always returns true for root user even if the writable - mode bits are not set. Fix this by testing the file mode bit value - instead. - -------------------------------------------------------------------- -Fri Nov 23 11:50:19 UTC 2018 - Franck Bui - -- Move systemd-sysv-convert from /usr/sbin to /usr/lib/systemd - - This tool is not supposed to be run by users. - -------------------------------------------------------------------- -Fri Nov 16 10:31:42 UTC 2018 - Franck Bui - -- Import commit 69f9f79e1b03e3d23df25b61cbcc9304af3e358f (bsc#1080919 CVE-2018-6954) - - f3615ce49 tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) - 7165e92f4 tmpfiles: use fd_get_path() even less excessively - c2c531c1d test: make TEST-22 easier to debug, by outputting to /dev/console - 621b78317 test: don't use "nobody:nogroup" for tests - 1f9c7acad tmpfiles: return correct error variable after fd_reopen() - 2236280c1 tmpfiles: reindent one comment less weirdly - f6bdfb889 tmpfiles: use correct error variable - bc75127cd tmpfiles: clarify that we ignore file attribute setting errors - 621c8b1fe tmpfiles: add log message where we previously failed silently - bc9229630 tmpfiles: use fd_get_path() less excessively - 5a1106039 tmpfiles: add more tests - c974086cc tmpfiles: don't follow unsafe transitions in path_set_*() - e64a510eb fs-util: add new CHASE_NOFOLLOW flag to chase_symlinks() - 7480154d0 tmpfiles: make create_fifo() safe - eb890962c fs-util: introduce mkfifoat_atomic() helper - 653bb81af fileio: make tempfn_random_child() accept empty string as path - 2b1e12bfe tmpfiles: introduce create_fifo() - 6dd80f289 tmpfiles: introduce empty_directory() - f2c137edf tmpfiles: introduce create_directory() and create_subvolume() and make them safe - 6a76f6dfb basic/stat-util: introduce is_dir_fd() - 38a7f2e81 btrfs-util: unfuck tmpfiles' subvol creation - 26e19b6fe btrfs-util: introduce btrfs_subvol_make_fd() - 5fb5bdf5d basic/label: introduce mkdirat_label()/mkdirat_errno_wrapper() helpers - 390b767da selinux: introduce mac_selinux_create_file_prepare_at() - 0f72fadba smack: introduce mac_smack_fix_at() - f2838154b tmpfiles: introduce create_directory_or_subvolume() - 2de697fb8 tmpfiles: make create_device() safe - 558c5fec7 tmpfiles: introduce create_device() - dee986b1d tmpfiles: make copy_files() safe - cacb14d3f tmpfiles: introduce copy_files() routine - 81c85ce17 tmpfiles: make write_one_file() safe - 9ec6b92ab tmpfiles: make truncate_file() safe - 8dde36e03 tmpfiles: introduce truncate_file() which deals with 'F' exclusively - 481134a93 tmpfiles: introduce create_file() which deals with 'f'/'F' exclusively - 057861560 tmpfiles: make the stat struct parameter in fd_set_*() optional - f37caffda tmpfiles: stat file in item_do() rather than in its callers - 86f1362d4 tmpfiles: set only default acls to folders #9545 (#9599) - -------------------------------------------------------------------- -Fri Nov 9 10:37:21 UTC 2018 - Franck Bui - -- Make systemd-mini-sysvinit provides systemd-sysvinit - - Some packages (such as shepherd-bins) want to conflicts with - systemd-sysvinit: they should also conflict with - systemd-mini-sysvinit. - -------------------------------------------------------------------- -Wed Nov 7 08:45:08 UTC 2018 - Franck Bui - -- Add 0001-logind-keep-backward-compatibility-with-UserTasksMax.patch - - We have to keep support for UserTasksMax= for a while before - dropping it. This patch is supposed to do that and also to make - users aware of this change. It also hints how to configure that - differently. - -------------------------------------------------------------------- -Wed Nov 7 07:05:31 UTC 2018 - Franck Bui - -- Import commit f39674d6d114d999c50672c7bea8cad21e1eaed9 - - 7d1e04e85 units: use =yes rather than =true everywhere - 185ce0d34 units: assign user-runtime-dir@.service to user-%i.slice - a051f5e41 units: make sure user-runtime-dir@.service is Type=oneshot - 30c6842c3 units: set StopWhenUnneeded= for the user slice units too - e74de046e login: fix typo in log message - -------------------------------------------------------------------- -Mon Nov 5 13:10:54 UTC 2018 - Franck Bui - -- Own %{_libexecdir}/modules-load.d (again) - - This was incorrectly dropped during the split of the SUSE specific - configurations. - -------------------------------------------------------------------- -Fri Nov 2 14:17:34 UTC 2018 - Franck Bui - -- Drop a Conflicts: in systemd-coredump - - It not needed anymore since the mini variant of systemd-coredump is - not built anymore. - -------------------------------------------------------------------- -Fri Nov 2 13:54:36 UTC 2018 - Franck Bui - -- Import commit b54f5d7a8b41898ce98f43cd1a6cc92c0071806d - - 5def29d24 coredump: only install coredump.conf when ENABLED_COREDUMP=true - 9133e2d6e dhcp6: make sure we have enough space for the DHCP6 option header (bsc#1113632 CVE-2018-15688) - ebc3fa418 dhcp6: split assert_return() to be more debuggable when hit - 51eefb6ac chown-recursive: let's rework the recursive logic to use O_PATH (bsc#1113666 CVE-2018-15687) - e1e1aa237 core: skip unit deserialization and move to the next one when unit_deserialize() fails - 1c726c87d core: when deserializing state always use read_line(…, LONG_LINE_MAX, …) (bsc#1113665 CVE-2018-15686) - 4cd7d11ac core: don't create Requires for workdir if "missing ok" (bsc#1113083) - -------------------------------------------------------------------- -Fri Nov 2 13:51:46 UTC 2018 - Franck Bui - -- Make systemd-coredump sub-package optional - - and don't build the mini variant. - -------------------------------------------------------------------- -Fri Nov 2 12:02:18 UTC 2018 - Franck Bui - -- Drop duplicated %{?mini} suffix for systemd-{container,coredump} subpackages - - "-mini" is already part of the name of the main package so there's - no need to append it again for those sub packages. It's only needed - when the name of a subpackage is completely redefined, IOW when '-n' - option is used with the %package directive. - -------------------------------------------------------------------- -Fri Nov 2 11:08:27 UTC 2018 - Franck Bui - -- Dont ship /usr/sbin/resolvconf symlink for now - - It conflicts with the bin shipped by openresolv and provides - limited compat only. - -------------------------------------------------------------------- -Wed Oct 24 10:07:36 UTC 2018 - Franck Bui - -- Upgrade to v239 (commit 6d8584e7e8e5d13d2bab49b9e6f6d2ec39759978) - - This includes the following bug fixes: - - - upstream commit 0722b359342d2a9f9e0d453875624387a0ba1be2 (bsc#1045723) - - upstream commit 2f2e14b251b9929e84e8b690d0187b766dfbae20 (bsc#1124122) - - upstream commit c839b729c5f7b08f6d91bf9567d0b1f91d17e0f7 (bsc#1155207) - - upstream commit 8eebb6a9e5e74ec0ef40902e2da53d24559b94a4 (bsc#1168076) - - This also includes the following bug fixes released in v238: - - - upstream commit e8a3144ec4ff332bd63644e468a98e1a7e06e7e4 (bsc#1112024) - - upstream commit 4d219f5343b1924e7c519c2c178aeb5d1a5ab924 (bsc#1123727) - - upstream commit 43b7f24b5e0dd048452112bfb344739764c58694 (bsc#1146991) - - upstream commit bf443be99565e4327f1c8c12b79d98b4c1529cf1 (bsc#1156213) - -------------------------------------------------------------------- -Mon Oct 15 16:23:05 UTC 2018 - Franck Bui - -- Ship systemd-sysv-install helper via the main package - - This script was part of systemd-sysvinit sub-package but it was - wrong since systemd-sysv-install is a script used to redirect - enable/disable operations to chkconfig when the unit targets are - sysv init scripts. Therefore it's never been a SySV init tool. - - While at it, don't ship this script (as well as - systemd-sysv-convert) when sysvcompat is not defined. - -------------------------------------------------------------------- -Mon Oct 15 15:01:48 UTC 2018 - Franck Bui - -- Import commit 19b3868d32af20f1ecc86fe3c997144ff456fd65 - - 06c2284d64 core: introduce systemd.early_core_pattern= kernel cmdline option - 479b002083 core: add missing 'continue' statement - c7fbccc62e journald: don't ship systemd-journald-audit.socket (bsc#1109252) - f17a6c790c detect-virt: do not try to read all of /proc/cpuinfo (bsc#1109197) - 5a1aa84544 compat-rules: generate more compat by-id symlinks for NVMe devices (bsc#1095096) - -------------------------------------------------------------------- -Fri Sep 28 06:16:06 UTC 2018 - fbui@suse.com - -- Import commit a67b516d49115a5be0f2ac27a2874cee6c59a7ae - - f8457adf9d emergency: make sure console password agents don't interfere with the emergency shell - b8bbb50634 man: document that 'nofail' also has an effect on ordering - a5410b2229 journald: take leading spaces into account in syslog_parse_identifier - b793c312c7 journal: do not remove multiple spaces after identifier in syslog message - f9595f0481 syslog: fix segfault in syslog_parse_priority() - d464f06934 journal: fix syslog_parse_identifier() - e70422883a socket-util: attempt SO_RCVBUFFORCE/SO_SNDBUFFORCE only if SO_RCVBUF/SO_SNDBUF fails (bsc#991901) - -------------------------------------------------------------------- -Fri Sep 28 06:05:03 UTC 2018 - Thomas.Blume@suse.com - -- split off SUSE specific udev rules from systemd package (fate#325478) - * remove 60-io-scheduler.rules - * remove 80-hotplug-cpu-mem.rules - * remove 99-wakeup-from-idle.rules - * remove /usr/lib/modules-load.d/sg.conf (see bsc#1036463 for details) - - these are now maintained in the new package system-tuning-common-SUSE - -------------------------------------------------------------------- -Fri Sep 14 12:55:49 UTC 2018 - fbui@suse.com - -- Enable or disable machines.target according to the presets (bsc#1107941) - -------------------------------------------------------------------- -Fri Sep 14 07:11:17 UTC 2018 - fbui@suse.com - -- Import commit cc55f1ea9e1c1ccab5b9fb97e10e08830d02b282 - - 962b38aaf user@.service: don't kill user manager at runlevel switch (bsc#1091677) - 3986c4d82 units: make sure user@.service runs with dbus still up - 5e68aa0f2 Revert "udevd: increase maximum number of children" (bsc#1107617) - 099138fd9 fix race between daemon-reload and other commands (v237) (bsc#1105031) - -------------------------------------------------------------------- -Tue Sep 11 07:30:24 UTC 2018 - fbui@suse.com - -- Import commit 6ac2232d88f4b64428511a4692a51bd00d610b32 - - 6247696db nspawn: always use mode 555 for /sys (bsc#1107640) - 72f558b57 cryptsetup: do not define arg_sector_size if libgcrypt is v1.x (#9990) - cfcd97cf2 cryptsetup: add support for sector-size= option (#9936) (fate#325634) - -------------------------------------------------------------------- -Wed Aug 8 13:26:03 UTC 2018 - fbui@suse.com - -- Import commit bb5a925bcefd4743873cae3f748ae1a426e92d44 - - 8983bd246 core: don't include libmount.h in a header file (#8580) - 3e4156a8f tmpfiles: don't adjust qgroups on existing subvolumes (bsc#1093753) - 42edc93ac core/service: rework the hold-off time over message - -------------------------------------------------------------------- -Wed Aug 1 12:19:40 UTC 2018 - fbui@suse.com - -- Enable regexp matching support - - Currently only used by "journalctl --grep=xxx". - -------------------------------------------------------------------- -Fri Jul 27 10:23:29 UTC 2018 - fbui@suse.com - -- Import commit 0350f62a8cf7f151951b6b78337fe3c198b8bf6a - - fbf43a697 core: don't freeze OnCalendar= timer units when the clock goes back a lot (bsc#1090944) - 4134ba8b6 man: SystemMaxUse= clarification in journald.conf(5) (bnc#1101040) - 78bb2a0c4 socket-util: fix getpeergroups() assert(fd) (#8080) (bsc#1096516) - 1753d0420 systemctl: mask always reports the same unit names when different unknown units are passed (bsc#1095973) - 50ebf79d7 scsi_id: Fixup prefix for pre-SPC inquiry reply (bsc#1039099) - 570f7655b locale-util: on overlayfs FTW_MOUNT causes nftw(3) to not list *any* files - -------------------------------------------------------------------- -Mon Jun 25 09:16:19 UTC 2018 - fbui@suse.com - -- Drop runtime dependency on dracut (bsc#1098569) - - Otherwise systemd pulls in tools to generate the initrd even in - container/chroot installations that don't have a kernel anyways. - - For environments where initrd matters, dracut should be pulled via a - pattern. - -------------------------------------------------------------------- -Wed Jun 13 13:29:59 UTC 2018 - fbui@suse.com - -- Import commit f63623c1fc0eb01b8efc2037d004f42ed8328356 - - 6a161916f device: make sure to always retroactively start device dependencies (take #2) (bsc#1088052) - e4402648c Fix pattern to detect distribution - ad59c7970 install: "user" and "global" scopes are equivalent for user presets (boo#1093851) - b1876c81a rpm: remove confusing --user before --global - 00ea8a214 man: updated systemd-analyze blame description for service-units with Type=simple (#8834) (bsc#1091265) - a9b587e2f fileio.c: fix incorrect mtime - -------------------------------------------------------------------- -Tue Jun 12 13:38:23 UTC 2018 - fbui@suse.com - -- Add 0001-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (boo#1024897) -- Ship systemd-resolved (but disabled by default) (bsc#1018387) - -------------------------------------------------------------------- -Fri May 18 08:39:41 UTC 2018 - fbui@suse.com - -- Disable user units by default (bsc#1090785) - -------------------------------------------------------------------- -Mon May 14 08:57:44 UTC 2018 - fbui@suse.com - -- Slight rewrite of the previous fix - -------------------------------------------------------------------- -Tue May 8 10:33:10 UTC 2018 - Thomas.Blume@suse.com - -- align permissions of /etc/machine-id to upstream code (bsc#1092269) - world writeable machine-id is a security issue - -------------------------------------------------------------------- -Mon Apr 23 14:05:37 UTC 2018 - fbui@suse.com - -- Move 80-container-v[ez].network in systemd-container sub-package - -- Move 80-container-host0.network from udev to systemd - -------------------------------------------------------------------- -Mon Apr 23 07:45:32 UTC 2018 - fbui@suse.com - -- Import commit d8196805089566ecd846b7c627ff2f3c42588c50 - - 621b247f3 device: skip deserialization of device units when udevd is not running - a7da5bdbc device: make sure to always retroactively start device dependencies (bsc#1088052) - 303624f6f systemd-udevd: limit children-max by available memory (#8668) (bsc#1086785 bsc#1066422) - 76acf3ae9 tmpfiles: fix directory removal with force symlink (#8619) - -------------------------------------------------------------------- -Fri Apr 20 08:27:41 UTC 2018 - fbui@suse.com - -- Ship 99-sysctl.conf instead of creating it during package installation/update (bsc#1088769) - - Previously this symlink was created in /etc/sysctl.d during %post - which made the symlink not owned and more importantly it was created - only if /etc/sysctl.conf is already installed which is not always - the case during the installation process it seems. - - So ship the symlink unconditionally and put it in /usr/lib/sysctl.d - instead since it's a distro default behavior that might be overriden - by sysadmin later. - -------------------------------------------------------------------- -Mon Apr 9 09:42:16 UTC 2018 - fbui@suse.com - -- Be consistent in 60-io-scheduler.rules - - And use "?*" when checking for the non empty string (instead of "*?"). - -------------------------------------------------------------------- -Wed Apr 4 11:49:18 UTC 2018 - fbui@suse.com - -- /usr/lib/systemd/systemd-coredump was missing from systemd-coredump sub-package (boo#1088057) - -------------------------------------------------------------------- -Wed Mar 28 15:19:45 UTC 2018 - fbui@suse.com - -- Drop systemd-bash-completion sub-package - - Now we directly ship the completion scripts from the main package as - we already do for zsh. I couldn't see any advantages in this split. - -------------------------------------------------------------------- -Wed Mar 28 15:12:26 UTC 2018 - fbui@suse.com - -- Be more accurate when specifiying the tools version we provide - -------------------------------------------------------------------- -Wed Mar 28 15:00:24 UTC 2018 - fbui@suse.com - -- Make sure rpm won't expand %autopatch even if it's commented - -------------------------------------------------------------------- -Wed Mar 28 14:55:36 UTC 2018 - fbui@suse.com - -- stat(1) as well as systemctl are not use in %post section of udev - - So remove stat(1) from the list of dep and move systemctl to the - requirements of %postun since it's called from there. - -------------------------------------------------------------------- -Wed Mar 28 12:30:31 UTC 2018 - fbui@suse.com - -- Import commit 14b3e00c3ccb8c1c82c8a2e99a9534750880a09e - - e0a8285e2 pid1: when creating service directories, don't chown existing files (#8181) (boo#1085971) - fb25886b1 Fix format-truncation compile failure by typecasting USB IDs (#8250) (bsc#1084638) - 5a6e9c92e sysusers: make sure to reset errno before calling fget*ent() - c2e1ee488 sysusers: also add support for NIS entries in /etc/shadow - 51cb94fa1 sysusers: do not append entries after the NIS ones (bsc#1085062 bsc#1045092) - 783f3d368 basic/macros: rename noreturn into _noreturn_ (#8456) - -- Drop 0001-basic-macros-rename-noreturn-into-_noreturn_.patch - - It's been merged in the git repo. - -------------------------------------------------------------------- -Wed Mar 28 12:13:03 UTC 2018 - fbui@suse.com - -- Rename the tarball (bsc#1087323) - - So it's clear that it contains some additional patches on top of the - upstream version. Use the commit hash in the name so the exact - version can easily be identified. - - Provide _service file which can be used to retrieve the tarball from - the git repo (with "osc service disabledrun"). - -------------------------------------------------------------------- -Wed Mar 28 11:58:10 UTC 2018 - fbui@suse.com - -- Split systemd-coredump sub-package off (bsc#1083849) - -------------------------------------------------------------------- -Tue Mar 27 20:14:41 UTC 2018 - develop7@develop7.info - -- Enhance IO scheduler tweaking rules to support blk-mq as well - - * Set optimal blk-mq schedulers (bfq and mq-deadline for HDD and - SSD respectively) - * Explicitly set CFQ for rotational disks when no `elevator` - is specified - * Verbose comments explaining what is going on - * Rename the rules file since it is not ssd-only anymore - -------------------------------------------------------------------- -Tue Mar 27 15:58:34 UTC 2018 - fbui@suse.com - -- Don't ship machines.target in systemd-container but in systemd main package - - machines.target is supposed to be a standard target for - starting/stopping all containers. systemd-nspawn is the main user of - it but other container managers could also make use of it. - -------------------------------------------------------------------- -Sun Mar 25 11:04:04 UTC 2018 - fbui@suse.com - -- Build a mini variant of systemd-container - - So we don't have to manually track and remove all files that should - be shipped by systemd-container in the case of a bootstrap build. - -------------------------------------------------------------------- -Thu Mar 22 17:09:36 UTC 2018 - fbui@suse.com - -- Run migrate-sysconfig-i18n.sh also during package installation (bsc#1086164) - - This is needed when we upgrade from SLE11. - -------------------------------------------------------------------- -Wed Mar 14 17:22:53 UTC 2018 - fbui@suse.com - -- Add 0001-basic-macros-rename-noreturn-into-_noreturn_.patch - - This fix a build error triggered by the introduction of the new - version of libgpg-error package. Patch submitted to upsream: - https://github.com/systemd/systemd/pull/8456 - -------------------------------------------------------------------- -Wed Mar 14 08:05:07 UTC 2018 - fbui@suse.com - -- Turn off the IP sandboxing for systemd-logind - - Since v235 logind run inside an IPv4/IPv6 sandbox by default. This - creates incompatibilites for systems using NIS. - -------------------------------------------------------------------- -Tue Mar 13 15:07:41 UTC 2018 - fbui@suse.com - -- Restore (maybe temporarly) "pam_config --add systemd" - - During its installation pam-config seems to overwrite the defaults - shipped by "pam" for "some" reasons (see bsc#1084924) - - No idea why but since pam_systemd is not part of the "pam-config" - defaults, we need to restore pam_systemd in common-session - manually... - -------------------------------------------------------------------- -Fri Mar 9 09:35:59 UTC 2018 - fbui@suse.com - -- Remove dropin that was used to turn delegation off for user instances - - Upstream now enables "memory" and "pids" controllers only which - should have a very limited impact on performance compare to the - "cpu" controller. - -------------------------------------------------------------------- -Fri Mar 9 09:30:14 UTC 2018 - fbui@suse.com - -- Import commit 46d6bc9c4f1c05f3b4fcfca754cc59963bd86ce3 - - 2a79f4e78 units: delegate "memory" instead of "cpu" by default for user instances (#8320) (bsc#954765 bnc#953241 fate#320421) - 88174ae85 compat-rules: fix syntax errors spotted by test/rule-syntax-check.py - -------------------------------------------------------------------- -Thu Mar 8 15:22:10 UTC 2018 - fbui@suse.com - -- Remove udev-remount-tmpfs script - - Complete the previous commit. - -------------------------------------------------------------------- -Thu Mar 8 14:31:16 UTC 2018 - fbui@suse.com - -- Fix hotplug memory in 80-hotplug-cpu-mem.rules - - When new memory was hotplugged, the rule was supposed to call an - external script (udev-remount-tmpfs) to remount all tmpfs. However - the script was broken since its introduction (commit rev=715, - 14/07/2014) and had no effects... this makes me wonder if we - shouldn't get rid of this... - -------------------------------------------------------------------- -Wed Mar 7 14:34:22 UTC 2018 - fbui@suse.com - -- Make sure /var/lib/machines is created when systemd-container is installed - -------------------------------------------------------------------- -Thu Mar 1 10:43:09 UTC 2018 - fbui@suse.com - -- BS forces us to own %{_prefix}/lib/modprobe.d - - This seems wrong but that's how the SUSE BS works. - -------------------------------------------------------------------- -Thu Mar 1 10:13:02 UTC 2018 - fbui@suse.com - -- Upgrade to v237 (commit 78221ca750a9c266f9f8497dda59d7ee44000a6c) - - Udev rules 60-ssd-scheduler.rules and 80-hotplug-cpu-mem.rules have - been removed from the git repo and are now maintained at the package - level. Those rules have been rejected by upstream as they seem to be - written to workaround some kernel shortcomings... - - This includes the following bug fix: - - - upstream commit 3d083b2245b0b8e52f2d8ccc3e55246f41f1f544 (bsc#1102908) - - This also includes the following bug fixes released in v235: - - - upstream commit 2e64e8f46d726689a44d4084226fe3e0ea255c29 (bsc#1069239) - - upstream commit 79873bc850177050baa0c5165b119adafeebb891 (bsc#1069239) - - upstream commit 4bc5d27b942afa83cc3d95debd2ad48d42ac07a8 (bsc#1089376) - - upstream commit e9ea4526a3a3b41eced29b8d742498cc36750424 (bsc#1089693) - - upstream commit d75b31837c93dbb9b20067719026ad0fb7cdfadd (bsc#1117025) - - upstream commit 0e8856d25ab71764a279c2377ae593c0f2460d8f (bsc#1117025) - - upstream commit 048dd629c4590eefb2ebd6a316c7350ed3a6ff19 (bsc#1119971) - - upstream commit 9b32afa9f241fe8febc0a754850f1e7331caf6e3 (bsc#1126056) - - upstream commit e6dde451a51dc5aaa7f4d98d39b8fe735f73d2af (bsc#1137053) - - upstream commit 0864d311766498563331f486909a0d950ba7de87 (bsc#1158336) - - upstream commit d60cb656fc63c24b430421764b7d0322857d34fd (bsc#1161262) - - upstream commit e2be442e791fa1150aa835c684acc6d7189de3e1 (bsc#1165011) - - upstream commit 64a36ae4b1dd23474dd7ea261381ac437b24fac2 (bsc#1172072) - - upstream commit b001ad61e91b6499897f0c977045c7608c233bfa (jsc#SLE-7687) - - - includes IP filtering feature (jsc#SLE-7743) - - This also includes the following bug fixes released in v236: - - - upstream commit b3b4ebab02395933cde554b5a5d5c363dae3920d (bsc#1083571) - - upstream commit 3e3852b3c6c61506963112fd218a86b673fc61e6 (bsc#1110445) - - upstream commit 4050e4797603d3644707d58edfd9742b5311c7cf (bsc#1124153) - - upstream commit 8cb83266062b383cdd4a57301ef559d64b491c51 (bsc#1125604) - - upstream commit 19a44dfe4525ab01caf593a9c2beada4b412910d (bsc#1156482) - -------------------------------------------------------------------- -Wed Feb 28 06:53:02 UTC 2018 - Thomas.Blume@suse.com - -- add basic user space support for suspend to idle (fate#323814) - add 99-wakeup-from-idle.rules - Currently this only covers the power button and usb/AT keyboards - as wakeup devices. It is planned to make that configurable in - the future. - -------------------------------------------------------------------- -Tue Feb 27 09:04:32 UTC 2018 - fbui@suse.com - -- Don't call "pam-config --systemd" - - pam_systemd.so has been integrated directly in the PAM stack since - bsc#812462. So there's no need to call pam-config. - -------------------------------------------------------------------- -Mon Feb 26 10:47:39 UTC 2018 - fbui@suse.com - -- Fix build errors due to the split-off of systemd-containe: - - found conflict of systemd-234-33.1.x86_64 with systemd-container-234-33.1.x86_64: - - /usr/share/man/man5/systemd.nspawn.5.gz - - /usr/share/man/man1/systemd-nspawn.1.gz - found conflict of systemd-container-234-33.1.x86_64 with systemd-mini-container-234-33.1.x86_64: - - /usr/bin/systemd-nspawn - - /usr/lib/systemd/system/systemd-nspawn@.service - - /usr/lib/tmpfiles.d/systemd-nspawn.conf - -------------------------------------------------------------------- -Thu Feb 22 15:11:13 UTC 2018 - fvogt@suse.com - -- Use %license (boo#1082318) - -------------------------------------------------------------------- -Thu Feb 22 14:57:19 UTC 2018 - fbui@suse.com - -- Split systemd-container sub-package off (fate#325469) - - Other distros already do it and it seems a good idea to not install - this stuff on new installations by default. At least - /var/lib/machines subvol is not created anymore at boot even if it - wasn't used at all. - -------------------------------------------------------------------- -Mon Feb 19 14:26:51 UTC 2018 - fbui@suse.com - -- Import commit 295ead0f396beb2b5199abd99a17e274c2581f95 - - f4f94ab2e meson: install rules/80-hotplug-cpu-mem.rules - 2901aa9b9 meson: install rules/60-ssd-scheduler.rules - 1293c0056 core: use id unit when retrieving unit file state (#8038) (bsc#1075801) - 596b2b241 Revert "vconsole-setup: add SUSE specific settings for font/keyboard in sysconfig" - 0b595da04 Revert "locale-setup: handle locale at boot time well" - -------------------------------------------------------------------- -Mon Feb 19 14:24:52 UTC 2018 - fbui@suse.com - -- Re-enable systemd-firstboot - - It's used by the installer and also by JeOS. - -------------------------------------------------------------------- -Mon Feb 19 09:25:30 UTC 2018 - fbui@suse.com - -- Use %systemd_post in %post - -------------------------------------------------------------------- -Mon Feb 19 09:15:04 UTC 2018 - fbui@suse.com - -- Own /usr/lib/systemd/system-environment-generators directory - -------------------------------------------------------------------- -Mon Feb 19 09:10:03 UTC 2018 - fbui@suse.com - -- More systemd rpm macro usages - -------------------------------------------------------------------- -Tue Feb 13 17:11:44 UTC 2018 - fbui@suse.com - -- Disable systemd-firstboot - - I don't think there's any use case for it currently. - -------------------------------------------------------------------- -Mon Feb 12 16:40:28 UTC 2018 - fbui@suse.com - -- Use systemd rpm macros in paths defined in the specfile - -------------------------------------------------------------------- -Mon Feb 12 15:07:29 UTC 2018 - fbui@suse.com - -- Stop importing i18n settings from /etc/sysconfig (fate#319454) - - Bits taken from SLE15. - -------------------------------------------------------------------- -Mon Feb 12 12:59:53 UTC 2018 - fbui@suse.com - -- Make systemd-timesyncd use the openSUSE NTP servers by default - - Previously systemd-timesyncd used the Google Public NTP servers - time{1..4}.google.com - -------------------------------------------------------------------- -Fri Feb 9 14:01:24 UTC 2018 - fbui@suse.com - -- Import commit 4a6a1e4f0b02e6cedf7eba93b85a6dd968f875c7 - - db1d8eacd compat-rules: make path_id_compat build with meson - -- Drop 0001-compat-rules-make-path_id_compat-build-with-meson.patch - which is now part of the git repo (see above). - -------------------------------------------------------------------- -Fri Feb 9 07:59:56 UTC 2018 - fbui@suse.com - -- Don't ship /usr/lib/systemd/system/tmp.mnt at all (bsc#1071224) - - The previous fix couldn't work on platforms using a RO - rootfs. Therefore we don't ship /usr/lib/systemd/system/tmp.mnt but - we still ship a copy in /usr/share/systemd. - - Users who want to use tmpfs on /tmp are supposed to add a symlink in - /etc/ pointing to the copy shipped in /usr/share/systemd. - - To support the update path we automatically create the symlink if - tmp.mount in use is located in /usr/lib/systemd. - -------------------------------------------------------------------- -Tue Feb 6 16:11:40 UTC 2018 - fbui@suse.com - -- Don't build seccomp support in the mini package - -------------------------------------------------------------------- -Tue Feb 6 15:12:42 UTC 2018 - fbui@suse.com - -- Switch to Meson build system - - Some rearrangement in the file list was also needed. That was - probably due to the upgrade of rpm. - -------------------------------------------------------------------- -Tue Feb 6 14:54:57 UTC 2018 - fbui@suse.com - -- Import commit 0a5600eb7f8263c7c79fec0d85cc159d54aba636 - - 2a181fc6f insserv-generator: make it build with meson - 7b0401da4 build-sys: don't build networkctl if networkd is disabled - -------------------------------------------------------------------- -Tue Feb 6 09:27:59 UTC 2018 - fbui@suse.com - -- Don't build-require selinux for the mini package - -------------------------------------------------------------------- -Tue Feb 6 08:56:33 UTC 2018 - fbui@suse.com - -- Drop libgcrypt.m4 - - The mini package builds fine without it so it doesn't seem necessary - anymore. - -------------------------------------------------------------------- -Mon Feb 5 20:25:31 UTC 2018 - fbui@suse.com - -- Import commit 846d838c37865da60eba48090e570e959291399f - - b1e0a348d fileio: include sys/mman.h - f1fa784cb meson: update header file to detect memfd_create() - 8838ba7ec meson: define _GNU_SOURCE to detect copy_file_range() (#7734) - 531a00c84 Restore "restore /var/run and /var/lock bind mount if they aren't symlink"" - - (the 3 first commits make systemd build against glibc 2.27) - -------------------------------------------------------------------- -Mon Feb 5 10:01:37 UTC 2018 - fbui@suse.com - -- Import commit 3f421e4fbf6fcb31d74caf729435868ba8824483 - - 7fb9ea39a Revert "restore /var/run and /var/lock bind mount if they aren't symlink" - 23ce1207a meson.build: make docdir configurable (#8068) - -------------------------------------------------------------------- -Fri Feb 2 08:56:04 UTC 2018 - fbui@suse.com - -- Import commit 8ec9f58d334c76e736957812d9e57151502a6f63 - - 07c6ee3eb compat-rules: get rid of scsi_id when generating compat symlinks for NVMe devices (bsc#1051465) - 261a4ef38 compat-rules: generate compat by-id symlinks with 'nvme' prefix missing (bsc#1063249) - -------------------------------------------------------------------- -Fri Feb 2 08:44:57 UTC 2018 - fbui@suse.com - -- Drop 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch - - It's been imported in branch "compats/udev-compat-symlinks" which - has been merged in branch "openSUSE-Factory" in its turn. - -------------------------------------------------------------------- -Fri Feb 2 08:17:41 UTC 2018 - fbui@suse.com - -- Import commit c516268845b0fd0683cef2e491b84077371e8f01 - - 37da1facb core: disable session keyring per system sevice entirely for now (bnc#1045886) - 8a1ae0449 strv: fix buffer size calculation in strv_join_quoted() - -------------------------------------------------------------------- -Fri Feb 2 08:14:03 UTC 2018 - fbui@suse.com - -- Drop 0001-core-disable-session-keyring-per-system-sevice-entir.patch - - It's been merged in branch "SUSE/v234". - -------------------------------------------------------------------- -Wed Jan 31 15:14:55 UTC 2018 - fbui@suse.com - -- Import commit 2087a80d56bb6f8c7fb74a19172259bc9d9af866 - - 2b8971b8a tmpfiles: refuse to chown()/chmod() files which are hardlinked, unless protected_hardlinks sysctl is on (bsc#1077925 CVE-2017-18078) - 8c2bcac25 tmpfiles: change ownership of symlinks too - -------------------------------------------------------------------- -Mon Jan 29 09:52:50 UTC 2018 - fbui@suse.com - -- Do not optionally remove /usr/lib/systemd/system/tmp.mnt anymore (bsc#1071224) - - This was done to make sure that tmpfs wouldn't be used for /tmp by - defaut in case the dir layout created by the installer did not - create a customized tmp.mount. - - But it had the bad side effect to break "rpm -V systemd" and updates - of systemd via delta-RPMs. - - Now instead of removing tmp.mount unit file, we mask it (still only - if no other tmp.mount would override the default one). It's the - official way to disable tmpfs on /tmp after all. - - Since we cannot rely on the presence of fstab during package - installations, we introduced a service which is run once on the - first boot and which figures out if tmpfs would be used. If so it - masks the unit. - - We also handle the upgrade path and make sure to preserve admin's - settings (if any). - - Another advantage of this is that we will only need to remove the - introduced service the day when tmpfs will be the default for SUSE - distros. - -------------------------------------------------------------------- -Fri Jan 26 14:40:38 UTC 2018 - fbui@suse.com - -- Import commit 83067827cc891ddc90def200fdbe725917ec9fa3 - - 3d60486f7 core/timer: Prevent timer looping when unit cannot start (bsc#1068588) - 460bd0cd6 Revert "handle SYSTEMCTL_OPTIONS environment variable" (fate#323393) - -------------------------------------------------------------------- -Tue Jan 16 10:23:22 UTC 2018 - fbui@suse.com - -- Import commit cc94ce8513221061898c83f57862544b16021f0e - - aa3eba828 delta: don't ignore PREFIX when the given argument is PREFIX/SUFFIX - b1ea0173a delta: extend skip logic to work on full directory paths (prefix+suffix) (bsc#1070428) - 77c5065f9 delta: check if a prefix needs to be skipped only once - db32866d1 Fix parsing of features in detect_vm_xen_dom0 (#7890) (bsc#1048510) - 11d40461a sd-bus: use -- when passing arguments to ssh (#6706) - 1148d99f6 tmpfiles: consider /etc uninitialized also when /etc/machine-id is present but empty (#7849) (bsc#1075179) - 3a95f69bf tmpfiles: downgrade warning about duplicate line - -------------------------------------------------------------------- -Fri Jan 12 12:27:52 UTC 2018 - rbrown@suse.com - -- Edit scripts-systemd-fix-machines-btrfs-subvol.sh - - We shouldn't be creating a /var/lib/machines subvolume if /var is - already a seperate partition or subvolume. /var/lib/machines will - already be excluded from snapper & similar tooling in this case. - -------------------------------------------------------------------- -Wed Jan 10 11:04:21 UTC 2018 - fbui@suse.com - -- Import commit 82dbe8a2ae56649231111eaadd4c302a2d2175ee - - 8c7f0c449 service: Don't stop unneeded units needed by restarted service (bsc#1066156) - 869be64ce sysctl: use raw file descriptor in sysctl_write (#7753) - 0c2400810 sysctl: disable buffer while writing to /proc (bsc#1071558) - 9eb1f30b8 Use read_line() and LONG_LINE_MAX to read values configuration files. (bsc#1071558) - 4dbea654f def: add new constant LONG_LINE_MAX - 48f14cd71 fileio: add new helper call read_line() as bounded getline() replacement - 861e1a222 build-sys: udevadm should have LOG_REALM=LOG_REALM_UDEV - 8ed5cf3fb meson: libudev_core and udevadm should have LOG_REALM=LOG_REALM_UDEV (#7666) - a9f93f1d0 virt: use XENFEAT_dom0 to detect the hardware domain (#6442, #6662) (#7581) (bsc#1048510) - fe56abdf9 seccomp: arm64/x32 do not have _sysctl - c9194fe37 seccomp: arm64 does not have mmap2 - 31d9b3c32 fs-util: small tweak in chase_symlinks() - 9dd0bc7a3 meson: do not include man/meson.build if xsltproc not found - 7e29e2b07 analyze: replace --no-man with --man=no in the man page (bsc#1068251) - -------------------------------------------------------------------- -Mon Dec 4 07:53:34 UTC 2017 - pavlix@pavlix.net - -- Add missing /etc/systemd/network directory - -------------------------------------------------------------------- -Wed Nov 29 10:11:54 UTC 2017 - fbui@suse.com - -- Import commit e30f1b10e276fb18db10ea2463fbd7146ae778f6 - - 63481b24b firstboot: do not write vconsole.conf when arg_keymap is empty (bsc#1070124) - -------------------------------------------------------------------- -Wed Nov 29 09:58:08 UTC 2017 - fbui@suse.com - -- Add 0001-compat-rules-get-rid-of-scsi_id-when-generating-comp.patch (bsc#1051465) - - This patch is not yet merged in the 'compats/udev-compat-symlinks' - branch: we asked to upstream if it would be possible to introduce a - new specifier that wouldn't strip trailing whitespaces , see - https://github.com/systemd/systemd/issues/7462 - - Also this allows to give the patch more testing before merging it in - the git repo. - -------------------------------------------------------------------- -Thu Nov 23 17:33:19 UTC 2017 - fbui@suse.com - -- Drop a useless rm(1) from the specfile - -------------------------------------------------------------------- -Thu Nov 23 09:59:46 CET 2017 - kukuk@suse.de - -- Remove requires for pwdutils, we don't need the shadow tools - anymore [bsc#1069150] - -------------------------------------------------------------------- -Fri Nov 17 08:59:50 UTC 2017 - fbui@suse.com - -- Import commit 4b9afa11f918796184e1264d618b4ff5d18e481b - - 22dcb1d04 tmpfiles: when /etc is not fully initialized, some specifiers are expected to be unresolvable (#6860) (bsc#1055664) - 216beb768 tmpfiles: Allow create symlink on directories (#6039) - baf85eb79 udev: net_setup_link: don't error out when we couldn't apply link config (#7328) - -- Remove stderr redirection to /dev/null when calling %tmpfiles_create - since it's not needed anymore due to commit 22dcb1d04. Indeed the - messages are no more emitted at LOG_WARN but LOG_NOTICE. - -------------------------------------------------------------------- -Mon Nov 13 11:06:09 UTC 2017 - fbui@suse.com - -- Import commit b9a41367b6c1164318443491cc3dae0e8208e15c - - 86804326f systemd-firstboot: add vconsole keymap support (#7035) (bsc#1046436) - 9b64225e9 resolved: fix loop on packets with pseudo dns types (bsc#1065276 CVE-2017-15908) - -- Drop 0001-systemd-firstboot-add-vconsole-keymap-support.patch since - it's been merged upstream and backported to SUSE/v234 (see above). - -------------------------------------------------------------------- -Thu Oct 26 12:29:29 UTC 2017 - fbui@suse.com - -- Import commit e44237e76f6e133e62ff6c681d3fd06ebf12f66d - - a4e02c099 udev-rules: all values can contain escaped double quotes now (#6890) - d2b767a76 tmpfiles: remove old ICE and X11 sockets at boot (#6979) - -------------------------------------------------------------------- -Thu Oct 19 07:47:16 UTC 2017 - fbui@suse.com - -- Add 0001-systemd-firstboot-add-vconsole-keymap-support.patch (bsc#1046436) - - Temporary patch until it's been merged by upstream, see - https://github.com/systemd/systemd/pull/7035 - -------------------------------------------------------------------- -Fri Oct 6 07:44:38 UTC 2017 - fbui@suse.com - -- Damn forgot to drop 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch in - the spec file - -------------------------------------------------------------------- -Fri Oct 6 07:30:01 UTC 2017 - fbui@suse.com - -- Import commit 6dea894131d78b20b9e0482f75afa6ee4dec8627 - - 1cdd944b0 unit: when JobTimeoutSec= is turned off, implicitly turn off JobRunningTimeoutSec= too (bsc#1004995) - - This make 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch - not needed anymore. - -------------------------------------------------------------------- -Thu Oct 5 12:24:35 UTC 2017 - fbui@suse.com - -- Import commit 93688f8e53b4e482a55a7d4aba2d927ddedebdde - - c53522be3 compat-rules: allow to specify the generation number through the kernel cmdline - -------------------------------------------------------------------- -Wed Oct 4 15:44:14 UTC 2017 - fbui@suse.com - -- Import commit c1e8af7d1e8b09c2878a5b17f513bfc41ae46dc6 - - 982754275 build-sys: make sure 61-persitent-storage-compat.rules is installed with meson - 9ac2e8b9b udev: proc_cmdline_get_key() FTW! (#6925) - -------------------------------------------------------------------- -Tue Sep 26 10:14:22 UTC 2017 - fbui@suse.com - -- Import commit 9e0985dc330b1cf04bc44049962343bdf4ba851a - - 4fd7cd041 pam_logind: skip leading /dev/ from PAM_TTY field before passing it on - dd6312828 logind: make sure we don't process the same method call twice (#6583) - -------------------------------------------------------------------- -Tue Sep 26 09:27:12 UTC 2017 - fbui@suse.com - -- Update scripts-systemd-upgrade-from-pre-210.sh script - - - drop dependency on awk - - fallback to runlevel #3 if something goes wrong - - Note: I'm not sure how this is supposed to work as /etc/inittab is - likely to be missing in my understanding. Indeed this file is part - of the aaa_base package which might be upgraded before systemd is - installed... - -------------------------------------------------------------------- -Tue Sep 26 08:08:22 UTC 2017 - fbui@suse.com - -- Drop macros.systemd.upstream as it's not used - -------------------------------------------------------------------- -Thu Sep 14 16:34:16 UTC 2017 - fbui@suse.com - -- Import commit 58ea3c819cca1639ef8c922505c573ba5e262b3d - - 334945091 shutdown: fix incorrect fscanf() result check (#6806) - 027202892 shutdown: don't remount,ro network filesystems. (#6588) (bsc#1035386) - bc77b53a5 shutdown: don't be fooled when detaching DM devices with BTRFS (boo#1055641) - d9d293847 util: make get_block_device() available - 421ce7382 tmpfiles: silently ignore any path that passes through autofs (#6506) (bsc#1045472) - ca8f90e62 device: make sure to remove all device units sharing the same sysfs path (#6679) - -------------------------------------------------------------------- -Thu Sep 14 16:12:30 UTC 2017 - fbui@suse.com - -- Make use of "%tmpfiles_create" in %post of the logger subpackage - -------------------------------------------------------------------- -Thu Sep 14 15:51:54 UTC 2017 - fbui@suse.com - -- Add scripts-udev-convert-lib-udev-path.sh (bsc#1050152) - - This script takes care of converting /lib/udev into a symlink - pointing to /usr/lib/udev when upgrading a distro using an old - version of udev. - -------------------------------------------------------------------- -Thu Sep 14 12:23:26 UTC 2017 - fbui@suse.com - -- Make use of "%make_build" rpm macro - -------------------------------------------------------------------- -Thu Sep 14 12:18:21 UTC 2017 - fbui@suse.com - -- Renumber scripts to start at index 100 - -------------------------------------------------------------------- -Thu Sep 14 11:32:28 UTC 2017 - fbui@suse.com - -- Introduce scripts-systemd-upgrade-from-pre-210.sh - - It collects all existing hacks done in %post to fix old/deprecated - settings in systemd older than 210. This includes hacks needed to - fix system that are migrating from SysV. - - There shouldn't be any functional changes. - -------------------------------------------------------------------- -Thu Sep 14 11:06:35 UTC 2017 - fbui@suse.com - -- Move scripts for packaging workaround/fixes in /usr/lib/systemd/scripts - - It also renames fix-machines-subvol-for-rollbacks.sh into - scripts-systemd-fix-machines-btrfs-subvol.sh - - Note that the "scripts-systemd-" prefix is used for those scripts so - we can gather them. Why not using a directory instead ? because osc - doesn't allow that. - -------------------------------------------------------------------- -Wed Aug 30 15:17:24 UTC 2017 - fbui@suse.com - -- Add 0001-Revert-core-device-Use-JobRunningTimeoutSec-for-devi.patch (bsc#1048605) - - It's a temporary but urgent fix for a regression discovered in bug - 1048605. The fix is still under discussion with upstream but we need - to make progress here and limit the number of affected users. - - Consequently this fix reintroduces bsc#1004995 (the bug report has - been re-opened) but this one is far less critical and a workaround - was provided. - - The final solution will fix both bugs. - -------------------------------------------------------------------- -Tue Aug 29 10:30:00 UTC 2017 - fbui@suse.com - -- Import commit 2bed4bf99cf7f24eafda490f778ed5e109f8d7f1 - - 7a4935268 compat-rules: drop the boggus 'import everything' rule (bsc#1046268) - -------------------------------------------------------------------- -Tue Aug 1 13:39:41 UTC 2017 - fbui@suse.com - -- %regenerate_initrd_post is suppsed to be used in %post (not %pre) section - -------------------------------------------------------------------- -Fri Jul 28 14:22:38 UTC 2017 - fbui@suse.com - -- Import commit 6887cc21f23e33ac37801a01d76176e5c16fd8ea - - 9dcc6c04e pid1: forward port console specificities handling for s390 arch to v234 - -------------------------------------------------------------------- -Fri Jul 28 13:06:27 UTC 2017 - fbui@suse.com - -- Import commit 986e98fd5a75470ba17e21fea12d7d4e966c1ecc - - 4706ebc62 call chase_symlinks without the /sysroot prefix (#6411) (boo#1051172) - -------------------------------------------------------------------- -Thu Jul 27 16:55:33 UTC 2017 - fbui@suse.com - -- Remove the unneeded hack forcing systemd-crypsetup binary to be linked against the just built libudev - - I don't remember why it was added but it looks unnecessary: most of - all systemd components are linked againt libsystemd-shared.so which - includes all the just built symbols. - - Also I don't see why it was done only for systemd-cryptsetup since - all other binaries should have had suffered from the same issue. - -------------------------------------------------------------------- -Wed Jul 26 14:23:36 UTC 2017 - fbui@suse.com - -- Import commit c5705e01800bdadd6a4fa7dc50d47b13eb697211 - - 8ea065d44 compat-rules: don't rely on ID_SERIAL when generating 'by-id' symlinks for NVMe devices (bsc#1048679) - -------------------------------------------------------------------- -Wed Jul 26 11:03:38 UTC 2017 - fbui@suse.com - -- Import commit 06bed720274d9436405a7c27c8238d7d1aefca2b - - 66fffdf12 build-sys: don't hook var-lib-machined.mount to remote-fs.target when machined is disabled - 96c232066 Revert "core: don't load dropin data multiple times for the same unit (#5139)" - -------------------------------------------------------------------- -Wed Jul 26 10:41:32 UTC 2017 - fbui@suse.com - -- Drop support of compression from the mini package - - Hence remove the relevant build-requires from the mini package. - -------------------------------------------------------------------- -Fri Jul 21 09:54:12 UTC 2017 - fbui@suse.com - -- Upgrade to v234 (commit 78af11131da1b2760778206806c0ebe8616a5284) - - - package /etc/systemd/system/dbus-org.freedesktop.network1.service - - /usr/lib/systemd/resolv.conf is not installed if resolved is disabled - -------------------------------------------------------------------- -Fri Jul 7 08:19:41 UTC 2017 - jengelh@inai.de - -- Edit pkgconfig(liblz4) dependency: liblz4 now uses 1.x *again* - -------------------------------------------------------------------- -Thu Jul 6 14:12:34 UTC 2017 - fbui@suse.com - -- Added 0001-core-disable-session-keyring-per-system-sevice-entir.patch (bnc#1045886) - - Temporary patch to disable the session keyring stuff as it's - currently broken and may introduce some security holes. - -------------------------------------------------------------------- -Thu Jul 6 12:57:06 UTC 2017 - fbui@suse.com - -- Import commit 21827ea0875ff197e16e72003b2bfaa1c6e8daad - - 1ad06735f core: fail when syntactically invalid values for User=/Group= fields are detected (bsc#1047023) - d563972e2 timesyncd: don't use compiled-in list if FallbackNTP has been configured explicitly - f4e0c16f5 gpt-auto-generator: fix the handling of the value returned by fstab_has_fstype() in add_swap() (#6280) - e1345aac5 fix add_esp() in the gpt-auto-generator.c (#6251) - c591ece9a automount: don't lstat(2) upon umount request (#6086) (bsc#1040968) - 643ab2eea gpt-auto-generator: disable gpt auto logic for swaps if at least one is defined in fstab - f07d2022f fstab-util: introduce fstab_has_fstype() helper - bf735bb35 fstab-util: don't eat up errors in fstab_is_mount_point() - a4b40fbed resolved: simplify alloc size calculation (bsc#1045290 CVE-2017-9445) - 8b960bec0 only check signature job error if signature job exists (#6118) (boo#1043758) - 1418bfb5b job: Ensure JobRunningTimeoutSec= survives serialization (#6128) (bsc#1004995) - 19b6d5f08 udev: turn off -Wformat-nonliteral for one safe case - 717ace439 udev: net_id add support for platform bus (ACPI, mostly arm64) devices (#5933) - a3bf2e6b5 core/mount: pass "-c" flag to /bin/umount (#6093) - -------------------------------------------------------------------- -Wed Jul 5 07:15:17 UTC 2017 - fbui@suse.com - -- Add minimal support for boot.d/* scripts in systemd-sysv-convert (boo#1046750) - - While at it, the handling of the symlink priorities is also removed - since it doesn't appear to be used at all. - -------------------------------------------------------------------- -Thu Jun 22 15:24:22 UTC 2017 - fbui@suse.com - -- Don't try to restart networkd/resolved if they're disabled (boo#1045521) - - "systemctl try-restart/preset" wants the unit files exist. - -------------------------------------------------------------------- -Thu Jun 22 13:50:46 UTC 2017 - fbui@suse.com - -- Stop shipping /usr/lib/sysusers.d/basic.conf (bsc#1006978) - - Ok looks like the previous change was the right thing to do and we - continue to follow this path by relying on the new user/group scheme - - Therefore the basic system user/group are now managed and created by - system-sysusers and udev also relies on this for the groups it uses - in its rule files. - - Ideally we should have listed all of the groups in the deps (with - "Requires: group(disk)" but the list of the groups is rather long - and the risk for those groups to be re-organized is probably low, so - currently we simply use "Requires: system-group-hardware" as a - shortcut. - -------------------------------------------------------------------- -Fri Jun 16 09:14:43 UTC 2017 - fbui@suse.com - -- Make sure "lock" group is created - - On SUSE distros, /run/lock must be owned by "lock" group (see - boo#733523). - - This group was previously created by another package but since a - recent changes it doesn't seem to be true anymore or at least this - package isn't pulled in anymore when building the rescue system. - - For now make systemd creates the group by adding - "Requires: group(lock)". - - I'm currently not sure why we don't use sysusers.d stuff for that - purpose and if the "lock" group on /run/lock is still - mandatory. This should be revisited later. - -------------------------------------------------------------------- -Wed Jun 7 08:17:54 UTC 2017 - fbui@suse.com - -- Make sure dracut (if installed) will embed the new compat rule - - The new compat rule must be embedded in the initramfs so make sure - that the installed dracut supports it. - -------------------------------------------------------------------- -Wed May 24 11:23:10 UTC 2017 - fbui@suse.com - -- Upgrade to v233 (commit 330b55d5e28d17f361062dba66426e46fb7d7857) - - - package new systemd-umount binary - - package new environment generator stuff - - drop /dev/root symlink support - - /etc/pam.d/systemd-user is not patched anymore but we ship a - dedicated file for SUSE now. - - manage compat symlink generation in a dedicated branch (bsc#1040153) - -------------------------------------------------------------------- -Wed May 17 15:57:19 UTC 2017 - fbui@suse.com - -- Fix systemd-sysv-convert when a package starts shipping service units (bsc#982303) - - The database might be missing when upgrading a package which was - shipping no sysv init scripts nor unit files (at the time --save was - called) but the new version start shipping unit files. - -------------------------------------------------------------------- -Wed May 17 13:14:40 UTC 2017 - fbui@suse.com - -- Fix indentation in systemd-sysv-convert - - While at it, strip trailing whitespaces. - - No functional changes. - -------------------------------------------------------------------- -Thu May 11 08:47:48 UTC 2017 - fbui@suse.com - -- Disable group shadow support (bsc#1029516) - - The new configure option will be imported during the next tarball - update. - -------------------------------------------------------------------- -Tue May 2 16:17:08 UTC 2017 - fbui@suse.com - -- Ship /var/log/README - - Unfortunately it's not possible to also ship /etc/init.d/README - because of rpm "sanity" checks that prevent executable in - /etc/init.d - -------------------------------------------------------------------- -Tue May 2 14:33:58 UTC 2017 - fbui@suse.com - -- Drop systemd-{journalctl,loginctl} legacy symlinks. - -------------------------------------------------------------------- -Tue May 2 13:55:31 UTC 2017 - fbui@suse.com - -- Drop %preun section - - Currently the only use of this section is to remove the symlinks - enabling systemd services on package removal. Those symlinks were - initially installed by the systemd package installation but could - have been overriden by the sysadmin later. If so the symlinks - shouldn't be uninstalled. - - Also in a near futur disabling services will install a symlink to - /dev/null. - -------------------------------------------------------------------- -Tue May 2 13:40:12 UTC 2017 - fbui@suse.com - -- Import commit 9e33c2ae69fbb705e8ad143536e419a231e93020 - - 04ef0eab8 importd: support SUSE style checksums supplementary (#5800) - fb601ad9a importd: support SUSE style checksums (#5206) (fate#322054) - b76b27c76 hwdb: fix warning "atkbd serio0: Unknown key pressed" (#5772) (boo#1010220) - cb0d991f6 loginctl: fix typo causing ignoring multiple session IDs (#5732) - -------------------------------------------------------------------- -Tue May 2 13:37:44 UTC 2017 - fbui@suse.com - -- Make use of %systemd_postun() - -------------------------------------------------------------------- -Tue May 2 13:28:17 UTC 2017 - fbui@suse.com - -- Restart a couple of systemd services on package update - - Those services (most notably journald) should support restarting - these days. However logind still doesn't but that should be fixed - pretty soon, well I hope :) - -------------------------------------------------------------------- -Tue May 2 13:13:25 UTC 2017 - fbui@suse.com - -- Don't buildrequire pam-config, it's not used at this step. - - Also drop the use of it in %postun as it can't realistically - happen... - -------------------------------------------------------------------- -Thu Apr 20 09:26:21 UTC 2017 - fbui@suse.com - -- Don't call /sbin/ldconfig in %post of the main package - - systemd main package doesn't ship any shared libs so there's no - point in calling ldconfig in %post/%postun - -------------------------------------------------------------------- -Thu Apr 20 09:20:03 UTC 2017 - fbui@suse.com - -- Silent %tmpfiles_create in %post (bsc#1034938) - - Due to bsc#1024740, we stopped generating /etc/machine-id during - systemd package installation making the specifier '%m' unavailable - in the tmpfiles.d configuration files at this time. - - Make it simple for now and silent %tmpfiles_create, after all that's - how the macro was implemented originally. - -------------------------------------------------------------------- -Mon Apr 10 09:38:45 UTC 2017 - fbui@suse.com - -- Import commit f0325620d23a247682c629d28883a364e4a7a8c4 - - 327814841 core: when a unit's SourcePath points to API VFS pretend we are never out-of-date (#5487) - f4b9fb58e units: move Before deps for quota services to remote-fs.target (#5627) (bsc#1028263) - 44b9d27f8 udev: net_id - support predictable ifnames on vio buses (#5675) (bnc#1029183) - 64f4761c9 units: apply plymouth warning fix to in rescue mode as well (#5615) - 77607b887 units: do not throw a warning in emergency mode if plymouth is not installed (#5528) (bsc#1025398) - 336d6016c core: downgrade "Time has been changed" to debug (#4906) (bsc#1028610) - -------------------------------------------------------------------- -Wed Mar 22 13:24:57 UTC 2017 - fbui@suse.com - -- Consider chroot updates in fix-machines-subvol-for-rollbacks.sh (bsc#1030290) - -------------------------------------------------------------------- -Tue Mar 14 14:13:56 UTC 2017 - fbui@suse.com - -- Initialize /etc/machine-id during the first boot (bsc#1024740) - - Previously that was done at package installation but it didn't fit - well for appliance builds. - -------------------------------------------------------------------- -Tue Mar 7 09:22:30 UTC 2017 - fbui@suse.com - -- Import commit 68fc0a749a83d16d4cde8471d5030bc6254ffd96 - - 76d4d05fb udev: fix variable assignment - 473df8cc4 udev-rules: perform whitespace replacement for symlink subst values (bsc#1025886) - d6c3ff647 udev-event: add replace_whitespace param to udev_event_apply_format - 30ad15f7c libudev-util: change util_replace_whitespace to return number of chars in dest - -------------------------------------------------------------------- -Fri Mar 3 16:20:34 UTC 2017 - fbui@suse.com - -- Import commit 103259b3226251d06f79ca627f7b0ba0bd49f4bc - - 0ee7890dd automount: if an automount unit is masked, don't react to activation anymore (#5445) - 99865a181 core: make sure to destroy all name watching bus slots when we are kicked off the bus (#5294) (bsc#1006687) - f34234c54 build-sys: add check for gperf lookup function signature (#5055) - 44e39538f sd-event: "when exiting no signal event are pending" is a wrong assertion (#5271) (boo#995936 bsc#1022014) - 471b26807 sd-event: when an event source fails, don't assume the type of it is still set - -------------------------------------------------------------------- -Mon Feb 20 10:53:11 UTC 2017 - fbui@suse.com - -- Don't ship systemd-resolved for now (bsc#1024897) - - If resolved is enabled , systemd-tmpfiles creates a wrong symlink in - /etc/resolv.conf which confuses the network manager actually used. - -------------------------------------------------------------------- -Thu Feb 9 14:06:46 UTC 2017 - fbui@suse.com - -- More indentation cleanup (no functional changes) - -------------------------------------------------------------------- -Wed Feb 8 08:45:09 CET 2017 - kukuk@suse.de - -- Remove obsolete insserv requirements for udev again [bsc#999841] - -------------------------------------------------------------------- -Mon Feb 6 14:13:00 UTC 2017 - fbui@suse.com - -- Import commit cd97d5d5fef79ab9d957bf6504d085c0faca6bfc - - e587b6ce0 disable RestrictAddressFamilies on all architectures but x86_64 one (bsc#1023460) - c8ae05632 journald: don't flush to /var/log/journal before we get asked to (bsc#1004094) - 7261eaf3e sd-event: fix sd_event_source_get_priority() (#4712) - -------------------------------------------------------------------- -Fri Feb 3 08:37:22 UTC 2017 - fbui@suse.com - -- Move fix for permission set on /var/lib/systemd/linger/* (no functional changes) - - Move that part after the fix on timer timestamp files otherwise the - comment doesn't make sense. - -------------------------------------------------------------------- -Wed Feb 1 15:06:06 UTC 2017 - fbui@suse.com - -- Import commit 028fd9b60580976dffb09b3576a2b652ee35137c - - cc2ca55ff build-sys: do not install ctrl-alt-del.target symlink twice - ececae77a device: Avoid calling unit_free(NULL) in device setup logic (#4748) - -------------------------------------------------------------------- -Wed Feb 1 14:32:28 UTC 2017 - fbui@suse.com - -- Ship systemd-resolved but it's disabled by default (bsc#1018387) - - The NSS plugin will also be disabled, users need to enable it - manually. - -------------------------------------------------------------------- -Wed Jan 25 15:37:23 UTC 2017 - fbui@suse.com - -- Don't ship ldconfig.service anymore - - This service was introduced to support stateless systems that - support offline /usr updates properly. - - AFAIK we don't support any such system for now, so disable it. If - it's wrong it's easy enough to restore it back. - - Related to bsc#1019470. - -------------------------------------------------------------------- -Wed Jan 25 15:17:06 UTC 2017 - fbui@suse.com - -- Be more consistent with indentation (*no* functional changes) - - Indentation should use 8 spaces now (no tabs). - -------------------------------------------------------------------- -Wed Jan 25 14:38:59 UTC 2017 - fbui@suse.com - -- Import commit 2559bc0c076b58f0a649056e79ca90fe5f1d556c - - 9c4a759ab systemctl: 'show' don't exit with a failure status if the requested property does not exist [SUSE] (bsc#1021062) - f9194193b systemctl: remove duplicate entries showed by list-dependencies (#5049) (bsc#1012266) - 2a6653335 rule: don't automatically online standby memory on s390x (bsc#997682) - -------------------------------------------------------------------- -Wed Jan 25 14:36:34 UTC 2017 - fbui@suse.com - -- Fix permission set on /var/lib/systemd/linger/* - - Those files are created by logind which run with umask(0022), so - they are not world writable and shouldn't be affected by - bsc#1020601. But it's cleaner to not let files forever with their - setuid bit set for no good reason. - -------------------------------------------------------------------- -Wed Jan 25 14:33:04 UTC 2017 - fbui@suse.com - -- Fix permissions set on permanent timer timestamp files (bsc#1020601) (CVE-2016-10156) - - This change makes sure to fix the permissions of the timestamp files - which could have been created by an affected version of systemd. - - Local unprivileged users could have run arbitrary code as root if - systemd previously created world writable suid root files such as - permanent timer stamp files. - -------------------------------------------------------------------- -Tue Jan 10 10:54:20 UTC 2017 - fbui@suse.com - -- Import commit 3edb876e3b80437a95502aa5d31d454606ea94bd - - 27b544224 core: make sure to not call device_is_bound_by_mounts() when dev is null (#5033) (bsc#1018399) - -------------------------------------------------------------------- -Fri Jan 6 08:27:03 UTC 2017 - fbui@suse.com - -- Use the %{resolved} build conditional for the nss-resolve subpackage - -------------------------------------------------------------------- -Thu Jan 5 17:46:44 UTC 2017 - fbui@suse.com - -- /usr/bin/systemd-resolve was missing from the filelist - -------------------------------------------------------------------- -Thu Jan 5 17:09:01 UTC 2017 - fbui@suse.com - -- Silent warnings emitted when udev socket units are restarted during package upgrade (bsc#1018214) - -------------------------------------------------------------------- -Mon Dec 19 13:49:48 UTC 2016 - fbui@suse.com - -- Upgrade to v232, commit de62e96da6a62ac61a7dea45cc558f5fa4342032 - - - a4dff165d nspawn: resolv.conf might not be created initially (#4799) - - b543fe907 nspawn: fix condition for mounting resolv.conf (#4622) - - 1aed89e55 core: make mount units from /proc/self/mountinfo possibly bind to a device (#4515) (boo#909418 bsc#912715 bsc#945340) - - bfb54ecdc coredumpctl: let gdb handle the SIGINT signal (#4901) (bsc#1012591) - -------------------------------------------------------------------- -Wed Dec 14 14:51:41 UTC 2016 - fbui@suse.com - -- Really include legacy kbd maps in kbd-model-map (bsc#1015515) - - Instead of fix-machines-subvol-for-rollbacks.sh... - -------------------------------------------------------------------- -Thu Dec 8 12:55:51 UTC 2016 - fbui@suse.com - -- Enable lz4 (which becomes the default) - - It's much faster than xz and thus should be more appropriate to - compress journals and coredumps. - - The LZ4 logic is now officially supported and no longer considered - experimental. - - The new frame api was released in v125. - -------------------------------------------------------------------- -Tue Dec 6 16:46:52 UTC 2016 - fbui@suse.com - -- Good by compatlibs support - - There's no longer need for enabling/disabling the support for the - compatlibs as it's been dropped from the source code. - -------------------------------------------------------------------- -Tue Nov 29 16:38:41 UTC 2016 - fbui@suse.com - -- Drop /usr/lib/systemd/libsystemd-shared-%{version}.so from the 32bit package - - This shared library is not for public use, and is neither API nor - ABI stable, but is likely to change with every new released - update. Only systemd binaries are supposed to link against it. - - This also prevents from the 32bit package to conflit with the 64bit - one if this lib was installed by both packages. - -------------------------------------------------------------------- -Tue Nov 22 15:02:08 UTC 2016 - fbui@suse.com - -- Upgrade to v232, commit c5c3445825981e2a5c3ed71214127d5b1b9de802: - - - Dropped backported commits which has been merged - - Forward-port Suse specific patches - - Added --disable-lto option to ./configure - - Added systemd-mount - - Removed in %file /usr/lib/systemd/user/*.socket: since - 798c486fbcdce3346cd86 units/systemd-bus-proxyd.socket has been - removed. - - Removed in %file %{_sysconfdir}/systemd/bootchart.conf - since commit 232c84b2d22f2d96982b3c bootchart is not part of systemd - anymore. - - Backward compat libs have been disabled since it's been dropped from - the source code. - - Added /usr/bin/systemd-socket-activate in %file - - Added --without-kill-user-processes ./configure option - - Bump libseccomp build require (>= 2.3.1) as described in README - - Specifiy version of libmount as required in the README - -------------------------------------------------------------------- -Fri Nov 18 21:07:11 UTC 2016 - meissner@suse.com - -- libudev-devel 32bit is needed for building 32bit wine now. - -------------------------------------------------------------------- -Mon Nov 14 12:27:56 UTC 2016 - fbui@suse.com - -- specfile: conflict systemd-bash-completion and systemd-mini-bash-completion - - Otherwise the build system detects that systemd-bash-completion and - its mini variant are conflicting at files level even though those - packages can't be installed on the same system. - -------------------------------------------------------------------- -Thu Nov 10 19:11:57 UTC 2016 - fbui@suse.com - -- specfile: clean up nss-* plugins descriptions and drop - nss-myhostname-config script for now. - - Currently /etc/nsswitch.conf is supposed to be edited by the - sysadmin to enable the modules. However for some reasons only - nss-myhostname is removed from the conf file when the corresponding - package is uninstalled. This is inconsistent so let's remove it. - - Actually I'm wondering if we shouldn't make those NSS plugins part - of the main package and get rid of all those sub-packages... - -------------------------------------------------------------------- -Thu Nov 10 18:22:04 UTC 2016 - fbui@suse.com - -- specfile: remove old comments and unneeded sed command - -------------------------------------------------------------------- -Thu Nov 10 14:54:22 UTC 2016 - fbui@suse.com - -- specfile: no need to create systemd-update-utmp-runlevel.service symlinks anymore - - The symlinks in /usr/lib/systemd/system/.target.wants/systemd-update-utmp-runlevel.service - are created in Makefile.am since commit d5d8429a12c4b1. - - 'reboot' and 'poweroff' targets initially had the symlinks but - there's not point since the latter conflicts shutdown.target whereas - the 2 targets pull it in. - - See: https://github.com/systemd/systemd/pull/4429 - -------------------------------------------------------------------- -Thu Nov 10 13:44:13 UTC 2016 - fbui@suse.com - -- specfile: remove the following warnings: - - [ 256s] warning: File listed twice: /usr/lib/systemd/system/dbus.target.wants - [ 256s] warning: File listed twice: /usr/lib/systemd/system/default.target.wants - -------------------------------------------------------------------- -Wed Oct 26 09:41:01 UTC 2016 - fbui@suse.com - -- Own a couple of directories even if they don't belong to systemd - otherwise the build system will complain. - - Some directories (owned by others packages) are simply used by - systemd to ship some scripts or config files to customize others - *optional* components. Since thos components are not build required - by systemd those directories are not owned by any packages and the - BS complains... - -------------------------------------------------------------------- -Wed Oct 26 07:45:08 UTC 2016 - fbui@suse.com - -- Import commit - - 15ea716 journal-remote: change owner of /var/log/journal/remote and create /var/lib/systemd/journal-upload (bsc#1006372) - -------------------------------------------------------------------- -Mon Oct 24 14:26:40 UTC 2016 - fbui@suse.com - -- %sysusers_create and %tmpfiles_create must be called in %post - - Calling %pre is broken since the respective conf files are not yet - installed. - -------------------------------------------------------------------- -Mon Oct 24 13:53:04 UTC 2016 - fbui@suse.com - -- %{_libexecdir}/{tmpfiles.d,sysusers.d}/systemd-remote.conf are - part of systemd-journal-remote package (only). - -------------------------------------------------------------------- -Mon Oct 24 13:21:22 UTC 2016 - fbui@suse.com - -- systemd-journal-{gatewayd,remote,upload} units are only part of - "systemd-journal-remote" package. - - So exclude them from the main package. - -------------------------------------------------------------------- -Mon Oct 24 08:56:59 UTC 2016 - fbui@suse.com - -- Import commit a1c145e6ad6588555dca64402f9103fb1e02b1a0 - - 7f34037 man: explain that *KeyIgnoreInhibited only apply to a subset of locks - df5798b Revert "logind: really handle *KeyIgnoreInhibited options in logind.conf" (bsc#1001790 bsc#1005404) - f79fee7 Revert "kbd-model-map: add more mappings offered by Yast" - 3760c10 manager: tighten incoming notification message checks - d6efd71 core: only warn on short reads on signal fd - 6eebd91 manager: be stricter with incomining notifications, warn properly about too large ones - fdf2dc3 manager: don't ever busy loop when we get a notification message we can't process - -------------------------------------------------------------------- -Thu Oct 20 06:57:57 UTC 2016 - fbui@suse.com - -- Rename kbd-model-map-extra into kbd-model-map.legacy - -------------------------------------------------------------------- -Wed Oct 19 07:24:46 UTC 2016 - fbui@suse.com - -- Remove tcpd-devel build requirement. - - tcpwrap support has been removed since v212, see commit - 7f8aa67131cfc03ddcbd31c0420754864fc122f0 - -------------------------------------------------------------------- -Tue Oct 18 14:52:00 UTC 2016 - fbui@suse.com - -- remove all dummy "aliases" to /etc/init.d (as it was already done by - factory more than 1 year ago). - - Even if a sysvinit script is still requiring one of those dummy - symlinks this should not be an issue since this is requirement is - translated into a weak dependency. - -------------------------------------------------------------------- -Tue Oct 18 13:20:58 UTC 2016 - fbui@suse.com - -- specfile: - - - do not own /usr/share/zsh directory - - do not own /etc/dbus-1 and /etc/dbus-1/system.d dirs - - do not own /usr/share/dbus-1 dir - -------------------------------------------------------------------- -Tue Oct 18 13:06:27 UTC 2016 - fbui@suse.com - -- specfile: %{_prefix}/lib/systemd/system-preset was mentioned twice - in %files section. - -------------------------------------------------------------------- -Tue Oct 18 09:30:37 UTC 2016 - fbui@suse.com - -- Specfile cleanup: - - - use curly braces with rpm macros - -------------------------------------------------------------------- -Tue Oct 18 09:15:17 UTC 2016 - fbui@suse.com - -- Specfile cleanup: - - - %ghost files doesn't need (anymore) to be created in %builroot - - do not own /etc/X11/xorg.conf.d and /etc/X11/xinit - -------------------------------------------------------------------- -Tue Oct 18 07:58:38 UTC 2016 - fbui@suse.com - -- Specfile cleanup: no need to protect the manpages with %bootstrap - condition in nss-myhostname package since the package itself is - already protected. - -------------------------------------------------------------------- -Tue Oct 18 07:51:30 UTC 2016 - fbui@suse.com - -- fix nss-resolve sub package: - - - add a %files section - - add a package description - - libnss_resolve.so.2 is now part of this subpackage - - add %post and %postun sections - -------------------------------------------------------------------- -Tue Oct 18 07:16:17 UTC 2016 - fbui@suse.com - -- Specfile cleanup: - - - reorganize some files in %files by types - - some config files were missing the "noreplace" attribute - -------------------------------------------------------------------- -Tue Oct 18 06:19:34 UTC 2016 - fbui@suse.com - -- Use %config(noreplace) for %{_sysconfdir}/pam.d/systemd-user - -------------------------------------------------------------------- -Tue Oct 18 05:57:28 UTC 2016 - fbui@suse.com - -- Rework systemd-gatewayd package: - - - some gateway's files were still in the main package - - it now includes all progs dealing with remote journals - - it can be turned off (SP2 does that currently) - - it's been renamed systemd-journal-remote to reflect that - -------------------------------------------------------------------- -Mon Oct 17 12:19:34 UTC 2016 - fbui@suse.com - -- Specfile cleanup: - - - only specify once %{_prefix}/lib/systemd/system-shutdown in %file - - no need to list the content of %{_prefix}/lib/systemd/user-generators in %file - - machined is not built when %bootstrap = 1 - -------------------------------------------------------------------- -Mon Oct 17 12:11:43 UTC 2016 - fbui@suse.com - -- Specfile cleanup: - - - There's no point in listing all generators in %file - explicitly. The default is to include all of them and if for some - reason one must be excluded then it should be done explicitly. - -------------------------------------------------------------------- -Mon Oct 17 11:44:57 UTC 2016 - fbui@suse.com - -- Specfile cleanup: - - - remove explicit call to make for building man pages. This is not - needed and was maybe useful when generated doc was pre-built and - shipped in the tarball. - -------------------------------------------------------------------- -Mon Oct 17 09:59:13 UTC 2016 - fbui@suse.com - -- Specfile cleanup: - - - break overly long and unreadable line using mkdir - - gather directory creations - -------------------------------------------------------------------- -Mon Oct 17 08:38:27 UTC 2016 - fbui@suse.com - -- Stop providing udevd.8 - - systemd-udevd has replaced udevd for some time already and usage of - udevd should be avoided. Therefore don't encourage this and stop - documenting it. - -------------------------------------------------------------------- -Mon Oct 17 07:36:10 UTC 2016 - fbui@suse.com - -- Import from factory: - - - Thu Feb 4 11:05:37 UTC 2016 - lnussel@suse.de - - - curl also causes building of journal-upload. That one has rather - unusal certificate usage, set it's ca root to /etc/pki/systemd - instead of the built-in default /etc/ssl as journal-remote and - journal-upload think they can put stuff in /etc/ssl/certs then - but that directory is managed by p11-kit and doesn't serve the - purpose those programs think. - -------------------------------------------------------------------- -Thu Oct 13 19:33:17 UTC 2016 - fbui@suse.com - -- Package rootsymlink-generator helper. It was forgotten when - switching to the git repo but re-added back. - - That said this thing should be removed as it's broken as soon as - there's no direct link between the root fs and its backend device - node (i.e. BTRFS). - -------------------------------------------------------------------- -Thu Oct 13 19:09:25 UTC 2016 - fbui@suse.com - -- Add kbd-model-map-extra file which contains the additional legacy - keymaps needed by yast. - - This was previously directly patched in the systemd source code. - -------------------------------------------------------------------- -Mon Oct 10 13:33:40 UTC 2016 - fbui@suse.com - -- Imported e251b8d7fb5c801fdfa3a023257ba0e4d514f3b0 - - - Re-add back /dev/root symlink generation (although this must be - deprecated and finally removed). - -------------------------------------------------------------------- -Fri Oct 7 14:18:10 UTC 2016 - fbui@suse.com - -- Migrating to the Suse Systemd git repo: - - Third step: - - - Re-enable networkd (disabled by default in SLE12) - -------------------------------------------------------------------- -Fri Oct 7 13:33:51 UTC 2016 - fbui@suse.com - -- Migrating to the Suse Systemd git repo: - - Second step: - - - Import the specfile - - Import the tarball generated from the git repo - - Import lastest changes for the different scripts - -------------------------------------------------------------------- -Fri Oct 7 08:58:38 UTC 2016 - fbui@suse.com - -- Migrating to the Suse Systemd git repo: - - First step: drop all patches and drop the tar ball. - - The dropped patches are: - - fix-support-for-boot-prefixed-initscript-bnc-746506.patch - set-and-use-default-logconsole.patch - ensure-ask-password-wall-starts-after-getty-tty1.patch - 0001-rules-block-add-support-for-pmem-devices-3683.patch - Fix-run-lock-directories-permissions-to-follow-openSUSE-po.patch - 1007-physical-hotplug-cpu-and-memory.patch - 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch - watch_resolv.conf_for_become_changed.patch - 0019-make-completion-smart-to-be-able-to-redirect.patch - systemd-add-user-keep.patch - 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch - systemd-228-nspawn-make-journal-linking-non-fatal-in-try-and-auto.diff - avoid-random-hangs-on-timeouts-due-lost-cwd.patch - 1037-udev-exclude-cd-dvd-from-block-device.patch - 0001-add-network-device-after-NFS-mount-units.patch - journald-advice-about-use-of-memory.patch - 1011-64-btrfs.rules-skip-btrfs-check-if-devices-are-not-r.patch - 1006-udev-always-rename-network.patch - handle-numlock-value-in-etc-sysconfig-keyboard.patch - use-rndaddentropy-ioctl-to-load-random-seed.patch - 0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch - 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch - 0001-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch - 0001-bnc888612-logind-polkit-acpi.patch - avoid-divide-by-zero-sigtrap.patch - 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch - suse-sysv-bootd-support.diff - ensure-shortname-is-set-as-hostname-bnc-820213.patch - parse-crypttab-for-noauto-option.patch - tty-ask-password-agent-on-console.patch - 0001-pid1-process-zero-length-notification-messages-again.patch - handle-root_uses_lang-value-in-etc-sysconfig-language.patch - 0001-core-exclude-.slice-units-from-systemctl-isolate.patch - vhangup-on-all-consoles.patch - 0001-systemctl-pid1-do-not-warn-about-missing-install-inf.patch - apply-ACL-for-nvidia-device-nodes.patch - make-emergency.service-conflict-with-syslog.socket.patch - 0001-journal-warn-when-we-fail-to-append-a-tag-to-a-journ.patch - 1096-new-udev-root-symlink-generator.patch - 1099-Add-default-rules-for-valve-steam-controller-to-work.patch - 0001-journal-set-STATE_ARCHIVED-as-part-of-offlining-2740.patch - systemd-install-compat_pkgconfig-always.patch - 1012-Skip-persistent-device-link-creation-on-multipath-de.patch - 0001-avoid-abort-due-timeout-at-user-service.patch - insserv-generator.patch - apply-ACL-for-nvidia-uvm-device-node.patch - restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch - systemd-pam_config.patch - systemd-dbus-system-bus-address.patch - let-linker-find-libudev-for-libdevmapper.patch - 1098-systemd-networkd-alias-network-service.patch - 0001-let-systemctl-completion-ignore-at-names.patch - boot-local-start.patch - 1095-set-ssd-disk-to-use-deadline-scheduler.patch - tomcat6-var-lock-subsys-legacy.patch - let-vconsole-setup-get-properties-only-once-to-copy-them.patch - plymouth-quit-and-wait-for-emergency-service.patch - respect-nfs-bg-option.patch - 0001-If-the-notification-message-length-is-0-ignore-the-m.patch - 1062-rules-set-default-permissions-for-GenWQE-devices.patch - rescue-emergency-target-conflicts.patch - Correct_assert_on_unexpected_error_code.patch - 1097-udevd-increase-maximum-number-of-children.patch - 0001-core-fix-bus-name-synchronization-after-daemon-reloa.patch - 1005-create-default-links-for-primary-cd_dvd-drive.patch - allow-multiple-sulogin-to-be-started.patch - systemd-230-cgroup2-use-new-fstype-for-unified-hierarchy.patch - 0010-do-not-install-sulogin-unit-with-poweroff.patch - 1003-udev-netlink-null-rules.patch - 1002-rules-create-by-id-scsi-links-for-ATA-devices.patch - 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch - shut-up-rpmlint-on-var-log-journal.patch - systemd-tmp-safe-defaults.patch - portmap-wants-rpcbind-socket.patch - hostname-NULL.patch - 0001-pid1-more-informative-error-message-for-ignored-noti.patch - 0001-journal-fix-HMAC-calculation-when-appending-a-data-o.patch - handle-disable_caplock-and-compose_table-and-kbd_rate.patch - kbd-model-map.patch - systemctl-set-default-target.patch - 0014-journald-with-journaling-FS.patch - 0001-On_s390_con3270_disable_ANSI_colour_esc.patch - -------------------------------------------------------------------- -Fri Sep 30 06:07:06 UTC 2016 - fbui@suse.com - -- Import a better fix from upstream for bsc#1001765 - - - Added: - - 0001-pid1-more-informative-error-message-for-ignored-noti.patch - 0001-pid1-process-zero-length-notification-messages-again.patch - - - Updated (no code changes, only patch metadata) - - 0001-If-the-notification-message-length-is-0-ignore-the-m.patch - 0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch - -------------------------------------------------------------------- -Thu Sep 29 13:05:44 UTC 2016 - fbui@suse.com - -- Re add back "udev: don't require nsserv and fillup" - - Did this in the wrong project... it was a complicated day today ;) - -------------------------------------------------------------------- -Thu Sep 29 12:51:38 UTC 2016 - fbui@suse.com - -- Added 2 patches to fix bsc#1001765 - - 0001-If-the-notification-message-length-is-0-ignore-the-m.patch - 0001-pid1-don-t-return-any-error-in-manager_dispatch_noti.patch - -------------------------------------------------------------------- -Thu Sep 29 06:24:01 UTC 2016 - fbui@suse.com - -- Revert "udev: don't require nsserv and fillup" - - It's been judged too late for being part of SLE12 final release. - Nevertheless it's part of Factory and will be reintroduced after the - final release is out (ie through an update). - -------------------------------------------------------------------- -Mon Sep 26 14:23:14 UTC 2016 - fbui@suse.com - -- systemd-sysv-convert: make sure that - /var/lib/systemd/sysv-convert/database is always initialized (bsc#982211) - - If "--save" command was used and the sysv init script wasn't enabled - at all the database file wasn't created at all. This makes the - subsequent call to "--apply" fail even though this should not - considered as an error. - -------------------------------------------------------------------- -Mon Sep 26 09:09:27 UTC 2016 - fbui@suse.com - -- Added patches to fix journal with FSS protection enabled (bsc#1000435) - - 0001-journal-fix-HMAC-calculation-when-appending-a-data-o.patch - 0001-journal-set-STATE_ARCHIVED-as-part-of-offlining-2740.patch - 0001-journal-warn-when-we-fail-to-append-a-tag-to-a-journ.patch - -------------------------------------------------------------------- -Wed Sep 21 11:54:39 UTC 2016 - fbui@suse.com - -- udev: don't require nsserv and fillup (bsc#999841) - - udev has no LSB init scripts nor fillup templates anymore. - -------------------------------------------------------------------- -Fri Sep 16 12:38:19 UTC 2016 - fbui@suse.com - -- Build require python and python-lxml in order to generate - systemd.directives man page (bsc#986952) - -------------------------------------------------------------------- -Fri Sep 16 12:27:02 UTC 2016 - fbui@suse.com - -- Add rules: block: add support for pmem devices (#3683) (bsc#988119) - - 0001-rules-block-add-support-for-pmem-devices-3683.patch - -------------------------------------------------------------------- -Tue Sep 6 08:14:06 UTC 2016 - tbechtold@suse.com - -- Fix is-enabled check in systemd-sysv-install (bsc#997268) - -------------------------------------------------------------------- -Wed Aug 24 12:44:24 UTC 2016 - dimstar@opensuse.org - -- Only BuildRequire gnu-efi when building the 'real' systemd - package. - -------------------------------------------------------------------- -Tue Aug 23 10:12:13 UTC 2016 - fbui@suse.com - -- Add a script to fix /var/lib/machines to make it suitable for - rollbacks (bsc#992573) - -------------------------------------------------------------------- -Wed Aug 10 11:30:50 UTC 2016 - meissner@suse.com - -- reverted the systemctl split-off on request of Franck Bui. - -------------------------------------------------------------------- -Fri Jul 29 11:49:39 UTC 2016 - jengelh@inai.de - -- Add sysusers to the new split "systemctl" subpackage - -------------------------------------------------------------------- -Tue Jul 26 11:07:25 UTC 2016 - jengelh@inai.de - -- Split systemctl and tmpfiles into a separate package - -------------------------------------------------------------------- -Tue Jul 19 17:42:45 UTC 2016 - develop7@develop7.info - -- Fix 1099-Add-default-rules-for-valve-steam-controller-to-work.patch - to enable missing functionality of Steam Controller - -------------------------------------------------------------------- -Sun Jul 17 03:41:05 UTC 2016 - asarai@suse.com - -- Backport unified_cgroup_hierarchy fix for Linux >= 4.4. boo#989276 - + systemd-230-cgroup2-use-new-fstype-for-unified-hierarchy.patch - -------------------------------------------------------------------- -Sat Jun 18 16:17:36 UTC 2016 - arvidjaar@gmail.com - -- drop 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch - it breaks btrfs on multiple device-mapper devices (boo#984516). The problem - it tried to fix is already fixed in rule shipped with btrfsprogs (see - boo#912170). - -------------------------------------------------------------------- -Wed May 4 06:37:51 UTC 2016 - Thomas.Blume@suse.com - -- fix warning about missing install info during preset (boo#970293) - 0001-systemctl-pid1-do-not-warn-about-missing-install-inf.patch - -------------------------------------------------------------------- -Thu Apr 7 12:13:16 UTC 2016 - schwab@suse.de - -- Avoid bootstrap cycle with sg3_utils - -------------------------------------------------------------------- -Tue Apr 5 07:08:39 UTC 2016 - werner@suse.de - -- Fix patch patch handle-numlock-value-in-etc-sysconfig-keyboard.patch - that is do not close a file descriptor twice (boo#973907) - -------------------------------------------------------------------- -Sat Mar 26 15:59:36 UTC 2016 - jengelh@inai.de - -- Add two patches which address logind/networkd disappearing from - dbus (and busctl) even while the units and processes continue - running. - 0001-core-fix-bus-name-synchronization-after-daemon-reloa.patch - 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch - -------------------------------------------------------------------- -Mon Mar 14 18:04:10 UTC 2016 - fbui@suse.com - -- drop all compiler/linker option customizations: - - -pipe option is used by default since day 0 - - get rid of cflags() function which is not needed - - --hash-size has no impact specially in runtime - - IOW, use the default options for the compiler and the linker, - there's no point in making systemd different from other package in - this regards. - -------------------------------------------------------------------- -Mon Mar 14 17:26:00 UTC 2016 - fbui@suse.com - -- use %make_build instead of 'make %{?_smp_mflags}' - -------------------------------------------------------------------- -Mon Mar 14 16:36:32 UTC 2016 - fbui@suse.com - -- be more strict on own lib version requirements - -------------------------------------------------------------------- -Mon Mar 14 16:11:49 UTC 2016 - fbui@suse.com - -- systemd should require udev with the exact same version - -------------------------------------------------------------------- -Thu Mar 10 08:01:57 UTC 2016 - werner@suse.de - -- Modify patch handle-numlock-value-in-etc-sysconfig-keyboard.patch - to allow that open, seek, and read of /dev/mem may fail e.g. - on XEN based virtual guests (bsc#961120) - -------------------------------------------------------------------- -Tue Mar 1 09:16:08 UTC 2016 - werner@suse.de - -- Add upstream patch - 0001-core-exclude-.slice-units-from-systemctl-isolate.patch - this fixes forced logouts on isolate target aka changing runlevel - (boo#966535) - -------------------------------------------------------------------- -Thu Feb 4 11:05:37 UTC 2016 - lnussel@suse.de - -- require curl and bzip2 to build importd -- curl also causes building of journal-upload. That one has rather - unusal certificate usage, set it's ca root to /etc/pki/systemd - instead of the built-in default /etc/ssl as journal-remote and - journal-upload think they kan put stuff in /etc/ssl/certs then but - that directory is managed by p11-kit and doesn't serve the purpose - those programs think. -- /var/lib/systemd/random-seed is a file -- own /var/lib/machines -- add systemd-228-nspawn-make-journal-linking-non-fatal-in-try-and-auto.diff - -------------------------------------------------------------------- -Sat Jan 9 22:46:21 UTC 2016 - afaerber@suse.de - -- systemd-sysv-install: Fix chkconfig argument for disable op - -------------------------------------------------------------------- -Thu Jan 7 08:01:07 UTC 2016 - olaf@aepfle.de - -- Create groups adm,input,tape in fixed order (boo#944660) - -------------------------------------------------------------------- -Mon Dec 21 16:25:44 UTC 2015 - fbui@suse.com - -- Make sure we don't use tmpfs on /tmp by default (bsc#940522) - -------------------------------------------------------------------- -Mon Dec 21 10:07:38 UTC 2015 - jengelh@inai.de - -- Avoid enabling readahead services; they have been removed. -- In %install, only process kbd-model-map.xkb-generated if it - exists. Resolves a build failure in 13.2/42.1. - -------------------------------------------------------------------- -Wed Dec 9 15:12:30 UTC 2015 - crrodriguez@opensuse.org - -- spec: update minimum kernel version to 3.11 -- Update minimum util-linux version to 2.27.1 - -------------------------------------------------------------------- -Thu Dec 3 15:33:27 UTC 2015 - tchvatal@suse.com - -- Add patch to enable working steam controller: - * 1099-Add-default-rules-for-valve-steam-controller-to-work.patch - -------------------------------------------------------------------- -Mon Nov 30 13:59:52 UTC 2015 - thomas.blume@suse.com - -- fix CVE-2015-7510: Stack overflow in nss-mymachines (boo#956712) - Add 0001-nss-mymachines-do-not-allow-overlong-machine-names.patch - -------------------------------------------------------------------- -Wed Nov 18 14:17:05 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 228 -* The various memory-related resource limit settings (such as - LimitAS=) now understand the usual K, M, G, ... suffixes to - the base of 1024 (IEC). Similar, the time-related settings - understand the usual min, h, day, ... suffixes now. -* CPUAffinity= now takes CPU index ranges in addition to just - individual indexes. -* A number of properties previously only settable in unit - files are now also available as properties to set when - creating transient units programmatically via the bus. -- Remove 0001-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch - (merged upstream) - -------------------------------------------------------------------- -Fri Nov 13 00:00:12 UTC 2015 - sor.alexei@meowr.ru - -- Update to 227. -- Rebase systemd-pam_config.patch, - handle-root_uses_lang-value-in-etc-sysconfig-language.patch, - 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch, - 0001-On_s390_con3270_disable_ANSI_colour_esc.patch, - 0014-journald-with-journaling-FS.patch, - 0019-make-completion-smart-to-be-able-to-redirect.patch, - avoid-divide-by-zero-sigtrap.patch, systemd-add-user-keep.patch, - set-and-use-default-logconsole.patch, - tty-ask-password-agent-on-console.patch, - 0001-bnc888612-logind-polkit-acpi.patch, - watch_resolv.conf_for_become_changed.patch, - 1097-udevd-increase-maximum-number-of-children.patch. -- Remove - 0002-units-enable-waiting-for-unit-termination-in-certain.patch, - 1001-re-enable-by_path-links-for-ata-devices.patch, - rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch: - fixed upstream. - -------------------------------------------------------------------- -Thu Nov 12 09:56:36 UTC 2015 - werner@suse.de - -- Modify patch handle-root_uses_lang-value-in-etc-sysconfig-language.patch - to handle locale at boot time well (boo#927250) -- Be able to use build service environments several times - -------------------------------------------------------------------- -Tue Nov 10 18:06:43 UTC 2015 - schwab@suse.de - -- 1096-new-udev-root-symlink-generator.patch: fix substitution in - ExecStart value - -------------------------------------------------------------------- -Wed Oct 21 20:18:58 UTC 2015 - dmueller@suse.com - -- enable seccomp for aarch64 (fate#318444) - -------------------------------------------------------------------- -Thu Oct 15 14:12:44 UTC 2015 - fbui@suse.com - -- Fix again UEFI for mini package - -------------------------------------------------------------------- -Thu Oct 15 09:07:51 UTC 2015 - jengelh@inai.de - -- Drop one more undesirable Obsoletes/Provides. This should have - been a Conflicts. (There was already a Conflicts, and since - Conflicts go both ways, we won't need a second one.) - -------------------------------------------------------------------- -Thu Oct 15 08:19:00 UTC 2015 - werner@suse.de - -- No UEFI for systemd-mini - -------------------------------------------------------------------- -Mon Oct 12 11:34:13 UTC 2015 - fbui@suse.com - -- Add 2 upstream patches to fix boo#949574 and bsc#932284 - 0001-Make-sure-the-mount-units-pulled-by-RequiresMountsFo.patch - 0002-units-enable-waiting-for-unit-termination-in-certain.patch - -------------------------------------------------------------------- -Fri Oct 9 18:03:02 UTC 2015 - fbui@suse.com - -- Disable systemd-boot on aarch64 since it fails to build. - Error while compiling src/boot/efi/util.o is: - usr/include/efi/aarch64/efibind.h:2:20: fatal error: stdint.h: No such file or directory - -------------------------------------------------------------------- -Fri Oct 9 07:16:45 UTC 2015 - fbui@suse.com - -- Fix UEFI detection logic: basically we let configure.ac figure out - if UEFI is supported by the current build environment. No need to - clutter the spec file with a new conditionnal %has_efi. - -- Provide systemd-bootx64.efi (aka gummiboot) - -------------------------------------------------------------------- -Tue Oct 6 15:13:04 UTC 2015 - werner@suse.de - -- Modify patch tty-ask-password-agent-on-console.patch to reflect - the changes done for pull request 1432 - -------------------------------------------------------------------- -Thu Oct 1 15:58:32 UTC 2015 - jengelh@inai.de - -- Undo Obsoletes/Provides (from Aug 11), creates too big a cycle. -- Provide systemd-sysv-install program/link [bnc#948353] - -------------------------------------------------------------------- -Fri Sep 25 14:20:41 UTC 2015 - werner@suse.de - -- Fix patch tty-ask-password-agent-on-console.patch not to crash - away but enable it to ask on all devices of /dev/console - -------------------------------------------------------------------- -Wed Sep 23 14:19:32 UTC 2015 - jengelh@inai.de - -- Avoid "file not found /etc/udev/rules.d/70-persistent-net.rules" - waring occurring in %post - -------------------------------------------------------------------- -Wed Sep 23 12:41:19 UTC 2015 - werner@suse.de - -- Add patch let-vconsole-setup-get-properties-only-once-to-copy-them.patch - to avoid broken virtual console mapping due stressed ioctl API - for the virtual consoles (boo#904214) - -------------------------------------------------------------------- -Mon Sep 7 12:21:06 UTC 2015 - werner@suse.de - -- Fix last change that is use the new name for udev packages in %pretrans. - -------------------------------------------------------------------- -Mon Sep 7 11:50:21 UTC 2015 - fbui@suse.com - -- restore usage of LUA in %pretrans. - -------------------------------------------------------------------- -Mon Sep 7 08:09:05 UTC 2015 - werner@suse.de - -- Try to generate the systemd users and groups always in same order - to avoid republish other packages (boo#944660) - -------------------------------------------------------------------- -Fri Aug 21 07:49:33 UTC 2015 - fbui@suse.com - -- cleanup specfile by removing commands that were dealing with systemd - pre-generated files: we're now using systemd tarball generated directly - from the git repo which doesn't contain any of these files. -- there's no point in using LUA in %pretrans - -------------------------------------------------------------------- -Wed Aug 19 09:34:41 UTC 2015 - fbui@suse.com - -- Drop 0009-make-xsltproc-use-correct-ROFF-links.patch - -This patch was initialy added to workaround bsc#842844. But it -appears that man(1) was fixed (included since 13.2 at least) to -handle manual pages that consist only of a .so directive such as -'.so '. - -------------------------------------------------------------------- -Thu Aug 13 11:46:12 UTC 2015 - werner@suse.de - -- Change use-rndaddentropy-ioctl-to-load-random-seed.patch to - make it work on big endian - -------------------------------------------------------------------- -Tue Aug 11 09:48:26 UTC 2015 - jengelh@inai.de - -- Use Obsolete/Provides strategy from - windows:mingw:mingw64/mingw64-cross-gcc to do the bootstrap - cycle and kick out -mini afterwards. - -------------------------------------------------------------------- -Tue Aug 11 05:15:09 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 224 -* systemd-networkd gained a number of new configuration options - for DHCP, tunnels and bridges -* systemd-efi-boot-generator functionality was merged into - systemd-gpt-auto-generator. - -------------------------------------------------------------------- -Mon Aug 10 13:16:54 UTC 2015 - sndirsch@suse.com - -- /usr/share/systemd/kbd-model-map: added entries for - xkeyboard-config converted keymaps; mappings, which already - exist in original systemd mapping table are being ignored - though, i.e. not overwritten; needs kbd in buildrequires - (FATE#318426) - -------------------------------------------------------------------- -Wed Jul 29 18:10:53 UTC 2015 - meissner@suse.com - -- hostname-NULL.patch: Work around a crash on XEN hosts - in OBS. /etc/hostname is not present and systemd then does - strchr(hostname,soemthing) with hostname NULL. - -------------------------------------------------------------------- -Wed Jul 29 09:02:21 UTC 2015 - werner@suse.de - -- Add Correct_assert_on_unexpected_error_code.patch to work around - a problem of an assert on ENODEV for closing fd on an input - event device (boo#939571) - -------------------------------------------------------------------- -Mon Jul 13 15:31:46 UTC 2015 - jengelh@inai.de - -- Remove udev-generate-rules.sh, apparently not used by anything in - the systemd nor udev-persistent-ifnames package. - -------------------------------------------------------------------- -Wed Jul 8 20:44:57 UTC 2015 - crrodriguez@opensuse.org - -- Systemd v222, bugfix release. -- Drop upstream patches -0006-pam_systemd-Properly-check-kdbus-availability.patch -0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch -0031-install-fix-bad-memory-access.patch -1032-ata_id-unbotch-format-specifier.patch -- Drop SUSE patch 1013-no-runtime-PM-for-IBM-consoles.patch - udev does no longer enable USB HID power management at all. -- The udev accelerometer helper was removed, obsoleted by - iio-sensor-proxy package. -- networkd gained a new configuration option IPv6PrivacyExtensions. -- udev does not longer support the WAIT_FOR_SYSFS= key in udev - rules. There are no known issues with current sysfs, - and udev does not need or should be used to work around such bugs. - -------------------------------------------------------------------- -Tue Jul 7 08:54:38 UTC 2015 - jengelh@inai.de - -- Avoid restarting logind [bnc#934901] -- Do not suppress errors in any case, even if they are ignored - -------------------------------------------------------------------- -Sun Jul 5 15:52:33 UTC 2015 - hrvoje.senjan@gmail.com - -- Fix devel package requires (both mini and real required real libsystemd0) - -------------------------------------------------------------------- -Fri Jul 3 11:17:01 UTC 2015 - werner@suse.de - -- Rework patch tty-ask-password-agent-on-console.patch to fit the - requisition of https://bugs.freedesktop.org/show_bug.cgi?id=82004 - -------------------------------------------------------------------- -Wed Jul 1 09:42:44 UTC 2015 - jengelh@inai.de - -- Rework "-mini" package logic to not conflict with itself and - then add libsystemd0 to mini. - -------------------------------------------------------------------- -Wed Jul 1 03:43:51 UTC 2015 - crrodriguez@opensuse.org - -- remove SysVStartPriority= from after-local.service, - unsupported since v218. - Note that this option was only parsed and that's it. the logic - to give "start priority" was never implemented. - -------------------------------------------------------------------- -Wed Jul 1 03:20:20 UTC 2015 - crrodriguez@opensuse.org - -- change the default fallback ntp servers to the opensuse - pool.ntp.org vendor zone. -- We still need to run systemd-sysctl.service after local-fs.target - otherwise it works only when /boot is in the root filesystem but - not when it is a separate partition. - -------------------------------------------------------------------- -Fri Jun 26 17:14:46 CEST 2015 - sbrabec@suse.com - -- Obsolete pm-utils and suspend (boo#925873). -- Remove pm-utils support - (remove Forward-suspend-hibernate-calls-to-pm-utils.patch). - -------------------------------------------------------------------- -Thu Jun 25 17:27:06 UTC 2015 - crrodriguez@opensuse.org - -- remove patch sysctl-handle-boot-sysctl.conf-kernel_release.patch - from the filelist. - -------------------------------------------------------------------- -Thu Jun 25 05:56:55 UTC 2015 - crrodriguez@opensuse.org - -- libpcre, glib2 and libusb are not used by systemd, remove - from buildrequires. - -------------------------------------------------------------------- -Thu Jun 25 05:19:54 UTC 2015 - crrodriguez@opensuse.org - -- 1032-ata_id-unbotch-format-specifier.patch: fix udev ata_id - output. -- 0023-core-fix-reversed-dependency-check-in-unit_check_unn.patch - fix StopWhenUnneeded=true in combination with a Requisite= - dependency. -- 0031-install-fix-bad-memory-access.patch: Fix Bad memory access -- 0006-pam_systemd-Properly-check-kdbus-availability.patch: if - kdbus is enabled (i.e boot with kdbus=1) DBUS_SESSION_BUS_ADDRESS - must not be exported. -- spec: add a min_kernel_version macro to ensure the package - conflicts with kernel versions in which systemd cannot run. - -------------------------------------------------------------------- -Wed Jun 24 20:06:27 UTC 2015 - crrodriguez@opensuse.org - -- sysctl-handle-boot-sysctl.conf-kernel_release.patch dropped, - replaced by a tmpfiles.d snippet "current-kernel-sysctl.conf" - (feature implemented in v220 just for our usecase) - -------------------------------------------------------------------- -Wed Jun 24 19:45:17 UTC 2015 - crrodriguez@opensuse.org - -- fix build when resolved is enabled -- remove fsck -l test in spec file, systemd requires util-linux - 2.26 or later where this feature is already available. - -------------------------------------------------------------------- -Wed Jun 24 17:43:22 UTC 2015 - hrvoje.senjan@gmail.com - -- Fix bootstrap build by guarding filelists (man pages don't get - built in bootstrap mode) -- Drop commented sections from baselibs.conf, allows format_spec_file - to have a successful run - -------------------------------------------------------------------- -Wed Jun 24 14:17:04 UTC 2015 - mpluskal@suse.com - -- Install 50-coredump.conf as coredumpctl is now installed by - default and does not use journal anymore as default storage - -------------------------------------------------------------------- -Fri Jun 19 20:51:14 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 221 -* From 220: -* libgudev was moved into a package of its own -* Runlevels 2, 3 and 4 are no longer distinct, they all map to - multi-user.target. -* The EFI System Partition mounted to /boot will be unmounted - 2 minutes after boot. -* systemd does not support direct live-upgrades (via `systemctl - daemon-reexec`) from versions older than v44 anymore. -* systemd-nspawn may now be called as part of a shell pipeline. -* systemd-shutdownd has been removed. This service was - previously responsible for implementing scheduled shutdowns - as exposed in /usr/bin/shutdown's time parameter. This - functionality has now been moved into systemd-logind and is - accessible via a bus interface. -* udev will no longer call blkid and create symlinks for all - block devices, but merely those from a whitelist - (cf. 60-persistent-storage.rules). -* /usr/lib/os-release gained a new optional field VARIANT= -* Details at - http://lists.freedesktop.org/archives/systemd-devel/2015-May/032147.html -* From 221: -* New sd-bus and sd-event APIs in libsystemd -* If there is both a systemd unit and a SysV init script for the - same service name, and `systemctl enable` or other operation is - run, both will now be enabled (or execute the related operation - on both), not just the unit. -- Split libsystemd0 to support systemd-less nspawn containers -- Redo manpage file lists without %exclude, tends to hide - unpackaged files. -- hwdb belongs to udev -- Resolve memory leak and add missing _cleanup_free_ to - 0001-On_s390_con3270_disable_ANSI_colour_esc.patch -- Remove systemd-powerd-initctl-support.patch - (no longer builds because shutdownd is gone) -- Remove quilt-patches/0001-core-rework-device-state-logic.patch, - 0001-Let-some-boolean-survive-a-daemon-reload.patch - (merged upstream), - 0001-Let-some-boolean-survive-a-daemon-reload.patch - (obsolete) - -------------------------------------------------------------------- -Thu Jun 11 14:48:03 UTC 2015 - werner@suse.de - -- Remove libudev0 from baselibs.conf - -------------------------------------------------------------------- -Thu Jun 11 12:12:58 UTC 2015 - werner@suse.de - -- Drop 1055-let-9719859c07aa13539ed2cd4b31972cd30f678543-apply.patch - as now upstream code -- Add 0001-Let-some-boolean-survive-a-daemon-reload.patch to fix - bsc#933365 and boo#934077 - -------------------------------------------------------------------- -Tue Jun 2 13:33:24 UTC 2015 - pwieczorkiewicz@suse.com - -- Add 1098-systemd-networkd-alias-network-service.patch to alias - network.service the same way NetworkManager and wicked does. - This is needed by yast2 and other parts of the system. boo#933092 - -------------------------------------------------------------------- -Mon May 18 14:39:47 UTC 2015 - werner@suse.de - -- Modify patch 1021-udev-re-add-persistent-net-rules.patch to use - the new return values of proc_cmdline() in enable_name_policy() - this should fix boo#931165 - -------------------------------------------------------------------- -Mon May 18 12:25:54 UTC 2015 - jengelh@inai.de - -- Drop 1021-udev-re-add-persistent-net-rules.patch, - 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch, - 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch, - 1046-fix-duplicated-rules-with-layer3-interfaces.patch, - 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch, - 1051-check-if-NAME-has-a-value.patch, - 1053-better-checks-in-write_net_rules.patch, - 1088-drop-renaming-of-virtual-interfaces-in-guest.patch. - 1021 originally broke parsing of net.ifnames=0 [bnc#931165], - and given that neither the kernel command line needs to be - touched nor the source be patched to reach the unpredictable - naming setup for SLE, all these parts are moved to a separate - package. - -------------------------------------------------------------------- -Mon Mar 16 15:35:31 UTC 2015 - werner@suse.de - -- Add upstream patch - 0001-core-don-t-change-removed-devices-to-state-tentative.patch - to fix the fix of the last backport (bsc#921898) - -------------------------------------------------------------------- -Thu Mar 5 11:36:11 UTC 2015 - jengelh@inai.de - -- Reenable networkd which was silently disabled on Feb 18 - -------------------------------------------------------------------- -Tue Mar 3 16:03:07 UTC 2015 - jengelh@inai.de - -- Add 0001-core-rework-device-state-logic.patch to fix spurious - automated umount after mount. - -------------------------------------------------------------------- -Wed Feb 18 12:13:52 UTC 2015 - meissner@suse.com - -- mark more subpackages as !bootstrap for systemd-mini usage. - -------------------------------------------------------------------- -Wed Feb 18 05:01:38 UTC 2015 - crrodriguez@opensuse.org - -- spec : remove --with-firmware-path, firmware loader was removed in v217 -- spec: remove --disable-multi-seat-x, gone.(fixed in xorg) -- spec: Do not enable systemd-readahead-collect.service and -systemd-readahead-replay.service as these do not exist anymore. -- spec: drop timedate-add-support-for-openSUSE-version-of-etc-sysconfig.patch - Yast was fixed to write all timezone changes exactly how timedated expects - things to be done. -- spec: remove handle-etc-HOSTNAME.patch, since late 2014 the netcfg - package handles the migration from /etc/HOSTNAME to /etc/hostname - and owns both files. --spec: remove boot.udev and systemd-journald.init as they currently - serve no purpose. -- suse-sysv-bootd-support.diff: Remove HAVE_SYSVINIT conditions, we - are in sysvcompat-only codepath, also remove the code targetting other - distributions, never compiled as the TARGET_$DISTRO macros are never defined. -- systemd-powerd-initctl-support.patch guard with HAVE_SYSV_COMPAT -- set-and-use-default-logconsole.patch: fix HAVE_SYSV_COMPAT guards -- insserv-generator.patch: Only build when sysvcompat is enabled -- vhangup-on-all-consoles.patch add a comment indicating this is a workaround - for a kernel bug. -- spec: Add option to allow disabling sysvinit compat at build time. -- spec: Add option to enable resolved at build time. -- spec: Remove all %ifs for !factory products, current systemd releases can - neither be built nor installed in older products without upgrading - several components of the base system. - (removed: 1008-add-msft-compability-rules.patch was only for =< 13.1) -- spec: remove all dummy "aliases" to /etc/init.d, that made sense only when - those init scripts still existed. (dummy localfs.service source: gone) -- systemd-sleep-grub: moved to the grub2 package where it belongs as a - suspend/resume hook (SR#286533) (drops prepare-suspend-to-disk.patch) -- remove LFS_CFLAGS from CFLAGS, never needed in systemd as it force feds - config.h everywhere in the preprocessor cmdline. - -------------------------------------------------------------------- -Mon Feb 16 23:46:11 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 219 -* systemd units can now be "unsupported" (like, for example, - .device in a containers), similar to the "skipped" state in - SUSE's prior sysvinit scripts. -* tmpfiles gained the 'v' type for creating btrfs subvolumes. -* tmpfiles gained the 'a' type for setting ACLs. -* systemd-nspawn gained new switches: --ephemeral, --template -* The /var/lib/containers location is deprecated and replaced by - /var/lib/machines. -* machinectl gained the copy-from and copy-to commands. -* machinectl now knows a "bind" command (for use with nspawn) -* new "systemd-importd" daemon to download container images and run - them as nspawn containers. -* networkd collects LLDP network announcements, if available, and - so shown in networkctl. -* The fallback terminal type was changed from "vt102" to "vt220", - allowing PgUp/PgDn keys to work. -* Pressing Ctrl-Alt-Del 7x in 2 seconds forces a umount+reboot now, - useful should the regular shutdown hang. -* Removing storage will cause systemd to unmount the associated - mountpoints so that they don't linger around. - -------------------------------------------------------------------- -Mon Feb 16 11:47:04 UTC 2015 - jengelh@inai.de - -- Add suse-sysv-bootd-support.diff (reinstate old - Revert-service-drop-support-for-SysV-scripts-for-the-early.patch) - -------------------------------------------------------------------- -Mon Feb 16 10:18:18 UTC 2015 - jengelh@inai.de - -- Update to systemd v218-1050-g38ab096 -- Remove patches - use-usr-sbin-sulogin-for-emergency-service.patch (upstream fixed it) -- Reinstate and improve (remove huge indents from) - tty-ask-password-agent-on-console.patch, - 0014-journald-with-journaling-FS.patch, rootsymlink_generator. - -------------------------------------------------------------------- -Mon Feb 16 09:42:48 UTC 2015 - meissner@suse.com - -- disable systemd-resolved for now as it interacts not well with - our methods and security has concerns regarding spoofing. bsc#917781 - -------------------------------------------------------------------- -Tue Jan 20 11:33:59 UTC 2015 - werner@suse.de - -- Add patch kbd-model-map.patch to add missed keyboard layouts - which are offered by YaST2 (bsc#910643 and boo#897803) - -------------------------------------------------------------------- -Fri Jan 9 18:48:28 UTC 2015 - jengelh@inai.de - -- Update to new upstream release 218 -* New utilities: systemd-timesyncd (SNTP client), - systemd-resolved, systemd-networkd, networkctl, - systemd-sysusers -* machinectl gained a "poweroff" command for clean container shutdown -* The udev hwdb now contains DPI information for mice. -* Userspace firmware loading support has been removed and - the minimum supported kernel version is thus bumped to 3.7. -- Remove patches: - G=gone locally, is upstream; - D=dropped: no longer needed; - N=no longer applies to source nor is it deemed needed; - K=killed: no longer applicable and too complex to resolve: - ---- - G 0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch - G avoid-assertion-if-invalid-address-familily-is-passed-to-g.patch - K service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch - K remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch - K handle-SYSTEMCTL_OPTIONS-environment-variable.patch - K 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch - K log-target-null-instead-kmsg.patch - K tty-ask-password-agent-on-console.patch - K 513-nspawn-veth.patch - K 1087-infinit-timeout-for-kmod-loaded-modules.patch - D module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch - D avoid-leaking-socket-descriptors.patch - D 0001-make-fortify-happy-with-ppoll.patch - N fix-owner-of-var-log-btmp.patch - N disable-nss-myhostname-warning-bnc-783841.patch - N Revert-service-drop-support-for-SysV-scripts-for-the-early.patch - N 0001-make-209-working-on-older-dist.patch - N 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch - N tmpfiles-do-not-clean-for-mandb-index-files.patch - G 0001-sd-bus-don-t-look-for-a-64bit-value-when-we-only-hav.patch - G avoid-assertion-if-invalid-address-familily-is-passed-to-g.patc - G optionally-warn-if-nss-myhostname-is-called.patch - G 0001-units-systemd-sysctl.service.in-run-after-load-modul.patch - G 0004-getty-generator-properly-escape-instance-names.patch - G rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch - G 0008-Reset-signal-mask-on-re-exec-to-init.patch - G 0001-login-fix-pos-array-allocation.patch - G 0002-login-set-pos-slot-to-fallback-on-pos-eviction.patch - G 0003-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch - G 0004-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch - G 0005-Replace-var-run-with-run-in-remaining-places.patch - G 0006-Revert-back-to-var-run-at-a-couple-of-problems.patch - G 0007-README-document-that-var-run-must-be-a-symlink-run.patch - G 0008-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch - G 0009-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch - G 0010-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch - G 0011-logs-show-fix-corrupt-output-with-empty-messages.patch - G 0012-journalctl-refuse-extra-arguments-with-verify-and-si.patch - G 0014-nspawn-fix-detection-of-missing-proc-self-loginuid.patch - G 0001-Fix-systemd-stdio-bridge-symlink.patch - G 0002-execute-free-directory-path-if-we-fail-to-remove-it-.patch - G 0003-Do-not-print-invalid-UTF-8-in-error-messages.patch - G 0004-man-document-missing-options-of-systemd-run.patch - G 0005-systemd-run-add-some-extra-safety-checks.patch - G 0006-journal-assume-that-next-entry-is-after-previous-ent.patch - G 0007-journal-forget-file-after-encountering-an-error.patch - G 0008-core-correctly-unregister-PIDs-from-PID-hashtables.patch - G 0009-logind-fix-reference-to-systemd-user-sessions.servic.patch - G 0010-man-update-link-to-LSB.patch - G 0011-man-systemd-bootchart-fix-spacing-in-command.patch - G 0012-man-add-missing-comma.patch - G 0013-units-Do-not-unescape-instance-name-in-systemd-backl.patch - G 0001-core-busname-add-lookup-string-for-BUSNAME_FAILURE_S.patch - G 0002-manager-flush-memory-stream-before-using-the-buffer.patch - G 0003-busname-don-t-drop-service-from-the-result-string.patch - G 0004-fix-off-by-one-error-in-array-index-assertion.patch - G 0005-logind-fix-policykit-checks.patch - G 0006-rules-mark-loop-device-as-SYSTEMD_READY-0-if-no-file.patch - G 0008-man-multiple-sleep-modes-are-to-be-separated-by-whit.patch - G 0001-gpt-auto-generator-don-t-return-OOM-on-parentless-de.patch - G 0002-bus-fix-memory-leak-when-kdbus-is-not-enabled.patch - G 0006-Do-not-return-1-EINVAL-on-allocation-error.patch - G 0007-networkd-fix-typo.patch - G 0008-sd-bus-don-t-access-invalid-memory-if-a-signal-match.patch - G 0009-sd-bus-don-t-choke-if-somebody-sends-us-a-message-wi.patch - G 0012-journald-remove-stray-reset-of-error-return-value.patch - G 0013-core-libsystemd-systemd-timedate-udev-spelling-fixes.patch - G 0001-cgroup-it-s-not-OK-to-invoke-alloca-in-loops.patch - G 0002-machined-fix-Kill-bus-call-on-machine-objects-when-w.patch - G 0003-sd-bus-don-t-use-assert_return-to-check-for-disconne.patch - G 0004-core-don-t-try-to-relabel-mounts-before-we-loaded-th.patch - G 0005-sd-daemon-fix-incorrect-variable-access.patch - G 0006-sd-event-initialization-perturbation-value-right-bef.patch - G 0007-sd-event-don-t-accidentally-turn-of-watchdog-timer-e.patch - G 0008-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch - G 0009-ask-password-when-the-user-types-a-overly-long-passw.patch - G 0001-journal-fix-export-of-messages-containing-newlines.patch - G 0002-systemctl-update-NAME-to-PATTERN-in-help.patch - G 0003-tty-ask-password-agent-return-negative-errno.patch - G 0004-systemd-python-use-.hex-instead-of-.get_hex.patch - G 0005-systemd-python-fix-failing-assert.patch - G 0007-dbus-suppress-duplicate-and-misleading-messages.patch - G 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch - G 0001-bash-completion-fix-__get_startable_units.patch - G 0002-sysctl-replaces-some-slashes-with-dots.patch - G 0003-delta-do-not-use-unicode-chars-in-C-locale.patch - G 0004-implement-a-union-to-pad-out-file_handle.patch - G shut-up-annoying-assertion-monotonic-clock-message.patch - G 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch - G 0001-tmpfiles-fix-permissions-on-new-journal-files.patch - G 0001-errno-make-sure-to-handle-the-3-errnos-that-are-alia.patch - G 0003-analyze-fix-plot-with-bad-y-size.patch - G 0004-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch - G 0005-job-always-add-waiting-jobs-to-run-queue-during-cold.patch - G 0001-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch - G 0002-backlight-do-nothing-if-max_brightness-is-0.patch - G 0003-backlight-unify-error-messages.patch - G 0004-backlight-warn-if-kernel-exposes-backlight-device-wi.patch - G 0005-backlight-handle-saved-brightness-exceeding-max-brig.patch - G 0001-replace-more-dup-by-F_DUPFD_CLOEXEC.patch - G 0002-pam_systemd-use-F_DUPFD_CLOEXEC-when-dupping-session.patch - G 0001-core-close-socket-fds-asynchronously.patch - G 0002-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch - G 0003-core-make-sure-to-serialize-jobs-for-all-units.patch - G 0001-logind-ignore-lid-switch-if-more-than-1-display-is-c.patch - G 0002-logind-fix-printf-format.patch - G 0003-logind-ignore-lid-switch-events-for-30s-after-each-s.patch - G 0004-logind-Do-not-fail-display-count-if-a-device-has-no-.patch - G 0005-logind-move-lid-switch-handling-from-logind-main-to-.patch - G 0006-man-clarify-that-the-ExecReload-command-should-be-sy.patch - G 0007-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch - G 0008-man-update-journald-rate-limit-defaults.patch - G 0009-nspawn-properly-format-container_uuid-in-UUID-format.patch - G 0010-logind-allow-suspending-if-there-are-no-displays.patch - G 0001-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0002-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0003-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0004-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0005-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0001-conf-parser-silently-ignore-sections-starting-with-X.patch - G 0002-man-note-that-entire-sections-can-now-be-ignored.patch - G 0004-machined-make-sure-GetMachineAddresses-is-available-.patch - G 0005-core-Filter-by-state-behind-the-D-Bus-API-not-in-the.patch - G 0006-login-add-mir-to-the-list-of-session-types.patch - G 0007-logind-fix-Display-property-of-user-objects.patch - G 0001-hwdb-update.patch - G 0002-hwdb-update.patch - G 0003-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch - G 0004-hwdb-update.patch - G 0005-hwdb-update.patch - G 0001-journal-cleanup-up-error-handling-in-update_catalog.patch - G 0002-journal-properly-detect-language-specified-in-line.patch - G 0003-man-mention-XDG_CONFIG_HOME-in-systemd.unit.patch - G 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch - G 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch - G 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch - G 0002-nspawn-restore-journal-directory-is-empty-check.patch - G 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch - G 0004-socket-properly-handle-if-our-service-vanished-durin.patch - G 0001-Do-not-unescape-unit-names-in-Install-section.patch - G 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch - G 0001-virt-rework-container-detection-logic.patch - G 0002-fsck-include-device-name-in-the-message-about-missin.patch - G 0003-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch - G 0004-util-ignore_file-should-not-allow-files-ending-with.patch - G 0006-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch - G 0007-keyboard-add-Plantronics-.Audio-mute-button.patch - G 0001-build-sys-use-glibc-s-xattr-support-instead-of-requi.patch - G 0001-hwdb-fix-case-sensitive-match.patch - G 0001-sd-event-restore-correct-timeout-behaviour.patch - G 0002-bus-make-use-of-sd_bus_try_close-in-exit-on-idle-ser.patch - G 0001-umount-modernizations.patch - G 0002-namespace-when-setting-up-an-inaccessible-mount-poin.patch - G 0003-core-allow-transient-mount-units.patch - G 0004-systemd-detect-virt-only-discover-Xen-domU.patch - G 0005-backlight-Do-not-clamp-brightness-for-LEDs.patch - G 0006-log-honour-the-kernel-s-quiet-cmdline-argument.patch - G 0001-core-fix-invalid-free-in-killall.patch - G 0003-install-fix-invalid-free-in-unit_file_mask.patch - G 0001-systemd-detect-virt-detect-s390-virtualization.patch - G 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch - G 0002-units-add-missing-caps-so-that-GetAddresses-can-work.patch - G 0003-units-order-systemd-tmpfiles-clean.service-after-tim.patch - G 0005-po-add-Greek-translation.patch - G 0006-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0007-po-add-German-translation.patch - G 0009-core-clean-up-signal-reset-logic-when-reexec.patch - G 0010-util-treat-fuse.sshfs-as-a-network-filesystem.patch - G 0011-build-sys-add-pthread-flag-for-libsystemd-shared.patch - G 0012-core-transaction-avoid-misleading-error-message-when.patch - G 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch - G 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch - G 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch - G 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch - G 0005-man-fix-path-in-crypttab-5.patch - G 0001-units-order-network-online.target-after-network.targ.patch - G 0001-core-use-correct-format-string-for-UIDs.patch - G 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch - G 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - G 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch - G 0002-journald-make-MaxFileSec-really-default-to-1month.patch - G 0003-units-remove-RefuseManualStart-from-units-which-are-.patch - G 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch - G 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch - G 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch - G 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch - G 0001-parse_uid-return-ENXIO-for-1-uids.patch - G 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch - G 0003-localed-consider-an-unset-model-as-a-wildcard.patch - G 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch - G 0005-bus-close-a-bus-that-failed-to-connect.patch - G 0006-hwdb-update.patch - G 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0001-architecture-Add-tilegx.patch - G 0002-architecture-Add-cris.patch - G 0003-arch-add-crisv32-to-uname-check.patch - G 0004-architecture-remove-cris-from-uname-list.patch - G 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch - G 0002-namespace-fix-uninitialized-memory-access.patch - G 0001-machine-don-t-return-uninitialized-variable.patch - G 0002-vconsole-setup-run-setfont-before-loadkeys.patch - G 0001-util-consider-0x7F-a-control-chracter-which-it-is-DE.patch - G 0002-util-don-t-consider-tabs-special-in-string_has_cc-an.patch - G 0003-architecture-add-string-table-entries-for-mips-le-ar.patch - G 0004-core-Added-support-for-ERRNO-NOTIFY_SOCKET-message-p.patch - G 0005-service-don-t-accept-negative-ERRNO-notification-mes.patch - G 0006-systemctl-show-StatusErrno-value-in-systemctl-status.patch - G 0007-service-flush-status-text-and-errno-values-each-time.patch - G 0001-journal-compress-return-early-in-uncompress_startswi.patch - G 0002-journal-compress-improve-xz-compression-performance.patch - G 0001-logind-allow-switching-to-unused-VTs-via-SwitchTo.patch - G 0002-hostnamed-add-a-new-chassis-type-for-watches.patch - G 0001-units-make-ExecStopPost-action-part-of-ExecStart.patch - G 0001-event-pull-in-sd-event.h-from-event-util.h.patch - G 0002-util-fix-has-cc-check-and-add-test.patch - G 0003-sd-event-always-call-epoll_ctl-on-mask-updates-if-ed.patch - G 0004-fileio-quote-more-shell-characters-in-envfiles.patch - G 0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch - G 0002-units-serial-getty-.service-use-the-default-RestartS.patch - G 0001-po-add-Ukrainian-translation.patch - G 0002-man-document-yearly-and-annually-in-systemd.time-7.patch - G 0003-core-nicer-message-when-inotify-watches-are-exhauste.patch - G 0001-detect-virt-Fix-Xen-domU-discovery.patch - G 0002-Be-more-verbose-when-bind-or-listen-fails.patch - G 0003-Add-quotes-to-warning-message.patch - G 0004-systemd-return-the-first-error-from-manager_startup.patch - G 0001-bash-completion-p-option-for-journalctl.patch - G 0002-journalctl-man-allow-only-between-terms.patch - G 0003-systemd-use-pager-for-test-and-help.patch - G 0001-bus-proxyd-fix-incorrect-comparison.patch - G 0002-shell-completion-prevent-mangling-unit-names.patch - G 0003-Always-check-asprintf-return-code.patch - G 0004-bash-completion-use-list-unit-files-to-get-all-units.patch - G 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch - G 0006-parse_boolean-require-exact-matches.patch - G 0007-drop_duplicates-copy-full-BindMount-struct.patch - G 0008-shell-completion-prevent-mangling-unit-names-bash.patch - G 0009-journald-always-add-syslog-facility-for-messages-com.patch - G 0001-sysv-order-initscripts-which-provide-network-before-.patch - G 0002-keymap-Add-microphone-mute-keymap-for-Dell-Latitude.patch - G 0003-keymap-Annotate-all-micmute-workarounds.patch - G 0007-hwdb-update.patch - G 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch - G 0002-switch-root-umount-the-old-root-correctly.patch - G 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch - G 0004-login-set_controller-should-fail-if-prepare_vt-fails.patch - G 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch - G 0006-login-share-VT-signal-handler-between-sessions.patch - G 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch - G 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch - G 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch - G 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch - G 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch - G 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch - G 0001-hwdb-keymaps-for-Samsung-900X3E-900X3F.patch - G 0002-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch - G 0003-keymap-Fix-HP-Pavillon-DV7.patch - G 0004-hwdb-update-format-description-and-document-reloadin.patch - G 0008-hwdb-update.patch - G 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch - G 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch - G 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch - G 0001-login-fix-memory-leak-on-DropController.patch - G 0002-util-fix-minimal-race-where-we-might-miss-SIGTERMs-w.patch - G 0003-sd-journal-properly-convert-object-size-on-big-endia.patch - G 0004-sd-journal-verify-that-object-start-with-the-field-n.patch - G 0001-nspawn-fix-network-interface.patch - G 0001-completion-filter-templates-from-restartable-units.patch - G 0002-systemd-fix-error-message.patch - G 0003-Quote-unit-names-in-suggested-systemctl-commandlines.patch - G 0004-config-parser-fix-mem-leak.patch - G 0005-login-fix-mem-leak.patch - G 0001-login-simplify-controller-handling.patch - G 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch - G 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0009-hwdb-update.patch - G 0001-systemctl-allow-to-change-the-default-target-without.patch - G 0001-activate-fix-fd-leak-in-do_accept.patch - G 0002-analyze-avoid-a-null-dereference.patch - G 0003-analyze-fix-mem-leak.patch - G 0004-backlight-Avoid-error-when-state-restore-is-disabled.patch - G 0005-bus-avoid-using-m-kdbus-after-freeing-it.patch - G 0006-bus-unref-buscreds-on-failure.patch - G 0007-core-fix-a-potential-mem-leak.patch - G 0008-core-smack-setup-Actually-allow-for-succesfully-load.patch - G 0009-journal-do-not-leak-mmaps-on-OOM.patch - G 0010-manager-use-correct-cleanup-function.patch - G 0001-core-fix-resource-leak-in-manager_environment_add.patch - G 0002-util-remove-a-unnecessary-check.patch - G 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch - G 0004-shared-conf-parser.patch - G 0005-logind-fix-typo.patch - G 0006-systemctl-fix-resource-leak-CID-1237747.patch - G 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch - G 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch - G 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch - G 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch - G 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch - G 0003-mount-order-options-before-other-arguments-to-mount.patch - G 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch - G 0005-shared-label.h-add-missing-stdio.h-include.patch - G 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch - G 0001-login-pause-devices-before-acknowledging-VT-switches.patch - G 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch - G 0001-socket-introduce-SELinuxContextFromNet-option.patch - G 0002-util-avoid-non-portable-__WORDSIZE.patch - G 0001-Fix-warning-about-unused-variable-with-SELINUX.patch - G 0002-bus-remove-unused-check.patch - G 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch - G 0001-logind-add-support-for-Triton2-Power-Button.patch - G 0002-logind-add-support-for-TPS65217-Power-Button.patch - G 0001-shutdownd-clean-up-initialization-of-struct.patch - G 0003-bootchart-parse-userinput-with-safe_atoi.patch - G 0004-bootchart-check-return-of-strftime.patch - G 0005-bootchart-Do-not-try-to-access-data-for-non-existing.patch - G 0001-journalctl-do-not-output-reboot-markers-when-running.patch - G 0002-udev-hwdb-New-Entry-for-Dell-XPS12-9Q33-keyboard.patch - G 0001-core-swap-only-make-configured-units-part-of-swap.ta.patch - G 0009-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0001-virt-detect-that-we-are-running-inside-the-docker-co.patch - G 0002-bootchart-use-n-a-if-PRETTY_NAME-is-not-found.patch - G 0003-fileio-label-return-error-when-writing-fails.patch - G 0001-sd-event-don-t-require-a-signal-event-source-to-be-e.patch - G 0004-sd-event-check-the-value-of-received-signal.patch - G 0005-sd-id128-do-stricter-checking-of-random-boot-id.patch - G 0001-keymap-Fix-touchpad-toggle-on-Toshiba-Satellite-P75-.patch - G 0001-units-introduce-network-pre.target-as-place-to-hook-.patch - G 0002-keymap-Fix-touchpad-toggle-key-on-Asus-laptops.patch - G 0003-sd-bus-check-return-value-of-vasprintf.patch - G 0004-core-map-the-rescue-argument-to-rescue.target.patch - G 0005-util-avoid-double-close-of-fd.patch - G 0001-systemctl-when-mangle-unit-names-for-the-isolate-suf.patch - G 0001-tmpfiles-compare-return-against-correct-errno.patch - G 0001-shell-completion-fix-completion-of-inactive-units.patch - G 0002-shell-completion-propose-templates-for-disable-re-en.patch - G 0003-man-we-don-t-have-Wanted-dependency.patch - G 0004-selinux-fix-potential-double-free-crash-in-child-pro.patch - G 0001-systemd-continue-switch-root-even-if-umount-fails.patch - G 0002-systemd-try-harder-to-bind-to-notify-socket.patch - G 0001-strv-add-an-additional-overflow-check-when-enlarging.patch - G 0002-hwdb-Add-mapping-for-special-keys-on-compaq-ku-0133-.patch - G 0003-journald-add-CAP_MAC_OVERRIDE-in-journald-for-SMACK-.patch - G 0004-journal-do-server_vacuum-for-sigusr1.patch - G 0005-cryptsetup-fix-an-OOM-check.patch - G 0002-shutdown-pass-own-argv-to-run-initramfs-shutdown.patch - G 0001-manager-Linux-on-hppa-has-fewer-rtsigs-hence-avoid-u.patch - G 0002-time-also-support-infinity-syntax-in-parse_nsec.patch - G 0003-time-earlier-exit-from-format_timestamp_relative-on-.patch - G 0004-sd-bus-if-we-don-t-manage-to-properly-allocate-the-e.patch - G 0005-journalctl-correct-help-text-for-until.patch - G 0006-calendarspec-fix-typo-in-annually.patch - G 0007-systemctl-do-not-ignore-errors-in-symlink-removal.patch - G 0008-util-introduce-sethostname_idempotent.patch - G 0009-util-fix-copy-paste-error-and-actually-set-the-new-h.patch - G 0010-shutdown-do-final-unmounting-only-if-not-running-ins.patch - G 0011-selinux-make-sure-we-do-not-try-to-print-missing-fie.patch - G 0012-manager-do-not-print-anything-while-passwords-are-be.patch - G 0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch - G 0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch - G 0001-core-don-t-allow-enabling-if-unit-is-masked.patch - G 0002-snapshot-return-error-when-snapshot-exists.patch - G 0003-shared-install-avoid-prematurely-rejecting-missing-u.patch - G 0004-Raise-level-of-Found-dependency.-lines.patch - G 0005-units-order-sd-journal-flush-after-sd-remount-fs.patch - G 0006-journald-fix-minor-memory-leak.patch - G 0007-journald-also-check-journal-file-size-to-deduce-if-i.patch - G 0008-journald-fix-memory-leak-on-error-path.patch - G 0009-units-make-systemd-journald.service-Type-notify.patch - G 0010-hwdb-Update-database-of-Bluetooth-company-identifier.patch - G 0001-login-rerun-vconsole-setup-when-switching-from-vgaco.patch - G 0002-shutdown-fix-arguments-to-run-initramfs-shutdown.patch - G 0003-utf8-when-looking-at-the-next-unichar-honour-the-siz.patch - G 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch - G 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch - G 0001-systemctl-let-list-units-unit-files-honour-type.patch - G 0002-systemctl-obey-state-in-list-unit-files.patch - G 0002-core-watchdog-bus-properties-cannot-be-both-writable.patch - G 0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch - G 0001-units-make-sure-rfkill-service-is-bount-to-the-actua.patch - G 0001-selinux-access-fix-broken-ternary-operator.patch - G 0002-systemctl-show-BindsTo-BoundBy-in-list-dependencies.patch - G 0003-cryptsetup-default-to-no-hash-when-keyfile-is-specif.patch - G 0004-core-fix-transaction-destructiveness-check-once-more.patch - G 0001-units-tmpfiles-setup-dev-allow-unsafe-file-creation-.patch - G 0002-man-tmpfiles.d-recommend-using-b-and-c.patch - G 1009-cdrom_id-use-the-old-MMC-fallback.patch - G 1010-udev-increase-result-size-for-programs.patch - G 1014-udev-update-net_id-comments.patch - G 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch - G 1016-udev-warn-when-name_to_handle_at-is-not-implemented.patch - G 1017-udev-serialize-synchronize-block-device-event-handli.patch - G 1018-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch - G 1019-udev-avoid-use-of-uninitialized-err.patch - G 1020-udev-keyboard-also-hook-into-change-events.patch - G 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - G 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch - G 1024-udev-always-close-lock-file-descriptor.patch - G 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch - G 1026-udevd-inotify-modernizations.patch - G 1027-udev-synthesize-change-events-for-partitions-when-to.patch - G 1028-udev-link-config-fix-mem-leak.patch - G 1029-udev-try-first-re-reading-the-partition-table.patch - G 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch - G 1031-udev-make-sure-we-always-get-change-for-the-disk.patch - G 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - G 1033-udev-really-exclude-device-mapper-from-block-device.patch - G 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch - G 1038-udev-fix-invalid-free-in-enable_name_policy.patch - G 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch - G 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch - G 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch - G 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch - G 1044-rules-update-qemu-hid-rules.patch - G 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch - G 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch - G 1048-udev-net_setup_link-add-a-bit-more-logging.patch - G 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch - G 1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch - G 1054-udev-exclude-MD-from-block-device-ownership-event-lo.patch - G 1056-udevd-add-event-timeout-commandline-option.patch - G 1057-udev-unify-event-timeout-handling.patch - G 1058-udev-unify-event-timeout-handling.patch - G 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch - G 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch - G 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch - G 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch - G 1065-udev-bump-event-timeout-to-60-seconds.patch - G 1067-udev-always-resolve-correctly-database-names-on-chan.patch - G 1068-udev-net_setup_link-export-the-.link-filename-applie.patch - G 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch - G 1070-rules-net-setup-link-remove-stray-linebreak.patch - G 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch - G 1072-udev-netif_rename-don-t-log-to-kmsg.patch - G 1073-udev-drop-print_kmsg.patch - G 1074-udev-fix-copy-paste-error-in-log-message.patch - G 1075-udev-timeout-increase-timeout.patch - G 1076-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch - G 1077-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch - G 1078-udev-remove-userspace-firmware-loading-support.patch - G 1079-udev-remove-userspace-firmware-loading-support.patch - G 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch - G 1081-udevd-check-return-of-various-functions.patch - G 1082-udevadm-hwdb-check-return-value-of-fseeko.patch - G 1083-udev-node-warn-if-chmod-chown-fails.patch - G 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch - G 1085-udev-fix-typos.patch - G 1086-udevd-don-t-fail-if-run-udev-exists.patch - G 1089-fix-cgroup-device-controller.patch - G 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch - G 1091-udev-path_id-update-comments.patch - G 1092-libudev-do-not-accept-invalid-log-levels.patch - G 1093-udev-Fix-parsing-of-udev.event-timeout-kernel-parame.patch - G 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch - G 1098-udev-link_setup-respect-kernel-name-assign-policy.patch - -------------------------------------------------------------------- -Wed Jan 7 11:44:27 UTC 2015 - arvidjaar@gmail.com - -- update set-and-use-default-logconsole.patch - fix comparison of - console log facility that caused journald to skip output to console - (boo#912030) - -------------------------------------------------------------------- -Thu Dec 18 13:47:36 UTC 2014 - werner@suse.de - -- Use Robert's latest patch - 1098-udev-link_setup-respect-kernel-name-assign-policy.patch - which drops NAMEPOLICY_KERNEL as this breaks all on current - systems out there - -------------------------------------------------------------------- -Wed Dec 17 14:57:42 UTC 2014 - thomas.blume@suse.com - -- remove 0022-systemd-tmpfiles-ownerkeep.patch since this is now - implemented into the systemd-tmpfiles binary -- add user based ignore statements in tmpfiles removal directives - (bnc#903009) - add systemd-add-user-keep.patch - -------------------------------------------------------------------- -Tue Dec 16 09:45:38 UTC 2014 - thomas.blume@suse.com - -- use --boot option in systemd-tmpfiles-setup-dev.service (bnc#908476) - add upstream patches: - 0001-units-tmpfiles-setup-dev-allow-unsafe-file-creation-.patch - 0002-man-tmpfiles.d-recommend-using-b-and-c.patch (adapted) - -------------------------------------------------------------------- -Tue Dec 16 08:59:08 UTC 2014 - werner@suse.de - -- Update patch - 1098-udev-link_setup-respect-kernel-name-assign-policy.patch - to Robert's version - -------------------------------------------------------------------- -Mon Dec 15 15:02:22 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-selinux-access-fix-broken-ternary-operator.patch - 0002-systemctl-show-BindsTo-BoundBy-in-list-dependencies.patch - 0003-cryptsetup-default-to-no-hash-when-keyfile-is-specif.patch - 0004-core-fix-transaction-destructiveness-check-once-more.patch -- Avoid old net devices naming scheme on openSUSE 13.2 and less - maybe caused by patch - 1098-udev-link_setup-respect-kernel-name-assign-policy.patch - -------------------------------------------------------------------- -Thu Dec 11 09:32:31 UTC 2014 - thomas.blume@suse.com - -- fix systemd-nspawn network-veth support (bnc#906709) - add 513-nspawn-veth.patch - -------------------------------------------------------------------- -Fri Dec 5 12:51:15 UTC 2014 - werner@suse.de - -- Add upstream patch - 1098-udev-link_setup-respect-kernel-name-assign-policy.patch - which may solve bsc#907318 - -------------------------------------------------------------------- -Fri Dec 5 12:13:02 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-units-make-sure-rfkill-service-is-bount-to-the-actua.patch - 0002-rfkill-rework-how-we-generate-file-names-from-rfkill.patch - -------------------------------------------------------------------- -Fri Nov 28 13:26:21 UTC 2014 - rmilasan@suse.com - -- Change the maximum number of children from CPU_COUNT * 256 to - CPU_COUNT * 64. - Update 1097-udevd-increase-maximum-number-of-children.patch - -------------------------------------------------------------------- -Thu Nov 27 20:30:35 UTC 2014 - rmilasan@suse.com - -- Increase number of children/workers to CPU_COUNT * 256 to avoid - 'maximum number of children reached' (bnc#907393). - Add 1097-udevd-increase-maximum-number-of-children.patch - -------------------------------------------------------------------- -Tue Nov 25 09:44:42 UTC 2014 - rmilasan@suse.com - -- Fix error return in rootsymlink_generator.c - Update 1096-new-udev-root-symlink-generator.patch - -------------------------------------------------------------------- -Fri Nov 21 13:35:40 UTC 2014 - werner@suse.de - -- Remove upstream patch - 0001-systemd-logind.service-set-Type-notify.patch - as systemd-logind.service is already from DBus type, compare with - upstream commit eab459bc0639b81b32735f36d3e929e4bfa2cb4b - -------------------------------------------------------------------- -Thu Nov 20 13:45:28 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-systemd-logind.service-set-Type-notify.patch - 0002-core-watchdog-bus-properties-cannot-be-both-writable.patch - 0003-sd-bus-refuse-properties-that-claim-to-be-both-writa.patch - -------------------------------------------------------------------- -Thu Nov 20 12:18:57 UTC 2014 - werner@suse.de - -- Re-add directory /usr/lib/systemd/system/basic.target.wants - -------------------------------------------------------------------- -Wed Nov 19 15:07:43 UTC 2014 - gber@opensuse.org - -- remove pm-utils-hooks-compat.sh again, pm-utils built-in hooks - partially duplicate hooks run by systemd which may potentially - lead to problems, instead temporarily re-enable - Forward-suspend-hibernate-calls-to-pm-utils.patch until - boo#904828 can be addressed properly - -------------------------------------------------------------------- -Wed Nov 19 00:58:00 UTC 2014 - Led - -- fix bashisms in write_net_rules script -- update patches: - * 1053-better-checks-in-write_net_rules.patch - -------------------------------------------------------------------- -Tue Nov 18 10:26:08 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-systemctl-let-list-units-unit-files-honour-type.patch - 0002-systemctl-obey-state-in-list-unit-files.patch - which allows to use --type in the systemctl command list-units - and list-unit-files. - -------------------------------------------------------------------- -Tue Nov 18 10:10:28 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-keymap-Add-support-for-IBM-ThinkPad-X41-Tablet.patch - 0002-keymap-Fix-special-keys-on-ThinkPad-X60-X61-Tablet.patch - -------------------------------------------------------------------- -Thu Nov 13 14:47:17 UTC 2014 - rmilasan@suse.com - -- New root symlink rule generator - Add 1096-new-udev-root-symlink-generator.patch -- Remove write_dev_root_rule and systemd-udev-root-symlink - -------------------------------------------------------------------- -Thu Nov 13 12:59:05 UTC 2014 - werner@suse.de - -- Change patch 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch - to skip hdflush as well as hddown but only use halt as fallback - for poweroff as well as synch in systemctl before any reboot command - (compare with commit 4a3ad39957399c4a30fc472a804e72907ecaa4f9) - -------------------------------------------------------------------- -Thu Nov 13 09:54:35 UTC 2014 - rmilasan@suse.com - -- Create rule to set I/O scheduler to deadline if device attribute - 'rotational' equals 0, usually SSDs (bnc#904517). - Add 1095-set-ssd-disk-to-use-deadline-scheduler.patch - -------------------------------------------------------------------- -Thu Nov 13 07:50:49 UTC 2014 - thomas.blume@suse.com - -- fix systemd-fstab-generator crypttab parsing (bnc#903963) - -------------------------------------------------------------------- -Tue Nov 11 19:10:35 UTC 2014 - gber@opensuse.org - -- Add pm-utils-hooks-compat.sh in order to run pm-utils sleep hooks - from systemd (boo#904828) - -------------------------------------------------------------------- -Mon Nov 10 14:23:00 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-login-rerun-vconsole-setup-when-switching-from-vgaco.patch - 0002-shutdown-fix-arguments-to-run-initramfs-shutdown.patch - 0003-utf8-when-looking-at-the-next-unichar-honour-the-siz.patch - -------------------------------------------------------------------- -Mon Nov 10 12:39:35 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-core-don-t-allow-enabling-if-unit-is-masked.patch - 0002-snapshot-return-error-when-snapshot-exists.patch - 0003-shared-install-avoid-prematurely-rejecting-missing-u.patch - 0004-Raise-level-of-Found-dependency.-lines.patch - 0005-units-order-sd-journal-flush-after-sd-remount-fs.patch - 0006-journald-fix-minor-memory-leak.patch - 0007-journald-also-check-journal-file-size-to-deduce-if-i.patch - 0008-journald-fix-memory-leak-on-error-path.patch - 0009-units-make-systemd-journald.service-Type-notify.patch - 0010-hwdb-Update-database-of-Bluetooth-company-identifier.patch - -------------------------------------------------------------------- -Mon Nov 10 12:36:34 UTC 2014 - werner@suse.de - -- Add upstream patches - 1092-libudev-do-not-accept-invalid-log-levels.patch - 1093-udev-Fix-parsing-of-udev.event-timeout-kernel-parame.patch - 1094-udev-avoid-magic-constants-in-kernel-cmdline-parsers.patch - -------------------------------------------------------------------- -Fri Nov 7 09:45:20 UTC 2014 - werner@suse.de - -- Add patch watch_resolv.conf_for_become_changed.patch to add an - inotify watch on /etc/resolv.conf which enables the reload of - a changed resolver configuration on the fly (bsc#902901) -- Do not apply patch 0022-systemd-tmpfiles-ownerkeep.patch in case - if the script /usr/bin/systemd-tmpfiles-keep is missed - -------------------------------------------------------------------- -Mon Nov 3 14:23:02 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch - 0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch - -------------------------------------------------------------------- -Mon Nov 3 14:17:48 UTC 2014 - werner@suse.de - -- Add upstream patches - 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch - 1091-udev-path_id-update-comments.patch - which will be applied if patch - 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch - is applied a this may fix the trouble with iSCSI (bnc#898233) - -------------------------------------------------------------------- -Thu Oct 30 10:45:01 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-manager-Linux-on-hppa-has-fewer-rtsigs-hence-avoid-u.patch - 0002-time-also-support-infinity-syntax-in-parse_nsec.patch - 0003-time-earlier-exit-from-format_timestamp_relative-on-.patch - 0004-sd-bus-if-we-don-t-manage-to-properly-allocate-the-e.patch - 0005-journalctl-correct-help-text-for-until.patch - 0006-calendarspec-fix-typo-in-annually.patch - 0007-systemctl-do-not-ignore-errors-in-symlink-removal.patch - 0008-util-introduce-sethostname_idempotent.patch - 0009-util-fix-copy-paste-error-and-actually-set-the-new-h.patch - 0010-shutdown-do-final-unmounting-only-if-not-running-ins.patch - 0011-selinux-make-sure-we-do-not-try-to-print-missing-fie.patch -- Replace patch - keep-crypt-password-prompt.patch as this with - upstream patch - 0012-manager-do-not-print-anything-while-passwords-are-be.patch - -------------------------------------------------------------------- -Fri Oct 24 13:02:45 UTC 2014 - werner@suse.de - -- Add upstream patch - 0002-shutdown-pass-own-argv-to-run-initramfs-shutdown.patch -- Add patch journald-advice-about-use-of-memory.patch to use mmap() - flags as well as madvise(2) for journal files. - -------------------------------------------------------------------- -Thu Oct 23 14:05:08 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-strv-add-an-additional-overflow-check-when-enlarging.patch - 0002-hwdb-Add-mapping-for-special-keys-on-compaq-ku-0133-.patch - 0003-journald-add-CAP_MAC_OVERRIDE-in-journald-for-SMACK-.patch - 0004-journal-do-server_vacuum-for-sigusr1.patch - 0005-cryptsetup-fix-an-OOM-check.patch - -------------------------------------------------------------------- -Wed Oct 22 13:56:22 UTC 2014 - werner@suse.de - -- Add upstream patch 1089-fix-cgroup-device-controller.patch - to avoid trouble on existing /dev/console with nspawn (bsc#902240) - -------------------------------------------------------------------- -Tue Oct 21 11:03:31 UTC 2014 - werner@suse.de - -- Modify patch avoid-leaking-socket-descriptors.patch to close - file descriptors for incomming connections in pam module in case - of short memory. - -------------------------------------------------------------------- -Mon Oct 20 14:10:47 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-systemd-continue-switch-root-even-if-umount-fails.patch - 0002-systemd-try-harder-to-bind-to-notify-socket.patch -- Add patch avoid-leaking-socket-descriptors.patch to close - file descriptors if an incomming connection can not be handled - due e.g. short memory. Could be related to bsc #901481 - -------------------------------------------------------------------- -Wed Oct 15 12:03:36 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-shell-completion-fix-completion-of-inactive-units.patch - 0002-shell-completion-propose-templates-for-disable-re-en.patch - 0003-man-we-don-t-have-Wanted-dependency.patch - 0004-selinux-fix-potential-double-free-crash-in-child-pro.patch - -------------------------------------------------------------------- -Wed Oct 15 08:48:36 UTC 2014 - werner@suse.de - -- Adapt patch - rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch - to make it work even with patch #438 and #439 - -------------------------------------------------------------------- -Tue Oct 14 16:23:51 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-systemctl-when-mangle-unit-names-for-the-isolate-suf.patch - 0001-tmpfiles-compare-return-against-correct-errno.patch - -------------------------------------------------------------------- -Tue Oct 14 16:19:42 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-keymap-Fix-touchpad-toggle-on-Toshiba-Satellite-P75-.patch - 0001-units-introduce-network-pre.target-as-place-to-hook-.patch - 0002-keymap-Fix-touchpad-toggle-key-on-Asus-laptops.patch - 0003-sd-bus-check-return-value-of-vasprintf.patch - 0004-core-map-the-rescue-argument-to-rescue.target.patch - 0005-util-avoid-double-close-of-fd.patch - -------------------------------------------------------------------- -Tue Oct 14 16:18:36 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-virt-detect-that-we-are-running-inside-the-docker-co.patch - 0002-bootchart-use-n-a-if-PRETTY_NAME-is-not-found.patch - 0003-fileio-label-return-error-when-writing-fails.patch - 0001-sd-event-don-t-require-a-signal-event-source-to-be-e.patch - 0004-sd-event-check-the-value-of-received-signal.patch - 0005-sd-id128-do-stricter-checking-of-random-boot-id.patch - -------------------------------------------------------------------- -Tue Oct 14 14:46:58 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-core-swap-only-make-configured-units-part-of-swap.ta.patch - 0009-hwdb-Update-database-of-Bluetooth-company-identifier.patch - -------------------------------------------------------------------- -Tue Oct 14 14:16:52 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-journalctl-do-not-output-reboot-markers-when-running.patch - 0002-udev-hwdb-New-Entry-for-Dell-XPS12-9Q33-keyboard.patch - -------------------------------------------------------------------- -Tue Oct 14 13:58:45 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-logind-add-support-for-Triton2-Power-Button.patch - 0002-logind-add-support-for-TPS65217-Power-Button.patch -- Add upstream patches - 0001-shutdownd-clean-up-initialization-of-struct.patch - 0003-bootchart-parse-userinput-with-safe_atoi.patch - 0004-bootchart-check-return-of-strftime.patch - 0005-bootchart-Do-not-try-to-access-data-for-non-existing.patch - -------------------------------------------------------------------- -Thu Oct 2 07:21:42 PDT 2014 - lduncan@suse.com - -- Revert patch 1063, which incorrectly disallows - /dev/disk/by-path links for iSCSI (and other) - devices. Will be corrected and re-added once - upstream is consulted. (bnc#898233). Disable: - 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patc - -------------------------------------------------------------------- -Fri Sep 26 16:11:10 UTC 2014 - werner@suse.de - -- Add upstream patch - 0001-systemd-tmpfiles-Fix-IGNORE_DIRECTORY_PATH-age-handl.patch - for bsc#893797 - -------------------------------------------------------------------- -Fri Sep 26 09:34:22 UTC 2014 - rmilasan@suse.com - -- Drop renaming virtual interfaces in a guest (bnc#898432). - Add 1088-drop-renaming-of-virtual-interfaces-in-guest.patch - -------------------------------------------------------------------- -Thu Sep 25 14:08:35 UTC 2014 - werner@suse.de - -- Rename patch 0001-infinit-timeout-for-kmod-loaded-modules.patch - to patch 1087-infinit-timeout-for-kmod-loaded-modules.patch - and apply this one - -------------------------------------------------------------------- -Thu Sep 25 13:45:46 UTC 2014 - werner@suse.de - -- Change patch - 0003-mount-order-options-before-other-arguments-to-mount.patch - to fix bsc#898240 - -------------------------------------------------------------------- -Thu Sep 25 09:06:14 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-Fix-warning-about-unused-variable-with-SELINUX.patch - 0002-bus-remove-unused-check.patch - -------------------------------------------------------------------- -Wed Sep 24 15:05:49 UTC 2014 - werner@suse.de - -- Add patch 0001-infinit-timeout-for-kmod-loaded-modules.patch to - be able to avoid killing a running kmod/modprobe (bnc#889297) - -------------------------------------------------------------------- -Wed Sep 24 08:36:42 UTC 2014 - werner@suse.de - -- Update patch 0001-bnc888612-logind-polkit-acpi.patch - -------------------------------------------------------------------- -Wed Sep 24 07:47:54 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-login-pause-devices-before-acknowledging-VT-switches.patch - May help that history of the shell is saved - 0001-nspawn-don-t-try-to-create-veth-link-with-too-long-i.patch - 0001-socket-introduce-SELinuxContextFromNet-option.patch (bsc#897801) - 0002-util-avoid-non-portable-__WORDSIZE.patch - -------------------------------------------------------------------- -Fri Sep 19 13:08:14 UTC 2014 - werner@suse.de - -- Add patch 0001-bnc888612-logind-polkit-acpi.patch from Frederic - to solve bnc#888612 - AUDIT-0: Power button press at gdm login - should not prompt for credentials - -------------------------------------------------------------------- -Fri Sep 19 11:36:48 UTC 2014 - werner@suse.de - -- Add upstream bugfix patches - 0001-journal-Do-not-count-on-the-compiler-initializing-fo.patch - 0002-include-fcntl.h-rather-than-sys-fcntl.h.patch - 0003-mount-order-options-before-other-arguments-to-mount.patch - 0004-shared-wtmp-utmp-don-t-clear-store_wtmp-in-utmp_put_.patch - 0005-shared-label.h-add-missing-stdio.h-include.patch - 0006-shared-sparse-endian.h-add-missing-byteswap.h-includ.patch - 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch - 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patch - 1080-udevd-parse_argv-warn-if-argumens-are-invalid.patch - 1081-udevd-check-return-of-various-functions.patch - 1082-udevadm-hwdb-check-return-value-of-fseeko.patch - 1083-udev-node-warn-if-chmod-chown-fails.patch - 1084-udev-ctrl-log-if-setting-SO_PASSCRED-fails.patch - 1085-udev-fix-typos.patch - 1086-udevd-don-t-fail-if-run-udev-exists.patch - -------------------------------------------------------------------- -Thu Sep 18 13:21:45 UTC 2014 - werner@suse.de - -- Add upstream bugfix patches - 0001-core-fix-resource-leak-in-manager_environment_add.patch - 0002-util-remove-a-unnecessary-check.patch - 0003-udev-event-explicitly-don-t-read-from-invalid-fd.patch - 0004-shared-conf-parser.patch - 0005-logind-fix-typo.patch - 0006-systemctl-fix-resource-leak-CID-1237747.patch - 0007-libudev-monitor-warn-if-we-fail-to-request-SO_PASSCR.patch - 0008-shared-conf-parser-don-t-leak-memory-on-error-in-DEF.patc - 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch -- Remove 0001-sizeof-bool-used-by-gcc-depends-on-arch.patch as - 0009-bus-fix-bus_print_property-to-use-int-for-booleans.patch - is the upstream solution - -------------------------------------------------------------------- -Wed Sep 17 16:02:33 UTC 2014 - werner@suse.de - -- Add patch 0001-sizeof-bool-used-by-gcc-depends-on-arch.patch to - fix for the size of the gcc builtin type bool also known as _Bool - from the include header stdbool.h. - -------------------------------------------------------------------- -Tue Sep 16 10:45:33 UTC 2014 - werner@suse.de - -- Add upstream patches as real fixes - 0001-activate-fix-fd-leak-in-do_accept.patch - 0002-analyze-avoid-a-null-dereference.patch - 0003-analyze-fix-mem-leak.patch - 0004-backlight-Avoid-error-when-state-restore-is-disabled.patch - 0005-bus-avoid-using-m-kdbus-after-freeing-it.patch - 0006-bus-unref-buscreds-on-failure.patch - 0007-core-fix-a-potential-mem-leak.patch - 0008-core-smack-setup-Actually-allow-for-succesfully-load.patch - 0009-journal-do-not-leak-mmaps-on-OOM.patch - 0010-manager-use-correct-cleanup-function.patch -- Intergrate the work of Robert and rename the patch - 1068-udev-remove-userspace-firmware-loading-support.patch - to 1078-udev-remove-userspace-firmware-loading-support.patch - Also add patch - 1079-udev-remove-userspace-firmware-loading-support.patch - to apply the same change for opensuse 13.2 and above - -------------------------------------------------------------------- -Tue Sep 16 10:21:02 UTC 2014 - werner@suse.de - -- Add upstream patch - 0001-systemctl-allow-to-change-the-default-target-without.patch - to allow to override default target without --force (bnc#896664) - -------------------------------------------------------------------- -Tue Sep 16 09:10:52 UTC 2014 - werner@suse.de - -- Add upstream patches for udev - 1068-udev-net_setup_link-export-the-.link-filename-applie.patch - 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch - 1070-rules-net-setup-link-remove-stray-linebreak.patch - 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch - 1072-udev-netif_rename-don-t-log-to-kmsg.patch - 1073-udev-drop-print_kmsg.patch - 1074-udev-fix-copy-paste-error-in-log-message.patch - 1075-udev-timeout-increase-timeout.patch (bnc#889297) - 1076-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch (bnc#889297) - 1077-udev-timeout-warn-after-a-third-of-the-timeout-befor.patch (bnc#889297) - -------------------------------------------------------------------- -Tue Sep 16 07:55:37 UTC 2014 - rmilasan@suse.com - -- udev: remove userspace firmware loading support (bnc#889297). - Add 1068-udev-remove-userspace-firmware-loading-support.patch - -------------------------------------------------------------------- -Sat Sep 13 13:35:33 UTC 2014 - rmilasan@suse.com - -- udev: always resolve correctly database names on 'change' event (bnc#864745). - Add 1067-udev-always-resolve-correctly-database-names-on-chan.patch - -------------------------------------------------------------------- -Tue Sep 9 14:36:20 UTC 2014 - werner@suse.de - -- Add upstream patch 0009-hwdb-update.patch - -------------------------------------------------------------------- -Mon Sep 8 14:48:37 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-initrd-parse-etc.service-ignore-return-code-of-daemo.patch - 0008-hwdb-Update-database-of-Bluetooth-company-identifier.patch - -------------------------------------------------------------------- -Thu Sep 4 13:10:28 UTC 2014 - werner@suse.de - -- Disable patch - module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch - for SLES-12 as well as for openSUSE-13.2 (bnc#895087) - -------------------------------------------------------------------- -Tue Sep 2 12:56:47 UTC 2014 - rmilasan@suse.com - -- udev: add option to generate old 'buggy' serials (bnc#886852) - Add 1066-udev-add-compatibility-links-for-truncated-by-id-links.patch - -------------------------------------------------------------------- -Tue Sep 2 09:14:03 UTC 2014 - werner@suse.de - -- Add upstream patch - 0001-login-simplify-controller-handling.patch - -------------------------------------------------------------------- -Mon Sep 1 13:00:29 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-completion-filter-templates-from-restartable-units.patch - 0002-systemd-fix-error-message.patch - 0003-Quote-unit-names-in-suggested-systemctl-commandlines.patch - 0004-config-parser-fix-mem-leak.patch - 0005-login-fix-mem-leak.patch - 1065-udev-bump-event-timeout-to-60-seconds.patch - -------------------------------------------------------------------- -Fri Aug 29 14:14:06 UTC 2014 - werner@suse.de - -- Add upstream patch 0001-nspawn-fix-network-interface.patch to - make option network-interface of systemd-nspawn work - -------------------------------------------------------------------- -Thu Aug 28 10:07:10 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-login-fix-memory-leak-on-DropController.patch - 0002-util-fix-minimal-race-where-we-might-miss-SIGTERMs-w.patch - 0003-sd-journal-properly-convert-object-size-on-big-endia.patch - 0004-sd-journal-verify-that-object-start-with-the-field-n.patch -- Add upstream patch - 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch - to avoid that hwdb ID's for unrecognised USB device are taken - from the USB hub. - -------------------------------------------------------------------- -Wed Aug 27 16:01:17 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch - 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch - 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch - -------------------------------------------------------------------- -Wed Aug 27 12:52:09 UTC 2014 - werner@suse.de - -- Add patch use-rndaddentropy-ioctl-to-load-random-seed.patch to - use RNDADDENTROPY ioctl to load random-seed and to increase - entropy count as well (bnc#892096) - -------------------------------------------------------------------- -Tue Aug 26 12:13:42 UTC 2014 - werner@suse.de - -- Add upstream patches for hwdb - 0001-hwdb-keymaps-for-Samsung-900X3E-900X3F.patch - 0002-Add-hwdb-entry-for-Samsung-Series-7-Ultra.patch - 0003-keymap-Fix-HP-Pavillon-DV7.patch - 0004-hwdb-update-format-description-and-document-reloadin.patch - 0008-hwdb-update.patch - -------------------------------------------------------------------- -Tue Aug 26 11:25:57 UTC 2014 - werner@suse.de - -- Port back and add the missed upstream patches from 2014/08/22 - 0004-login-set_controller-should-fail-if-prepare_vt-fails.patch - 0006-login-share-VT-signal-handler-between-sessions.patch - -------------------------------------------------------------------- -Fri Aug 22 15:12:23 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-nspawn-fix-truncation-of-machine-names-in-interface-.patch - 0002-switch-root-umount-the-old-root-correctly.patch - 0003-bootchart-it-s-not-OK-to-return-1-from-a-main-progra.patch - 0005-sd-resolve-fix-allocation-if-query-ids-never-reuse-t.patch - 0007-journald-also-increase-the-SendBuffer-of-dev-log-to-.patch - 0008-mount-setup-fix-counting-of-early-mounts-without-SMA.patch - 0009-journald-Fix-off-by-one-error-in-Missed-X-kernel-mes.patch - 0010-machine_kill-Don-t-kill-the-unit-when-killing-the-le.patch - 0011-units-fix-BindsTo-logic-when-applied-relative-to-ser.patch - 0012-util-try-to-be-a-bit-more-NFS-compatible-when-checki.patch - 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch - -------------------------------------------------------------------- -Fri Aug 22 01:29:06 UTC 2014 - crrodriguez@opensuse.org - -- man pages from section 3 are developer docs, move them to - the -devel package. - -------------------------------------------------------------------- -Wed Aug 20 15:06:25 UTC 2014 - werner@suse.de - -- Add patch 0001-let-systemctl-completion-ignore-at-names.patch to - remove error messages for tab completion for systemctl isolate (bnc#892162) - -------------------------------------------------------------------- -Mon Aug 18 14:40:55 UTC 2014 - werner@suse.de - -- Disable the usage of the systemd groups wheel and adm (bnc#892300) - -------------------------------------------------------------------- -Fri Aug 8 12:47:48 UTC 2014 - rmilasan@suse.com - -- Set default permissions for GenWQE device nodes to 0666 (bnc#890977). - Add 1062-rules-set-default-permissions-for-GenWQE-devices.patch - -------------------------------------------------------------------- -Fri Aug 1 09:53:30 UTC 2014 - werner@suse.de - -- Add upstream patches - 0007-hwdb-update.patch - 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch - -------------------------------------------------------------------- -Thu Jul 31 07:55:47 UTC 2014 - rmilasan@suse.com - -- Rename: - udev-use-device-mapper-target-name-for-btrfs-device-ready.patch - to - 1060-udev-use-device-mapper-target-name-for-btrfs-device-ready.patch - -------------------------------------------------------------------- -Wed Jul 30 21:10:21 UTC 2014 - jeffm@suse.com - -- udev: use device mapper target name for btrfs device ready (bnc#888215). -- Add udev-use-device-mapper-target-name-for-btrfs-device-ready.patch - -------------------------------------------------------------------- -Wed Jul 30 12:53:07 UTC 2014 - werner@suse.de - -- Add patch tomcat6-var-lock-subsys-legacy.patch to add the - compatibility directory /var/lock/subsys (bnc#889357) - -------------------------------------------------------------------- -Wed Jul 30 11:45:21 UTC 2014 - werner@suse.de - -- Add portabiltiy patch - 1055-let-9719859c07aa13539ed2cd4b31972cd30f678543-apply.patch - -------------------------------------------------------------------- -Wed Jul 30 11:32:23 UTC 2014 - werner@suse.de - -- Port and add upstream patch - 0001-sysv-order-initscripts-which-provide-network-before-.patch - 0002-keymap-Add-microphone-mute-keymap-for-Dell-Latitude.patch - 0003-keymap-Annotate-all-micmute-workarounds.patch - -------------------------------------------------------------------- -Wed Jul 30 11:10:34 UTC 2014 - werner@suse.de - -- Add patch tty-ask-password-agent-on-console.patch that is for system - console do ask passphrases on all devices of the console (bnc#886211) - -------------------------------------------------------------------- -Wed Jul 30 11:02:27 UTC 2014 - werner@suse.de - -- Add former SUSE and/now upstream patches (bnc#889297) - 1056-udevd-add-event-timeout-commandline-option.patch - 1057-udev-unify-event-timeout-handling.patch - 1058-udev-unify-event-timeout-handling.patch (backport for - compatibility if patch 1022 is not applied) - 1059-udev-fixup-commit-dd5eddd28a74a49607a8fffcaf960040db.patch - -------------------------------------------------------------------- -Mon Jul 28 10:08:15 UTC 2014 - werner@suse.de - -- Add patch shut-up-rpmlint-on-var-log-journal.patch to avoid - rpmlink warning -- Add upstream patches - 0001-bus-proxyd-fix-incorrect-comparison.patch - 0002-shell-completion-prevent-mangling-unit-names.patch - 0003-Always-check-asprintf-return-code.patch - 0004-bash-completion-use-list-unit-files-to-get-all-units.patch - 0005-core-only-set-the-kernel-s-timezone-when-the-RTC-run.patch - 0006-parse_boolean-require-exact-matches.patch - 0007-drop_duplicates-copy-full-BindMount-struct.patch - 0008-shell-completion-prevent-mangling-unit-names-bash.patch - 0009-journald-always-add-syslog-facility-for-messages-com.patch - -------------------------------------------------------------------- -Fri Jul 25 11:06:54 UTC 2014 - werner@suse.de - -- Disable blkrrpart for SLES12 and below - -------------------------------------------------------------------- -Fri Jul 25 09:37:56 UTC 2014 - werner@suse.de - -- Add upstream patch - 1054-udev-exclude-MD-from-block-device-ownership-event-lo.patch -- Add with condition blkrrpart to be able to disable the patches - 1025, 1027, 1029, 1030, 1031, 1032, 1033, 1034, 1037, and 1054 - which uses the BLKRRPART ioctl for e.g. synthesize change events - which may interfere with other tools like parted. - -------------------------------------------------------------------- -Thu Jul 24 13:05:42 UTC 2014 - fcrozat@suse.com - -- Update - handle-disable_caplock-and-compose_table-and-kbd_rate.patch, - handle-numlock-value-in-etc-sysconfig-keyboard.patch: read - /etc/vconsole.conf after /etc/sysconfig/(keyboard,console) - otherwise empty value in /etc/sysconfig/keyboard might override - /etc/vconsole.conf values. -- Update : - 0001-journal-compress-return-early-in-uncompress_startswi.patch - 0002-util-don-t-consider-tabs-special-in-string_has_cc-an.patch - 0002-vconsole-setup-run-setfont-before-loadkeys.patch - 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch - 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - apply-ACL-for-nvidia-device-nodes.patch - keep-crypt-password-prompt.patch - log-target-null-instead-kmsg.patch - parse-crypttab-for-noauto-option.patch - set-and-use-default-logconsole.patch: fix all warnings in code -- Remove 0001-compress-fix-return-value.patch: not relevant to - systemd v210 code. - -------------------------------------------------------------------- -Thu Jul 24 10:07:08 UTC 2014 - werner@suse.de - -- Also change udev-generate-peristent-rule to udev-generate-persistent-rule - in file list - -------------------------------------------------------------------- -Thu Jul 24 09:00:43 UTC 2014 - rmilasan@suse.com - -- Rename (fix typo in script name): - udev-generate-peristent-rule.sh to udev-generate-persistent-rule.sh - -------------------------------------------------------------------- -Wed Jul 23 09:19:52 UTC 2014 - rmilasan@suse.com - -- Enable better checks in write_net_rules to skip adding duplicated - entries in the generate rules (bnc#888178). - Add 1053-better-checks-in-write_net_rules.patch - -------------------------------------------------------------------- -Wed Jul 23 09:13:43 UTC 2014 - werner@suse.de - -- Change patch set-and-use-default-logconsole.patch to avoid to - write security/authorization (private) messages to console - -------------------------------------------------------------------- -Tue Jul 22 11:50:44 UTC 2014 - werner@suse.de - -- Add patch set-and-use-default-logconsole.patch to use and set - the default logging console for both journald and kernel messages - -------------------------------------------------------------------- -Mon Jul 21 13:22:35 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-bash-completion-p-option-for-journalctl.patch - 0002-journalctl-man-allow-only-between-terms.patch - 0003-systemd-use-pager-for-test-and-help.patch - -------------------------------------------------------------------- -Mon Jul 21 12:49:00 UTC 2014 - werner@suse.de - -- Use verify scripts and add permission files for systemd logger -- Avoid useless warning about static systemd unit files -- Make pam file a config file -- Remove non-break-space from this changelog - -------------------------------------------------------------------- -Mon Jul 21 11:09:44 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-compress-fix-return-value.patch - 0002-Be-more-verbose-when-bind-or-listen-fails.patch - 0003-Add-quotes-to-warning-message.patch - 0004-systemd-return-the-first-error-from-manager_startup.patch - -------------------------------------------------------------------- -Mon Jul 21 10:42:10 UTC 2014 - werner@suse.de - -- Replace patch 0001-fix-only-discover-Xen-domU.patch with - upstream patch 0001-detect-virt-Fix-Xen-domU-discovery.patch -- Replace patch 0001-detect-s390-virt.patch with upstream - patch 0001-systemd-detect-virt-detect-s390-virtualization.patch - -------------------------------------------------------------------- -Thu Jul 17 09:30:28 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-po-add-Ukrainian-translation.patch - 0002-man-document-yearly-and-annually-in-systemd.time-7.patch - 0003-core-nicer-message-when-inotify-watches-are-exhauste.patch -- Add patch 0001-fix-only-discover-Xen-domU.patch to fix upstream - patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch - -------------------------------------------------------------------- -Thu Jul 17 06:32:51 UTC 2014 - rmilasan@suse.com - -- Check if NAME key has a value before going thru the rule (bnc#885232). - Add 1051-check-if-NAME-has-a-value.patch - -------------------------------------------------------------------- -Wed Jul 16 16:33:12 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-Clear-up-confusion-wrt.-ENTRY_SIZE_MAX-and-DATA_SIZE.patch - 0002-units-serial-getty-.service-use-the-default-RestartS.patch - 1052-rules-uaccess-add-ID_SOFTWARE_RADIO.patch - -------------------------------------------------------------------- -Tue Jul 15 12:30:31 UTC 2014 - rmilasan@suse.com - -- Only rename SRIOV-VF devices if device name start with eth (bnc#885232). - Add 1050-only-rename-SRIOV-VF-devices-when-name-starts-with-eth.patch - -------------------------------------------------------------------- -Tue Jul 15 07:39:40 UTC 2014 - werner@suse.de - -- Add patch vhangup-on-all-consoles.patch that is do a vhangup on - lines (bnc#886599) - -------------------------------------------------------------------- -Tue Jul 15 06:29:54 UTC 2014 - jlee@suse.com - -- Removed %{_libexecdir}/modules-load.d/efivars.conf because the kernel - patch of autoload efivars driver accepted by linux-efi upstream. - (bnc#881559) - https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/commit/?h=next&id=be756a5327fe3d4686d74d3e9b273010424e230c - -------------------------------------------------------------------- -Mon Jul 14 14:53:21 UTC 2014 - werner@suse.de - -- Update patch - 1007-physical-hotplug-cpu-and-memory.patch (bnc#869603) -- Add script systemd-remount-tmpfs (bnc#869603) as helper script - for the rule changed in patch 1007-physical-hotplug-cpu-and-memory.patch - -------------------------------------------------------------------- -Mon Jul 14 11:43:12 UTC 2014 - werner@suse.de - -- Add upstream patch - 0001-event-pull-in-sd-event.h-from-event-util.h.patch - 0002-util-fix-has-cc-check-and-add-test.patch - 0003-sd-event-always-call-epoll_ctl-on-mask-updates-if-ed.patch - 0004-fileio-quote-more-shell-characters-in-envfiles.patch - -------------------------------------------------------------------- -Fri Jul 11 12:21:06 UTC 2014 - werner@suse.de - -- Only on SLES12 seccomp is available on ppc64 and s390x - -------------------------------------------------------------------- -Thu Jul 10 13:33:32 UTC 2014 - werner@suse.de - -- Port and add upstream patch - 0001-units-make-ExecStopPost-action-part-of-ExecStart.patch - -------------------------------------------------------------------- -Wed Jul 9 13:14:02 UTC 2014 - werner@suse.de - -- Add patches - 0001-logind-allow-switching-to-unused-VTs-via-SwitchTo.patch - 0002-hostnamed-add-a-new-chassis-type-for-watches.patch -- Port and add upstream patches - 0001-journal-compress-return-early-in-uncompress_startswi.patch - 0002-journal-compress-improve-xz-compression-performance.patch - -------------------------------------------------------------------- -Wed Jul 9 12:41:53 UTC 2014 - meissner@suse.com - -- enable seccomp also for ppc64 and s390x - -------------------------------------------------------------------- -Tue Jul 8 10:59:26 UTC 2014 - werner@suse.de - -- Port and add upstream patches - 0001-util-consider-0x7F-a-control-chracter-which-it-is-DE.patch - 0002-util-don-t-consider-tabs-special-in-string_has_cc-an.patch - 0003-architecture-add-string-table-entries-for-mips-le-ar.patch - 0004-core-Added-support-for-ERRNO-NOTIFY_SOCKET-message-p.patch - 0005-service-don-t-accept-negative-ERRNO-notification-mes.patch - 0006-systemctl-show-StatusErrno-value-in-systemctl-status.patch - 0007-service-flush-status-text-and-errno-values-each-time.patch - -------------------------------------------------------------------- -Tue Jul 8 10:41:31 UTC 2014 - werner@suse.de - -- Add upstream patch - 1049-udev-link_config-ignore-errors-due-to-missing-MAC-ad.patch - -------------------------------------------------------------------- -Mon Jul 7 13:06:35 UTC 2014 - werner@suse.de - -- Add upstream patch - 0001-machine-don-t-return-uninitialized-variable.patch -- Port and add upstream patch - 0002-vconsole-setup-run-setfont-before-loadkeys.patch - -------------------------------------------------------------------- -Mon Jul 7 13:04:00 UTC 2014 - rmilasan@suse.com - -- Rename - 0001-udev-net_setup_link-add-a-bit-more-logging.patch - to - 1048-udev-net_setup_link-add-a-bit-more-logging.patch - -------------------------------------------------------------------- -Fri Jul 4 10:01:07 UTC 2014 - werner@suse.de - -- Port and add upstream patches - 0001-udev-net_setup_link-add-a-bit-more-logging.patch - 0003-namespace-make-sure-tmp-var-tmp-and-dev-are-writable.patch - 0002-namespace-fix-uninitialized-memory-access.patch - -------------------------------------------------------------------- -Fri Jul 4 09:43:12 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-architecture-Add-tilegx.patch - 0002-architecture-Add-cris.patch - 0003-arch-add-crisv32-to-uname-check.patch - 0004-architecture-remove-cris-from-uname-list.patch - -------------------------------------------------------------------- -Fri Jul 4 09:32:47 UTC 2014 - werner@suse.de - -- Add upstream patches - 0006-hwdb-update.patch - 0007-hwdb-Update-database-of-Bluetooth-company-identifier.patch - -------------------------------------------------------------------- -Thu Jul 3 12:48:27 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-parse_uid-return-ENXIO-for-1-uids.patch - 0002-util-when-unescaping-strings-don-t-allow-smuggling-i.patch - 0003-localed-consider-an-unset-model-as-a-wildcard.patch - 0004-sd-bus-when-an-event-loop-terminates-explicitly-clos.patch - 0005-bus-close-a-bus-that-failed-to-connect.patch - 1047-udev-net_setup_link-builtin-should-print-the-reason-.patch - -------------------------------------------------------------------- -Wed Jul 2 18:06:32 UTC 2014 - rmilasan@suse.com - -- Fix duplicated rules when having layer3 interfaces (bnc#882714). - Add 1046-fix-duplicated-rules-with-layer3-interfaces.patch - -------------------------------------------------------------------- -Tue Jul 1 14:53:44 UTC 2014 - werner@suse.de - -- Require correct pam-config version overall even for scriptlets (bnc#885288) - -------------------------------------------------------------------- -Tue Jul 1 12:19:27 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-main-uid_to_name-might-fail-due-to-OOM-protect-again.patch - 0002-journald-make-MaxFileSec-really-default-to-1month.patch - 0003-units-remove-RefuseManualStart-from-units-which-are-.patch - 0004-util-refuse-considering-UID-0xFFFF-and-0xFFFFFFFF-va.patch - 0005-nspawn-block-open_by_handle_at-and-others-via-seccom.patch - 0006-tmpfiles-don-t-do-automatic-cleanup-in-XDG_RUNTIME_D.patch - 0007-units-skip-mounting-tmp-if-it-is-a-symlink.patch - -------------------------------------------------------------------- -Tue Jul 1 09:58:04 UTC 2014 - werner@suse.de - -- Be aware that close_nointr_nofail() may fail whereas safe_close() not - -------------------------------------------------------------------- -Tue Jul 1 08:56:48 UTC 2014 - werner@suse.de - -- Add upstream patches - 1042-libudev-queue-provide-file-descriptor-to-watch-busy-.patch - 1043-libudev-queue-watch-entire-directory-to-allow-the-re.patch - 1044-rules-update-qemu-hid-rules.patch - 1045-rules-don-t-enable-usb-pm-for-Avocent-devices.patch - -------------------------------------------------------------------- -Fri Jun 27 12:46:12 UTC 2014 - werner@suse.de - -- Add upstream bug fix patch - 1041-libudev-fix-udev_queue_get_queue_is_empty-logic.patch (bnc#882714) - -------------------------------------------------------------------- -Fri Jun 27 08:17:47 UTC 2014 - werner@suse.de - -- Update of patch 0001-detect-s390-virt.patch (bnc#880438) - -------------------------------------------------------------------- -Thu Jun 26 10:02:26 UTC 2014 - werner@suse.de - -- Shut up stupid check scripts crying for not mentioned systemd-mini-rpmlintrc - -------------------------------------------------------------------- -Thu Jun 26 09:31:19 UTC 2014 - werner@suse.de - -- Add upstream patchs - 0001-core-use-correct-format-string-for-UIDs.patch - 0002-core-transaction-fix-cycle-break-attempts-outside-tr.patch - 0003-fsck-consider-a-fsck-implementation-linked-to-bin-tr.patch - -------------------------------------------------------------------- -Thu Jun 26 06:44:09 UTC 2014 - werner@suse.de - -- Add upstream patch - 0001-units-order-network-online.target-after-network.targ.patch - to make sure that etwork-online.target follows network.target - -------------------------------------------------------------------- -Wed Jun 25 18:09:52 UTC 2014 - rmilasan@suse.com - -- rules: re-enable dev_id conditionally in persistent rules - (bnc#884403 and bnc#882714). - Add 1040-re-enable-dev_id-conditionally-in-persistent-rules.patch - -------------------------------------------------------------------- -Wed Jun 25 17:27:55 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-vconsole-also-copy-character-maps-not-just-fonts-fro.patch - 0002-core-make-sure-Environment-fields-passed-in-for-tran.patch - 0003-core-You-can-not-put-the-cached-result-of-use_smack-.patch - 0004-cryptsetup-don-t-add-unit-dependency-on-dev-null-dev.patch - 0005-man-fix-path-in-crypttab-5.patch - -------------------------------------------------------------------- -Wed Jun 25 17:06:07 UTC 2014 - werner@suse.de - -- Add upstream patch - 1039-udevadm-settle-fixed-return-code-for-empty-queue.patch it - fixes udevadm settle exit code which may had broken dracut scripts - (bnc#884271 comment#18) - -------------------------------------------------------------------- -Wed Jun 25 14:12:52 UTC 2014 - werner@suse.de - -- Temporary disable patch 1022 (bnc#884271 and bnc#882714). - -------------------------------------------------------------------- -Tue Jun 24 11:55:39 UTC 2014 - rmilasan@suse.com - -- Rename 0002-udev-fix-invalid-free-in-enable_name_policy.patch - to 1038-udev-fix-invalid-free-in-enable_name_policy.patch - -------------------------------------------------------------------- -Tue Jun 24 11:27:27 UTC 2014 - werner@suse.de - -- Replace patches - 0001-systemd-empty-sigmask-on-reexec.patch with - upstream 0008-Reset-signal-mask-on-re-exec-to-init.patch - ensure-sysctl-are-applied-after-modules-are-loaded.patch with - upstream 0001-units-systemd-sysctl.service.in-run-after-load-modul.patch - getty-generator-with-serial-3270-tty.patch with - upstream 0004-getty-generator-properly-escape-instance-names.patch -- Add upstream patches - 0002-units-add-missing-caps-so-that-GetAddresses-can-work.patch - 0003-units-order-systemd-tmpfiles-clean.service-after-tim.patch - 0005-po-add-Greek-translation.patch - 0006-hwdb-Update-database-of-Bluetooth-company-identifier.patch - 0007-po-add-German-translation.patch - 0009-core-clean-up-signal-reset-logic-when-reexec.patch - 0010-util-treat-fuse.sshfs-as-a-network-filesystem.patch - 0011-build-sys-add-pthread-flag-for-libsystemd-shared.patch - 0012-core-transaction-avoid-misleading-error-message-when.patch - -------------------------------------------------------------------- -Tue Jun 24 10:04:21 UTC 2014 - werner@suse.de - -- Invert of the boolean for locking scheme of fsck (bnc#881125) -- Remove the ghost entry /etc/hostname and require the netcfg - -------------------------------------------------------------------- -Mon Jun 23 16:39:50 UTC 2014 - arvidjaar@gmail.com - -- make sure legacy services that depend on network are started after - network is available (bnc#883565) - * 0001-core-sysvcompat-network-should-be-equivalent-to-netw.patch - * update insserv-generator.patch to translate $network into - network-online.target - -------------------------------------------------------------------- -Wed Jun 18 13:35:58 UTC 2014 - werner@suse.de - -- Add patch 0001-detect-s390-virt.patch from Thomas Blume (bnc#880438) - to detect the virtualization layers on s390x as well - -------------------------------------------------------------------- -Wed Jun 18 12:58:42 UTC 2014 - werner@suse.de - -- Do not generate synthesize change for cd/dvd (bnc#882714, comment #51) - add patch 1037-udev-exclude-cd-dvd-from-block-device.patch from - Roberts suggestion as well as readd - 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - -------------------------------------------------------------------- -Tue Jun 17 14:21:56 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-core-fix-invalid-free-in-killall.patch - 0002-udev-fix-invalid-free-in-enable_name_policy.patch - 0003-install-fix-invalid-free-in-unit_file_mask.patch - -------------------------------------------------------------------- -Tue Jun 17 11:43:23 UTC 2014 - rmilasan@suse.com - -- rules: disable usage of dev_id in persistent rules (bnc#882714). - add: 1036-rules-disable-usage-of-dev_id-in-persistent-rules.patch -- Disable patch (bnc#882714). - 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - -------------------------------------------------------------------- -Thu Jun 12 12:14:11 UTC 2014 - werner@suse.de - -- Add patch - 1035-99-systemd.rules-Ignore-devices-with-SYSTEMD_READY-0.patch - from Hannes Reinecke to avoid a race condition between variable - 'SYSTEMD_READY=0' and 'systemd' tag within udev rules (bnc#881942) - -------------------------------------------------------------------- -Thu Jun 12 09:40:54 UTC 2014 - werner@suse.de - -- Add workaround for bnc#882393 by adding the systemd update utmp - runlevel service to the wanted unit of e.g. the graphical target -- Add some later on created files to our file list - -------------------------------------------------------------------- -Thu Jun 12 03:33:01 UTC 2014 - jlee@suse.com - -- Generate %{_libexecdir}/modules-load.d/efivars.conf so we load efivars - module at boot time not from udev (bnc#881559). - -------------------------------------------------------------------- -Wed Jun 11 21:59:29 UTC 2014 - crrodriguez@opensuse.org - -- Do not build EFI support code in architectures on which - the kernel does not support CONFIG_EFI, it won't work. - (ia64 also supports it, but that's dead so is not included) - -------------------------------------------------------------------- -Wed Jun 11 14:09:30 UTC 2014 - werner@suse.de - -- Add patch tmpfiles-do-not-clean-for-mandb-index-files.patch - there is no need to clean out all 30 days the index data base - files nor the cachedir tags of mandb. Those files are used - for whatis(1) as well as for apropos(1). - -------------------------------------------------------------------- -Wed Jun 11 13:31:53 UTC 2014 - werner@suse.de - -- Do not override predictable names for openSUSE - -------------------------------------------------------------------- -Wed Jun 11 11:03:45 UTC 2014 - werner@suse.de - -- Remove systemd-detect-xendom.patch as it becomes obsolete with - upstream patch 0004-systemd-detect-virt-only-discover-Xen-domU.patch -- Add upstream patches - 0001-umount-modernizations.patch - 0002-namespace-when-setting-up-an-inaccessible-mount-poin.patch - 0003-core-allow-transient-mount-units.patch - 0004-systemd-detect-virt-only-discover-Xen-domU.patch - 0005-backlight-Do-not-clamp-brightness-for-LEDs.patch - 0006-log-honour-the-kernel-s-quiet-cmdline-argument.patch - -------------------------------------------------------------------- -Tue Jun 10 19:58:56 UTC 2014 - rmilasan@suse.com - -- Add upstream patches - 1033-udev-really-exclude-device-mapper-from-block-device.patch - 1034-udev-check-the-return-value-from-udev_enumerate_scan.patch - -------------------------------------------------------------------- -Tue Jun 10 15:29:49 UTC 2014 - werner@suse.de - -- Change detection of new locking scheme of fsck - -------------------------------------------------------------------- -Tue Jun 10 11:11:55 UTC 2014 - werner@suse.de - -- Change 1021-udev-re-add-persistent-net-rules.patch to use persistent - rules as a default on SLES-12 and predictable rules as a default - otherwise -- Add cflags shell function to check possible flags for the compiler - as well as for the linker - -------------------------------------------------------------------- -Mon Jun 9 08:38:33 UTC 2014 - rmilasan@suse.com - -- Add upstream patches - 1025-udev-exclude-device-mapper-from-block-device-ownersh.patch - 1026-udevd-inotify-modernizations.patch - 1027-udev-synthesize-change-events-for-partitions-when-to.patch - 1028-udev-link-config-fix-mem-leak.patch - 1029-udev-try-first-re-reading-the-partition-table.patch - 1030-udev-guard-REREADP-logic-with-open-O_ECXL.patch - 1031-udev-make-sure-we-always-get-change-for-the-disk.patch - 1032-udev-guard-REREADPT-by-exclusive-lock-instead-of-O_E.patch - -------------------------------------------------------------------- -Fri Jun 6 10:24:19 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-sd-event-restore-correct-timeout-behaviour.patch - 0002-bus-make-use-of-sd_bus_try_close-in-exit-on-idle-ser.patch - -------------------------------------------------------------------- -Thu Jun 5 13:29:20 UTC 2014 - werner@suse.de - -- Add upstream patch 0001-hwdb-fix-case-sensitive-match.patch - -------------------------------------------------------------------- -Thu Jun 5 13:23:24 UTC 2014 - werner@suse.de - -- Add dynamic detection of util-linux version to be able to - disable the fsck option -l for version less than 2.25.0 - -------------------------------------------------------------------- -Thu Jun 5 08:06:02 UTC 2014 - werner@suse.de - -- Add changes from Cristian Rodríguez: - * The patches - delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch and - ensure-DM-and-LVM-are-started-before-local-fs-pre-target.patch - indeed mention unit files which do not exist anymore. -- Make sure that systemd-ask-password-wall.service has a tty as - it is not sure that a tty1 exists -- Avoid broken firmware loading on newer distributions as 13.1 - -------------------------------------------------------------------- -Thu Jun 5 07:24:35 UTC 2014 - werner@suse.de - -- Correct version check for the tcp-devel drop -- Use correct permissions for /var/log/journal -- Use ACLs for /var/log/journal as described in man:systemd-journald.service(8) - -------------------------------------------------------------------- -Thu Jun 5 02:33:48 UTC 2014 - crrodriguez@opensuse.org - -- Correct the libseccomp distribution version test must be >= 13.1 -- In order to use unit directive AppArmorProfile= libapparmor-devel - must be present in buildRequires. - -------------------------------------------------------------------- -Tue Jun 3 16:31:44 UTC 2014 - sndirsch@suse.com - -- apply-ACL-for-nvidia-uvm-device-node.patch: set ACL on nvidia-uvm - device (bnc#879767). - -------------------------------------------------------------------- -Tue Jun 3 15:56:01 UTC 2014 - werner@suse.de - -- Add changes from Cristian Rodríguez: - * fix keep-crypt-password-prompt.patch which floods the system - logs with bogus opendir failures, still the wrong thing to do however. - * Use %find_lang to collect locale files - * systemd-no-libattr.patch: systemd does not require libattr - but just sys/xattr.h, therefore drop the dependency. - (from upstream) - * Again, drop tcp-devel from buildRequires, this time it is not a - SUSE specific feature removal, tcpd supportdisappeared in systemd - 212 and we shouldn't keep it around. -- Add patch 0001-build-sys-use-glibc-s-xattr-support-instead-of-requi.patch - that is rename systemd-no-libattr.patch to git format -- Drop tcp-devel only for *next* openSUSE and not for SLES-12 nor - for openSUSE 13.1 - -------------------------------------------------------------------- -Tue Jun 3 14:23:40 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-virt-rework-container-detection-logic.patch - 0002-fsck-include-device-name-in-the-message-about-missin.patch - 0003-units-use-KillMode-mixed-for-systemd-nspawn-.service.patch - 0004-util-ignore_file-should-not-allow-files-ending-with.patch - 0006-tty-ask-password-agent-Do-tell-what-directory-we-fai.patch -- Add upstream patches to update keyboard data base - 0007-keyboard-add-Plantronics-.Audio-mute-button.patch -- Add upstream patches for udev - 1023-udev-builtin-keyboard-do-tell-on-which-device-EVIOCS.patch - 1024-udev-always-close-lock-file-descriptor.patch - -------------------------------------------------------------------- -Tue Jun 3 12:55:53 UTC 2014 - rmilasan@suse.com - -- Fix enabling predictable rules when using net.ifnames=1. - update: 1021-udev-re-add-persistent-net-rules.patch - -------------------------------------------------------------------- -Fri May 30 07:35:07 UTC 2014 - rmilasan@suse.com - -- Re-add persistent rules as a default and make predictable rules as - fallback (bnc#880732). - add: 1021-udev-re-add-persistent-net-rules.patch -- udev: remove seqnum API and all assumptions about seqnums - add: 1022-udev-remove-seqnum-API-and-all-assumptions-about-seq.patch - -------------------------------------------------------------------- -Tue May 27 07:23:47 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-Do-not-unescape-unit-names-in-Install-section.patch - 0002-analyze-run-use-bus_open_transport_systemd-instead-o.patch - -------------------------------------------------------------------- -Mon May 26 16:34:10 UTC 2014 - werner@suse.de - -- Add upstream patch - 1020-udev-keyboard-also-hook-into-change-events.patch - -------------------------------------------------------------------- -Mon May 26 15:25:28 UTC 2014 - werner@suse.de - -- Add upstream patches to update keyboard data base - 0001-keymap-Add-Lenovo-Enhanced-USB-Keyboard.patch - 0002-keymap-Asus-EeePC-touchpad-toggle-key.patch -- Add upstream patches - 0001-nspawn-allow-to-bind-mount-journal-on-top-of-a-non-e.patch - 0002-nspawn-restore-journal-directory-is-empty-check.patch - 0003-core-never-consider-failure-when-reading-drop-ins-fa.patch - 0004-socket-properly-handle-if-our-service-vanished-durin.patch - -------------------------------------------------------------------- -Wed May 21 19:23:32 UTC 2014 - coolo@suse.com - -- fix file list of systemd.pc - -------------------------------------------------------------------- -Wed May 21 13:24:13 UTC 2014 - werner@suse.de - -- Add a workaround for old distributions like 13.1 to avoid - deadlocks due NFS shares stopped after network - -------------------------------------------------------------------- -Wed May 21 10:23:14 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-journal-cleanup-up-error-handling-in-update_catalog.patch - 0002-journal-properly-detect-language-specified-in-line.patch - 0003-man-mention-XDG_CONFIG_HOME-in-systemd.unit.patch - -------------------------------------------------------------------- -Wed May 21 10:14:32 UTC 2014 - werner@suse.de - -- Add upstream patches to update usb and pci company identifiers - 0001-hwdb-update.patch - 0002-hwdb-update.patch - 0003-hwdb-PCI-include-primary-model-string-in-subsystem-m.patch - 0004-hwdb-update.patch - 0005-hwdb-update.patch - -------------------------------------------------------------------- -Wed May 21 08:33:34 UTC 2014 - werner@suse.de - -- Move systemd.pc and udev.pc to their main packages (bnc#876587) - -------------------------------------------------------------------- -Tue May 20 12:13:05 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-conf-parser-silently-ignore-sections-starting-with-X.patch - 0002-man-note-that-entire-sections-can-now-be-ignored.patch - 0004-machined-make-sure-GetMachineAddresses-is-available-.patch - 0005-core-Filter-by-state-behind-the-D-Bus-API-not-in-the.patch - 0006-login-add-mir-to-the-list-of-session-types.patch - 0007-logind-fix-Display-property-of-user-objects.patch - -------------------------------------------------------------------- -Tue May 20 11:31:46 UTC 2014 - werner@suse.de - -- Add upstream patches to update BluTooth company identifiers - 0001-hwdb-Update-database-of-Bluetooth-company-identifier.patch - 0002-hwdb-Update-database-of-Bluetooth-company-identifier.patch - 0003-hwdb-Update-database-of-Bluetooth-company-identifier.patch - 0004-hwdb-Update-database-of-Bluetooth-company-identifier.patch - 0005-hwdb-Update-database-of-Bluetooth-company-identifier.patch - -------------------------------------------------------------------- -Tue May 20 11:03:54 UTC 2014 - werner@suse.de - -- Add upstream patches to allow processes to serialize block device - events, also do execute the RUN tag if rename of a network device - fails: - 1016-udev-serialize-synchronize-block-device-event-handli.patch - 1017-udev-do-not-skip-the-execution-of-RUN-when-renaming-.patch - 1018-udev-avoid-use-of-uninitialized-err.patch -- Rename 0002-udev-warn-when-name_to_handle_at-is-not-implemented.patch - to 1016-udev-warn-when-name_to_handle_at-is-not-implemented.patch - -------------------------------------------------------------------- -Mon May 19 13:21:18 UTC 2014 - werner@suse.de - -- Add upstream patches mainly for better lid handling (bnc#878525 - and bnc#868019) - 0001-logind-ignore-lid-switch-if-more-than-1-display-is-c.patch - 0002-logind-fix-printf-format.patch - 0003-logind-ignore-lid-switch-events-for-30s-after-each-s.patch - 0004-logind-Do-not-fail-display-count-if-a-device-has-no-.patch - 0005-logind-move-lid-switch-handling-from-logind-main-to-.patch - 0006-man-clarify-that-the-ExecReload-command-should-be-sy.patch - 0007-man-readahead-fix-cmdline-switch-inconsistency-betwe.patch - 0008-man-update-journald-rate-limit-defaults.patch - 0009-nspawn-properly-format-container_uuid-in-UUID-format.patch - 0010-logind-allow-suspending-if-there-are-no-displays.patch - -------------------------------------------------------------------- -Fri May 16 12:00:12 UTC 2014 - werner@suse.de - -- Make baselibs.conf aware to use the appropiate %post and %postun - scriptlets which includes pam-config (bnc#877674) - -------------------------------------------------------------------- -Fri May 16 11:47:06 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-core-close-socket-fds-asynchronously.patch - 0002-logind-bring-polkit-policy-for-hibernate-in-line-wit.patch - 0003-core-make-sure-to-serialize-jobs-for-all-units.patch - -------------------------------------------------------------------- -Wed May 14 07:37:08 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-replace-more-dup-by-F_DUPFD_CLOEXEC.patch - 0002-pam_systemd-use-F_DUPFD_CLOEXEC-when-dupping-session.patch - to avoid that in pam session unwanted file descriptors are inherited - -------------------------------------------------------------------- -Tue May 13 08:28:05 UTC 2014 - werner@suse.de - -- Add patch log-target-null-instead-kmsg.patch from Thomas Blume - to enable the kernel developers to see a clean kmsg ring buffer - without any systemd/udev messages included (bnc#877021) - -------------------------------------------------------------------- -Mon May 12 13:35:25 UTC 2014 - werner@suse.de - -- Add upstream patches for backlight - 0001-backlight-Avoid-restoring-brightness-to-an-unreadabl.patch - 0002-backlight-do-nothing-if-max_brightness-is-0.patch - 0003-backlight-unify-error-messages.patch - 0004-backlight-warn-if-kernel-exposes-backlight-device-wi.patch - 0005-backlight-handle-saved-brightness-exceeding-max-brig.patch - -------------------------------------------------------------------- -Mon May 12 13:28:20 UTC 2014 - werner@suse.de - -- Add upstream patches - 0001-errno-make-sure-to-handle-the-3-errnos-that-are-alia.patch - 0002-udev-warn-when-name_to_handle_at-is-not-implemented.patch - 0003-analyze-fix-plot-with-bad-y-size.patch - 0004-job-add-waiting-jobs-to-run-queue-in-unit_coldplug.patch - 0005-job-always-add-waiting-jobs-to-run-queue-during-cold.patch - -------------------------------------------------------------------- -Mon May 12 12:25:13 UTC 2014 - rmilasan@suse.com - -- Drop upstream-net_id-changes.patch and replace them with the correct - patches from upstream and their commits: - add: 1014-udev-update-net_id-comments.patch - add: 1015-udev-persistent-naming-we-cannot-use-virtio-numbers-.patch - -------------------------------------------------------------------- -Wed May 7 10:42:27 UTC 2014 - werner@suse.de - -- Add patch parse-crypttab-for-noauto-option.patch from Thomas Blume - to handle the option 'noauto' in /etc/crypttab (bnc#742774) - -------------------------------------------------------------------- -Wed May 7 09:23:01 UTC 2014 - werner@suse.de - -- Modify and extend patch - 0001-On_s390_con3270_disable_ANSI_colour_esc.patch - to have the correct terminal type used with agetty -- Add patch 0001-tmpfiles-fix-permissions-on-new-journal-files.patch - to allow users to access systemd user journal (bnc#876694) - -------------------------------------------------------------------- -Mon May 5 14:02:16 UTC 2014 - werner@suse.de - -- Port upstream patch - 0001-sd-rtnl-message-append-fix-uninitialized-memory.patch - back to 210 -- Add patch keep-crypt-password-prompt.patch from Thomas Blume - to fix bnc#875502 - fails to boot when swap space is encrypted -- Port upstream patch set for net_id back in patch - upstream-net_id-changes.patch - -------------------------------------------------------------------- -Fri May 2 10:12:26 UTC 2014 - werner@suse.de - -- Add patch shut-up-annoying-assertion-monotonic-clock-message.patch - to avoid annyoing messages on failing dual_timestamp_is_set in the - kernel's message ring buffer - -------------------------------------------------------------------- -Wed Apr 30 12:14:32 UTC 2014 - werner@suse.de - -- Update udev-generate-peristent-rule.sh from latest git - -------------------------------------------------------------------- -Wed Apr 30 10:55:54 UTC 2014 - werner@suse.de - -- Modify and extend patch - 0001-On_s390_con3270_disable_ANSI_colour_esc.patch - to avoid also ANSI escape sequences for busy jobs on s390 - -------------------------------------------------------------------- -Mon Apr 28 09:51:35 UTC 2014 - werner@suse.de - -- Add or port upstream bugfix patches: - 0001-bash-completion-fix-__get_startable_units.patch - 0002-sysctl-replaces-some-slashes-with-dots.patch - 0003-delta-do-not-use-unicode-chars-in-C-locale.patch - 0004-implement-a-union-to-pad-out-file_handle.patch -- Add patch respect-nfs-bg-option.patch from Thomas Blume: - System fails to boot if nfs mounts get added to fstab (bnc#874665) - -------------------------------------------------------------------- -Wed Apr 23 11:46:41 UTC 2014 - oneukum@suse.com - -- Do not use runtime PM for some IBM consoles (bnc#868931) - 1013-no-runtime-PM-for-IBM-consoles.patch - -------------------------------------------------------------------- -Thu Apr 17 13:56:31 UTC 2014 - werner@suse.de - -- Extend avoid-divide-by-zero-sigtrap.patch to make the crash - handler know about SIGTRAP and SIGSYS - -------------------------------------------------------------------- -Thu Apr 17 13:37:06 UTC 2014 - werner@suse.de - -- Add avoid-divide-by-zero-sigtrap.patch which fixes bnc#867663 - that is a divide by zero on a jobless system - -------------------------------------------------------------------- -Wed Apr 16 10:17:13 UTC 2014 - werner@suse.de - -- Use latest regenerate-initrd rpm macros (fate#313506) -- Add rescue-emergency-target-conflicts.patch to avoid that - emergency and rescue sulogin are fighting on console - -------------------------------------------------------------------- -Tue Apr 15 12:19:24 UTC 2014 - werner@suse.de - -- Modify systemd-sleep-grub to let hybrid-sleep.target work even - on XEN, changes from Thomas Blume (bnc#873432) - -------------------------------------------------------------------- -Mon Apr 14 13:55:36 UTC 2014 - werner@suse.de - -- Add backported upstream patch - 0001-reduce-the-amount-of-messages-logged-to-dev-kmsg-whe.patch -- Add patch systemd-detect-xendom.patch from Thomas Blume - to be able to detect XEN dom0 as well as domU -- systemd conflicts with sysvinit, ven if the package systemd-sysvinit - does already conflict with sysvinit-init (bnc#873444) - -------------------------------------------------------------------- -Thu Apr 10 10:17:47 UTC 2014 - werner@suse.de - -- Add two patches from hare@suse.com - 1011-64-btrfs.rules-skip-btrfs-check-if-devices-are-not-r.patch - 1012-Skip-persistent-device-link-creation-on-multipath-de.patch - to solve bnc#872929 - -------------------------------------------------------------------- -Wed Apr 9 08:53:21 UTC 2014 - rmilasan@suse.com - -- Increase result size for programs stdout (bnc#867840). - add: 1010-udev-increase-result-size-for-programs.patch -- Update udev-generate-peristent-rule.sh to the latest version. -- Clean-up spec file, re-arange patch to suit the setup, all udev - patches start with 1XXX-*.{patch,diff}. -- Rename: 0013-cdrom_id-use-the-old-MMC-fallback.patch to - 1009-cdrom_id-use-the-old-MMC-fallback.patch -- Rename: 1009-make-xsltproc-use-correct-ROFF-links.patch to - 0009-make-xsltproc-use-correct-ROFF-links.patch -- Rename: 1010-do-not-install-sulogin-unit-with-poweroff.patch to - 0010-do-not-install-sulogin-unit-with-poweroff.patch -- Rename: 1014-journald-with-journaling-FS.patch to - 0014-journald-with-journaling-FS.patch -- Rename: 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch to - 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch -- Rename: 1019-make-completion-smart-to-be-able-to-redirect.patch to - 0019-make-completion-smart-to-be-able-to-redirect.patch -- Rename: 1022-systemd-tmpfiles-ownerkeep.patch to - 0022-systemd-tmpfiles-ownerkeep.patch - -------------------------------------------------------------------- -Tue Apr 8 07:27:49 UTC 2014 - werner@suse.de - -- Add patch portmap-wants-rpcbind-socket.patch to make sure that - rpcbind socket as well as service is up with the target -- Add or port upstream bugfix patches: - 0001-journal-fix-export-of-messages-containing-newlines.patch - 0002-systemctl-update-NAME-to-PATTERN-in-help.patch - 0003-tty-ask-password-agent-return-negative-errno.patch - 0004-systemd-python-use-.hex-instead-of-.get_hex.patch - 0005-systemd-python-fix-failing-assert.patch - -------------------------------------------------------------------- -Fri Mar 28 12:53:21 UTC 2014 - werner@suse.de - -- Add or port upstream bugfix patches: - 0001-cgroup-it-s-not-OK-to-invoke-alloca-in-loops.patch - 0002-machined-fix-Kill-bus-call-on-machine-objects-when-w.patch - 0003-sd-bus-don-t-use-assert_return-to-check-for-disconne.patch - 0004-core-don-t-try-to-relabel-mounts-before-we-loaded-th.patch - 0005-sd-daemon-fix-incorrect-variable-access.patch - 0006-sd-event-initialization-perturbation-value-right-bef.patch - 0007-sd-event-don-t-accidentally-turn-of-watchdog-timer-e.patch - 0008-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch - 0009-ask-password-when-the-user-types-a-overly-long-passw.patch -- Modify patch - 1019-make-completion-smart-to-be-able-to-redirect.patch - to work together with - 0008-systemctl-kill-mode-is-long-long-gone-don-t-mention-.patch - -------------------------------------------------------------------- -Fri Mar 28 08:10:13 UTC 2014 - werner@suse.de - -- Use Robert's revised 1006-udev-always-rename-network.patch - -------------------------------------------------------------------- -Tue Mar 25 17:28:18 UTC 2014 - werner@suse.de - -- Readd patch Forward-suspend-hibernate-calls-to-pm-utils.patch - older code base as 13.1 only -- Add patch avoid-random-hangs-on-timeouts-due-lost-cwd.patch - to be able to terminate the user manager even if cwd of the - user is gone - -------------------------------------------------------------------- -Tue Mar 25 13:08:56 UTC 2014 - thomas.blume@suse.com - -- add prepare-suspend-to-disk.patch - enable suspend conditions check and preparation for systemd-sleep - (fate#316824, bnc#856389, bnc#856392) -- remove Forward-suspend-hibernate-calls-to-pm-utils.patch since it is obsolete - (bnc#856392#c20) -- add boot-local-start.patch - fix startup for /etc/init.d/boot.local (bnc#869142) - -------------------------------------------------------------------- -Mon Mar 24 11:19:38 UTC 2014 - coolo@suse.com - -- also autoreconf in systemd-mini to simplify spec file logic - and fix build in staging:gcc49 - (obsoleting 0002-make-209-working-on-older-dist.patch) - -------------------------------------------------------------------- -Wed Mar 19 13:21:37 UTC 2014 - werner@suse.de - -- Be sure that the refreshed manual pages are installed - -------------------------------------------------------------------- -Wed Mar 19 12:09:31 UTC 2014 - werner@suse.de - -- Add patch systemctl-set-default-target.patch which explain how - to override the default.target by using --force (bnc#868439) - -------------------------------------------------------------------- -Tue Mar 18 13:23:43 UTC 2014 - werner@suse.de - -- Add Robert's udev-generate-peristent-rule shell script to - udev's tool library -- Add or port upstream bugfix patches: - 0001-gpt-auto-generator-don-t-return-OOM-on-parentless-de.patch - 0002-bus-fix-memory-leak-when-kdbus-is-not-enabled.patch - 0006-Do-not-return-1-EINVAL-on-allocation-error.patch - 0007-networkd-fix-typo.patch - 0008-sd-bus-don-t-access-invalid-memory-if-a-signal-match.patch - 0009-sd-bus-don-t-choke-if-somebody-sends-us-a-message-wi.patch - 0012-journald-remove-stray-reset-of-error-return-value.patch - 0013-core-libsystemd-systemd-timedate-udev-spelling-fixes.patch - -------------------------------------------------------------------- -Fri Mar 14 14:24:56 UTC 2014 - werner@suse.de - -- Add patch getty-generator-with-serial-3270-tty.patch to avoid - harmless error messages on not existing getty@3270 files - -------------------------------------------------------------------- -Fri Mar 14 11:07:29 UTC 2014 - werner@suse.de - -- Replace systemd-big-endian-reply-matching.patch with upstream - 0001-sd-bus-don-t-look-for-a-64bit-value-when-we-only-hav.patch - to solve broken systemd communication with and over dbus (bnc#866732) - -------------------------------------------------------------------- -Fri Mar 14 08:30:57 UTC 2014 - werner@suse.de - -- Readd patch 1008-add-msft-compability-rules.patch for - older code base as 13.1 -- Modify pre_checkin.sh to throw an error if a patch will be - applied which modifies one of Makefile.am, Makefile.in, or - configiure.ac as this breaks bootstrapping -- Add second version of make-209-working-on-older-dist.patch - to be able to apply for bootstrapping version - -------------------------------------------------------------------- -Thu Mar 13 17:35:11 UTC 2014 - schwab@linux-m68k.org - -- Don't require non-existing binutils-gold - -------------------------------------------------------------------- -Thu Mar 13 15:43:19 UTC 2014 - werner@suse.de - -- Avoid file conflict between udev and systemd (bnc#868230) - -------------------------------------------------------------------- -Wed Mar 12 16:52:09 UTC 2014 - werner@suse.de - -- Modify patch - module-load-handle-SUSE-etc-sysconfig-kernel-module-list.patch - to ignore if /etc/sysconfig/kernel does not exist (bnc#865834) - -------------------------------------------------------------------- -Wed Mar 12 14:35:10 UTC 2014 - werner@suse.de - -- Add patch systemd-big-endian-reply-matching.patch - make sure that systemd can talk with dbus-daemon even on big - endian systems (bnc#866732) - -------------------------------------------------------------------- -Tue Mar 11 11:32:37 UTC 2014 - hrvoje.senjan@gmail.com - -- Due to previous reason, resurrect systemd-dbus-system-bus-address.patch -- Removed pkgconfig(dbus-1) BuildRequires - with 209 and newer, itis only - needed for quering default DBus directories, which we nowpass to configure. - This also unbreaks libdbus <-> systemd-miniBuild Cycle - -------------------------------------------------------------------- -Tue Mar 11 11:01:53 UTC 2014 - werner@suse.de - -- Add or port upstream bugfix patches: - 0001-core-busname-add-lookup-string-for-BUSNAME_FAILURE_S.patch - 0002-manager-flush-memory-stream-before-using-the-buffer.patch - 0003-busname-don-t-drop-service-from-the-result-string.patch - 0004-fix-off-by-one-error-in-array-index-assertion.patch - 0005-logind-fix-policykit-checks.patch - 0006-rules-mark-loop-device-as-SYSTEMD_READY-0-if-no-file.patch - 0007-dbus-suppress-duplicate-and-misleading-messages.patch - 0008-man-multiple-sleep-modes-are-to-be-separated-by-whit.patch - -------------------------------------------------------------------- -Tue Mar 11 07:47:55 UTC 2014 - werner@suse.de - -- Make compeletion file parser work (bnc#867664) - -------------------------------------------------------------------- -Fri Mar 7 14:50:39 CET 2014 - hare@suse.de - -- Integrate powerd handling in initctl service - + Remove 1016-support-powerfail-with-powerstatus.patch - + Remove systemd-powerfail - + Add systemd-powerd-initctl-support.patch -- Remove 61-msft.rules; superseded by sg3_utils (bnc#866933) -- Persistent by-path links for ATA devices (FATE#317063) - + Update 1001-re-enable-by_path-links-for-ata-devices.patch - -------------------------------------------------------------------- -Fri Mar 7 09:25:53 UTC 2014 - werner@suse.de - -- Add or port upstream bugfix patches: - 0001-Fix-systemd-stdio-bridge-symlink.patch - 0002-execute-free-directory-path-if-we-fail-to-remove-it-.patch - 0003-Do-not-print-invalid-UTF-8-in-error-messages.patch - 0004-man-document-missing-options-of-systemd-run.patch - 0005-systemd-run-add-some-extra-safety-checks.patch - 0006-journal-assume-that-next-entry-is-after-previous-ent.patch - 0007-journal-forget-file-after-encountering-an-error.patch - 0008-core-correctly-unregister-PIDs-from-PID-hashtables.patch - 0009-logind-fix-reference-to-systemd-user-sessions.servic.patch - 0010-man-update-link-to-LSB.patch - 0011-man-systemd-bootchart-fix-spacing-in-command.patch - 0012-man-add-missing-comma.patch - 0013-units-Do-not-unescape-instance-name-in-systemd-backl.patch - -------------------------------------------------------------------- -Fri Mar 7 08:00:31 UTC 2014 - werner@suse.de - -- Add linker scripts as place holder of the old systemd shared - libraries now all included in libsystemd.so (bnc#867128) - -------------------------------------------------------------------- -Tue Mar 4 10:37:02 UTC 2014 - werner@suse.de - -- Make patch 1006-udev-always-rename-network.patch work again - and add it again. - -------------------------------------------------------------------- -Mon Mar 3 15:23:57 UTC 2014 - thomas.blume@suse.com - -- address missing owner functionality in systemd-tmpfiles (fate#314974) - 1022-systemd-tmpfiles-ownerkeep.patch - -------------------------------------------------------------------- -Mon Mar 3 14:49:48 UTC 2014 - werner@suse.de - -- Generate the bash completion files on the fly for the case of - not having the package bash-completion around -- Add or port upstream bugfix patches: - 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch - 0002-cdrom_id-use-the-old-MMC-fallback.patch - 0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch - 0004-logs-show-fix-corrupt-output-with-empty-messages.patch - 0005-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch - 0006-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch - 0007-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch - 0008-README-document-that-var-run-must-be-a-symlink-run.patch - 0010-Replace-var-run-with-run-in-remaining-places.patch - 0009-Revert-back-to-var-run-at-a-couple-of-problems.patch - 0011-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch - 0012-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch - 0013-login-set-pos-slot-to-fallback-on-pos-eviction.patch - 0014-login-fix-pos-array-allocation.patch - -------------------------------------------------------------------- -Mon Mar 3 13:58:11 UTC 2014 - werner@suse.de - -- Update to Release v210 - + systemd will now relabel /dev after loading the SMACK policy - according to SMACK rules. - + A new unit file option AppArmoreProfile= has been added to - set the AppArmor profile for the processes of a unit. - + A new condition check ConditionArchitecture= has been added - to conditionalize units based on the system architecture, as - reported by uname()'s "machine" field. - + systemd-networkd now supports matching on the system - virtualization, architecture, kernel command line, host name - and machine ID. - + logind is now a lot more aggressive when suspending the - machine due to a closed laptop lid. - + logind will now watch SW_DOCK switches and inhibit reaction - to the lid switch if it is pressed. - + nspawn will now make use of the devices cgroup controller by - default, and only permit creation of and access to the usual - API device nodes like /dev/null or /dev/random, as well as - access to (but not creation of) the pty devices. - + systemd will now understand the usual M, K, G, T suffixes - according to SI conventions (i.e. to the base 1000) when - referring to throughput and hardware metrics. - + The DeviceAllow= setting in unit files now supports a syntax - to whitelist an entire group of devices node majors at once, - based on the /proc/devices listing. For example, with the - string "char-pts" it is now possible to whitelist all - current and future pseudo-TTYs at once. - + sd-event learned a new "post" event source. Event sources of - this type are triggered by the dispatching of any event - source of a type that is not "post". This is useful for - implementing clean-up and check event sources that are - triggered by other work being done in the program. - + The compatibility libraries for libsystemd-journal.so, - libsystem-id128.so, libsystemd-login.so and - libsystemd-daemon.so do not make use of IFUNC - anymore. -- Dropped systemd patches as those are fixed upstream: - * 0001-units-serial-getty-.service-add-Install-section.patch - * 0001-shared-architecture.h-fix-preprocessor-directives.patch - * 0001-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch - * 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patchc - * 0001-make-tests-with-libseccomp-work.patch - * 0001-build-sys-Fix-compilation-of-nspawn-when-seccomp-is-.patch - * 0001-units-serial-getty-.service-add-Install-section.patch -- Dropped patches as those do not work anymore - * 1006-udev-always-rename-network.patch -- Renamed systemd patches as seen from git log: - * 0001-cdrom_id-use-the-old-MMC-fallback.patch - become 0002-cdrom_id-use-the-old-MMC-fallback.patch - * 0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch - become 0003-journalctl-refuse-extra-arguments-with-verify-and-si.patch - * 0001-logs-show-fix-corrupt-output-with-empty-messages.patch - become 0004-logs-show-fix-corrupt-output-with-empty-messages.patch -- Add several upstream bugfix patches which are missed: - * 0001-build-sys-Add-setns-functions-if-not-in-the-C-librar.patch - * 0001-build-sys-Fix-compilation-of-nspawn-when-seccomp-is-.patch - * 0001-sd-event-Fix-systemd-crash-when-using-timer-units.patch - * 0001-selinux-Don-t-attempt-to-load-policy-in-initramfs-if.patch - * 0001-shared-architecture.h-fix-preprocessor-directives.patch - * 0005-mount-don-t-fire-PropertiesChanged-signals-for-mount.patch - * 0006-mount-don-t-send-out-PropertiesChanged-message-if-ac.patch - * 0007-Use-var-run-dbus-system_bus_socket-for-the-D-Bus-soc.patch - * 0008-README-document-that-var-run-must-be-a-symlink-run.patch - * 0009-Revert-back-to-var-run-at-a-couple-of-problems.patch - * 0010-Replace-var-run-with-run-in-remaining-places.patch - * 0011-fix-typo-in-iDRAC-network-interface-name-irdac-idrac.patch - * 0012-login-Allow-calling-org.freedesktop.login1.Seat.Swit.patch - * 0013-login-set-pos-slot-to-fallback-on-pos-eviction.patch - * 0014-login-fix-pos-array-allocation.patch -- Modified patches to make is build - * 0001-add-network-device-after-NFS-mount-units.patch -- Reenable libseccomp for the architecture for which libseccomp exists - -------------------------------------------------------------------- -Sun Mar 2 15:51:24 CET 2014 - ro@suse.de - -- always install compat pkgconfig files, regardless if - compat libs is enabled or not - -------------------------------------------------------------------- -Sun Mar 2 14:47:23 CET 2014 - ro@suse.de - -- disable use of libseccomp for sle12, library has not been ported - to most architectures -- do not use binutils-gold on s390/s390x, does not exist there -- fix exclude statements for bootstrap case - -------------------------------------------------------------------- -Fri Feb 28 17:54:40 UTC 2014 - werner@suse.de - -- Add upstream patches - + 0001-cdrom_id-use-the-old-MMC-fallback.patch - + 0001-logs-show-fix-corrupt-output-with-empty-messages.patch - + 0001-journalctl-refuse-extra-arguments-with-verify-and-si.patch - -------------------------------------------------------------------- -Fri Feb 28 17:41:37 UTC 2014 - werner@suse.de - -- Add patch - 0001-systemd-empty-sigmask-on-reexec.patch - which corrects sigmaks for reexec in initrd (bnc#864904) - -------------------------------------------------------------------- -Fri Feb 28 17:38:06 UTC 2014 - werner@suse.de - -- Add patch - 0001-nspawn-fix-detection-of-missing-proc-self-loginuid.patch - to avoid error on not existing file /proc/self/loginuid - -------------------------------------------------------------------- -Fri Feb 28 17:15:38 UTC 2014 - werner@suse.de - -- Make patch - 0001-make-209-working-on-older-dist.patch - more smart that is make configure script les restrictive -- Make patch - apply-ACL-for-nvidia-device-nodes.patch - apply to v209 - -------------------------------------------------------------------- -Fri Feb 28 16:59:25 UTC 2014 - werner@suse.de - -- Update to Release v209 on the base of the work of Stefan Brüns - from declined submit request 223602: - + A new tool "systemd-socket-proxyd" has been added - + Add a new tool to save/restore rfkill state on - shutdown/boot. - + Save/restore state of keyboard backlights in addition to - display backlights on shutdown/boot. - + udev learned a new SECLABEL{} construct to label device - nodes with a specific security label when they appear. For - now, only SECLABEL{selinux} is supported, but the syntax is - prepared for additional security frameworks. - + When the User= switch is used in a unit file, also - initialize $SHELL= based on the user database entry. - + systemd no longer depends on libdbus. All communication is - now done with sd-bus, systemd's low-level bus library - implementation. - + sd-bus: add a light-weight vtable implementation that allows - defining objects on the bus with a simple static const - vtable array of its methods, signals and properties. - + systemd will not generate or install static dbus - introspection data anymore to /usr/share/dbus-1/interfaces, - as the precise format of these files is unclear, and - nothing makes use of it. - + A proxy daemon is now provided to proxy clients connecting - via classic D-Bus AF_UNIX sockets to kdbus, to provide full - compatibility with classic D-Bus. - + A bus driver implementation has been added that supports the - classic D-Bus bus driver calls on kdbus, also for - compatibility purposes. - + A new API "sd-event.h" has been added that implements a - minimal event loop API built around epoll. - + A new API "sd-rntl.h" has been added that provides an API - around the route netlink interface of the kernel, similar in - style to "sd-bus.h". - + A new API "sd-dhcp-client.h" has been added that provides a - small DHCPv4 client-side implementation. This is used by - "systemd-networkd". - + There is a new kernel command line option - "systemd.restore_state=0|1". When set to "0", none of the - systemd tools will restore saved runtime state to hardware - devices. More specifically, the rfkill and backlight states - are not restored. - + The FsckPassNo= compatibility option in mount/service units - has been removed. The fstab generator will now add the - necessary dependencies automatically, and does not require - PID1's support for that anymore. - + journalctl gained a new switch, --list-boots, that lists - recent boots with their times and boot IDs. - + The various tools like systemctl, loginctl, timedatectl, - busctl, systemd-run, ... have gained a new switch "-M" to - connect to a specific, local OS container (as direct - connection, without requiring SSH). - + systemd-run and systemd-analyze also gained support for "-H" - to connect to remote hosts via SSH. This is particularly - useful for systemd-run because it enables queuing of jobs - onto remote systems. - + machinectl gained a new command "login" to open a getty - login in any local container. This works with any container - that is registered with machined (such as those created by - libvirt-lxc or nspawn), and which runs systemd inside. - + machinectl gained a new "reboot" command that may be used to - trigger a reboot on a specific container that is registered - with machined. This works on any container that runs an init - system of some kind. - + systemctl gained a new "list-timers" command to print a nice - listing of installed timer units with the times they elapse - next. - + Alternative reboot() parameters may now be specified on the - "systemctl reboot" command line and are passed to the - reboot() system call. - + systemctl gained a new --job-mode= switch to configure the - mode to queue a job with. This is a more generic version of - --fail, --irreversible, and --ignore-dependencies, which are - still available but not advertised anymore. - + /etc/systemd/system.conf gained new settings to configure - various default timeouts of units, as well as the default - start limit interval and burst. These may still be overridden - within each Unit. - + PID1 will now export on the bus profile data of the security - policy upload process (such as the SELinux policy upload to - the kernel). - + journald: when forwarding logs to the console, include - timestamps (following the setting in - /sys/module/printk/parameters/time). - + OnCalendar= in timer units now understands the special - strings "yearly" and "annually". (Both are equivalent) - + The accuracy of timer units is now configurable with the new - AccuracySec= setting. It defaults to 1min. - + A new dependency type JoinsNamespaceOf= has been added that - allows running two services within the same /tmp and network - namespace, if PrivateNetwork= or PrivateTmp= are used. - + A new command "cat" has been added to systemctl. It outputs - the original unit file of a unit, and concatenates the - contents of additional "drop-in" unit file snippets, so that - the full configuration is shown. - + systemctl now supports globbing on the various "list-xyz" - commands, like "list-units" or "list-sockets", as well as on - those commands which take multiple unit names. - + journalctl's --unit= switch gained support for globbing. - + All systemd daemons now make use of the watchdog logic so - that systemd automatically notices when they hang. - + If the $container_ttys environment variable is set, - getty-generator will automatically spawn a getty for each - listed tty. This is useful for container managers to request - login gettys to be spawned on as many ttys as needed. - + %h, %s, %U specifier support is not available anymore when - used in unit files for PID 1. This is because NSS calls are - not safe from PID 1. They stay available for --user - instances of systemd, and as special case for the root user. - + loginctl gained a new "--no-legend" switch to turn off output - of the legend text. - + The "sd-login.h" API gained three new calls: - sd_session_is_remote(), sd_session_get_remote_user(), - sd_session_get_remote_host() to query information about - remote sessions. - + The udev hardware database now also carries vendor/product - information of SDIO devices. - + The "sd-daemon.h" API gained a new sd_watchdog_enabled() to - determine whether watchdog notifications are requested by - the system manager. - + Socket-activated per-connection services now include a - short description of the connection parameters in the - description. - + tmpfiles gained a new "--boot" option. When this is not used, - only lines where the command character is not suffixed with - "!" are executed. When this option is specified, those - options are executed too. - + systemctl gained a new "import-environment" command which - uploads the caller's environment (or parts thereof) into the - service manager so that it is inherited by services started - by the manager. This is useful to upload variables like - $DISPLAY into the user service manager. - + A new PrivateDevices= switch has been added to service units - which allows running a service with a namespaced /dev - directory that does not contain any device nodes for - physical devices. More specifically, it only includes devices - such as /dev/null, /dev/urandom, and /dev/zero which are API - entry points. - + logind has been extended to support behaviour like VT - switching on seats that do not support a VT. This makes - multi-session available on seats that are not the first seat - (seat0), and on systems where kernel support for VTs has - been disabled at compile-time. - + If a process holds a delay lock for system sleep or shutdown - and fails to release it in time, we will now log its - identity. This makes it easier to identify processes that - cause slow suspends or power-offs. - + When parsing /etc/crypttab, support for a new key-slot= - option as supported by Debian is added. It allows indicating - which LUKS slot to use on disk, speeding up key loading. - + The sd_journald_sendv() API call has been checked and - officially declared to be async-signal-safe so that it may - be invoked from signal handlers for logging purposes. - + Boot-time status output is now enabled automatically after a - short timeout if boot does not progress, in order to give - the user an indication what she or he is waiting for. - + The boot-time output has been improved to show how much time - remains until jobs expire. - + The KillMode= switch in service units gained a new possible - value "mixed". If set, and the unit is shut down, then the - initial SIGTERM signal is sent only to the main daemon - process, while the following SIGKILL signal is sent to - all remaining processes of the service. - + logind will now also track a "Desktop" identifier for each - session which encodes the desktop environment of it. This is - useful for desktop environments that want to identify - multiple running sessions of itself easily. - + A new SELinuxContext= setting for service units has been - added that allows setting a specific SELinux execution - context for a service. - + Most systemd client tools will now honour $SYSTEMD_LESS for - settings of the "less" pager. - + systemd's "seccomp" hook-up has been changed to make use of - the libseccomp library instead of using its own - implementation. This has benefits for portability among - other things. -- Dropped systemd patches as those are fixed upstream: - * 0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch - * 0002-fix-lingering-references-to-var-lib-backlight-random.patch - * 0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch - * 0004-systemctl-fix-name-mangling-for-sysv-units.patch - * 0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch - * 0006-journald-add-missing-error-check.patch - * 0007-bus-fix-potentially-uninitialized-memory-access.patch - * 0008-dbus-fix-return-value-of-dispatch_rqueue.patch - * 0009-modules-load-fix-error-handling.patch - * 0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch - * 0011-strv-don-t-access-potentially-NULL-string-arrays.patch - * 0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch - * 0014-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch - * 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch - * 0001-gpt-auto-generator-exit-immediately-if-in-container.patch - * 0001-manager-when-verifying-whether-clients-may-change-en.patch - * 0001-logind-fix-bus-introspection-data-for-TakeControl.patch - * 0001-mount-check-for-NULL-before-reading-pm-what.patch - * 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch - * 0001-systemd-serialize-deserialize-forbid_restart-value.patch - * 0001-core-unify-the-way-we-denote-serialization-attribute.patch - * 0001-journald-fix-minor-memory-leak.patch - * 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch - * 0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch - * 0001-login-fix-invalid-free-in-sd_session_get_vt.patch - * 0001-login-make-sd_session_get_vt-actually-work.patch - * 0001-Never-call-qsort-on-potentially-NULL-arrays.patch - * 0001-dbus-common-avoid-leak-in-error-path.patch - * 0001-drop-ins-check-return-value.patch - * 0001-shared-util-Fix-glob_extend-argument.patch - * 0001-Fix-bad-assert-in-show_pid_array.patch - * 0001-analyze-set-white-background.patch - * 0001-analyze-set-text-on-side-with-most-space.patch - * analyze-fix-crash-in-command-line-parsing.patch - * 0001-core-replace-OnFailureIsolate-setting-by-a-more-gene.patch - * 0001-core-introduce-new-KillMode-mixed-which-sends-SIGTER.patch - * 0002-service-allow-KillMode-mixed-in-conjunction-with-PAM.patch - * 0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch - * U_logind_revert_lazy_session_activation_on_non_vt_seats.patch - * build-sys-make-multi-seat-x-optional.patch - * 1017-skip-native-unit-handling-if-sysv-already-handled.patch - * 0018-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch - * 0030-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch - * 0031-man-document-the-b-special-boot-option.patch - * 0033-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch - * 0034-systemd-python-fix-booted-and-add-two-functions-to-d.patch - * 0035-activate-mention-E-in-the-help-text.patch - * 0036-activate-fix-crash-when-s-is-passed.patch - * 0037-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch - * 0038-core-socket-fix-SO_REUSEPORT.patch - * 0039-journal-when-appending-to-journal-file-allocate-larg.patch - * 0040-journal-optimize-bisection-logic-a-bit-by-caching-th.patch - * 0041-journal-fix-iteration-when-we-go-backwards-from-the-.patch - * 0042-journal-allow-journal_file_copy_entry-to-work-on-non.patch - * 0043-journal-simplify-pre-allocation-logic.patch - * 0044-journald-mention-how-long-we-needed-to-flush-to-var-.patch - * 0046-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch - * 0047-docs-remove-unneeded-the-s-in-gudev-docs.patch - * 0048-man-explicitly-say-when-multiple-units-can-be-specif.patch - * 0049-systemd-treat-reload-failure-as-failure.patch -- Dropped backported systemd patches as those are fixed upstream - * 0145-logind-use-correct-who-enum-values-with-KillUnit.patch - * 1011-check-4-valid-kmsg-device.patch - * 0001-logind-garbage-collect-stale-users.patch -- Dropped udev patches as those are fixed fixed upstream: - * 0026-udevadm.xml-document-resolve-names-option-for-test.patch - * 0032-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch -- Modified patches - * 1006-udev-always-rename-network.patch -- Replaced patches - * the patch - 1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch - is upstream now but has to be replaced by patch - 0001-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch - to fix an further issue similar to the upstream patch (bnc#852015) - * the patch - 0001-upstream-systemctl-halt-reboot-error-handling.patch - is upstream now, only the part with the halt after a failed poweroff - has been added to the patch - 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch - -------------------------------------------------------------------- -Thu Feb 27 15:13:09 UTC 2014 - werner@suse.de - -- Add patch 0001-make-209-working-on-older-dist.patch to make - it usable on older distributions like 13.1 - -------------------------------------------------------------------- -Wed Feb 26 12:43:17 UTC 2014 - werner@suse.de - -- Add patch 0001-add-network-device-after-NFS-mount-units.patch to - add "After" dependency to all NFS shares to the network interface - device as this ensures at shutdown that the NFS share becomes - unmounted before the interface is down (bnc#861489) - -+------------------------------------------------------------------- -------------------------------------------------------------------- -Sun Feb 23 23:47:06 UTC 2014 - stefan.bruens@rwth-aachen.de - -- enable compat-libs, BuildRequires binutils-gold - ("old" ld fails on ifunc magic) - -------------------------------------------------------------------- -Sun Feb 23 16:11:22 UTC 2014 - stefan.bruens@rwth-aachen.de - -- add network link configuration for udev - -------------------------------------------------------------------- -Sun Feb 23 15:44:01 UTC 2014 - stefan.bruens@rwth-aachen.de - -- Modify patch 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch, - move to core and link in directly to avoid libudev dep all over -- Disable networkd -- Disable compat-libs, adapt files section -- add and remove some entries in the files section - -------------------------------------------------------------------- -Fri Feb 21 16:04:54 UTC 2014 - werner@suse.de - -- Modify patch 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch - to avoid WantedBy for Should-Start/Start-Before/Start-After SysVinit - scripts (bnc#863217) - -------------------------------------------------------------------- -Thu Feb 20 12:22:15 UTC 2014 - werner@suse.de - -- Modify patch 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch - to do a final sync() and flush the disks - -------------------------------------------------------------------- -Fri Feb 14 16:03:16 UTC 2014 - werner@suse.de - -- Add several upstream bugfix patches which are missed: - * 0018-core-do-not-add-what-to-RequiresMountsFor-for-networ.patch - * 0026-udevadm.xml-document-resolve-names-option-for-test.patch - * 0030-Fix-for-SIGSEGV-in-systemd-bootchart-on-short-living.patch - * 0032-rules-don-t-limit-some-of-the-rules-to-the-add-actio.patch - * 0031-man-document-the-b-special-boot-option.patch - * 0033-tmpfiles-log-unaccessible-FUSE-mount-points-only-as-.patch - * 0034-systemd-python-fix-booted-and-add-two-functions-to-d.patch - * 0035-activate-mention-E-in-the-help-text.patch - * 0036-activate-fix-crash-when-s-is-passed.patch - * 0037-tmpfiles-adjust-excludes-for-the-new-per-service-pri.patch - * 0038-core-socket-fix-SO_REUSEPORT.patch - * 0039-journal-when-appending-to-journal-file-allocate-larg.patch - * 0040-journal-optimize-bisection-logic-a-bit-by-caching-th.patch - * 0041-journal-fix-iteration-when-we-go-backwards-from-the-.patch - * 0042-journal-allow-journal_file_copy_entry-to-work-on-non.patch - * 0043-journal-simplify-pre-allocation-logic.patch - * 0044-journald-mention-how-long-we-needed-to-flush-to-var-.patch - * 0046-util.c-check-if-return-value-from-ttyname_r-is-0-ins.patch - * 0047-docs-remove-unneeded-the-s-in-gudev-docs.patch - * 0048-man-explicitly-say-when-multiple-units-can-be-specif.patch - * 0049-systemd-treat-reload-failure-as-failure.patch -- Add patch 0001-Don-t-snprintf-a-potentially-NULL-pointer.patch - to avoid potential NULL pointer -- Reorder patches to reflect udev/systemd usage - -------------------------------------------------------------------- -Tue Feb 11 10:53:48 UTC 2014 - coolo@suse.com - -- don't build bash-completions for bootstrap package - -------------------------------------------------------------------- -Tue Feb 11 10:25:26 UTC 2014 - coolo@suse.com - -- add more requires to this-is-only-for-build-envs to avoid - problems in kiwi configs - -------------------------------------------------------------------- -Mon Feb 10 15:15:35 UTC 2014 - werner@suse.de - -- Add patch 0145-logind-use-correct-who-enum-values-with-KillUnit.patch - to be able to kill sessions (bnc#860574) - -------------------------------------------------------------------- -Mon Feb 10 11:19:31 UTC 2014 - werner@suse.de - -- Do not return from main shell script but simply exit (bnc#862789) - -------------------------------------------------------------------- -Sun Feb 9 18:43:38 UTC 2014 - werner@suse.de - -- ... as only the systemd-analyze completion depends on - bash-completion I prefere a without which has to be defined - for SLES 12 - -------------------------------------------------------------------- -Sun Feb 9 11:21:07 UTC 2014 - coolo@suse.com - -- avoid bootstrap cycle with libusb and systemd-mini - -------------------------------------------------------------------- -Sat Feb 8 06:12:55 UTC 2014 - coolo@suse.com - -- split bash-completion support into its own package, - no need for sles_version - -------------------------------------------------------------------- -Fri Feb 7 13:02:28 UTC 2014 - werner@suse.de - -- Split off systemd-rpm-macros as a separate package to avoid - a rebuild of all packages due new systemd package -- Define a sles_version 12 for suse_version 1315 - -------------------------------------------------------------------- -Wed Feb 5 11:19:28 UTC 2014 - werner@suse.de - -- Change and extend patch - 0001-On_s390_con3270_disable_ANSI_colour_esc.patch - to disable the workaround to find /dev/3270/tty1 as this now - should be done by a) the kernel patch - http://lkml.indiana.edu/hypermail/linux/kernel/1402.0/02319.html - and the changed udev rule 99-systemd.rules - -------------------------------------------------------------------- -Sun Feb 2 08:53:17 UTC 2014 - ohering@suse.com - -- Remove PreReq pidof from udev, nothing in this pkg uses it - -------------------------------------------------------------------- -Fri Jan 31 14:24:35 UTC 2014 - werner@suse.de - -- Change and extend patch - 0001-On_s390_con3270_disable_ANSI_colour_esc.patch - to re-enable colouring if 3270 console was enforced on the kernel - command line as 3270 cna handle colour ANSI escape sequences. - Also let the serial getty generator find the /dev/3270/tty1 - character device (bnc#861316) - -------------------------------------------------------------------- -Thu Jan 30 12:33:08 UTC 2014 - werner@suse.de - -- Add patch 0001-On_s390_con3270_disable_ANSI_colour_esc.patch - to strip the colouring ANSI escape sequences from the console - messages (bnc#860937) - -------------------------------------------------------------------- -Thu Jan 30 08:29:00 UTC 2014 - werner@suse.de - -- Change patch 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch - to skip already by the kernel managed devices - -------------------------------------------------------------------- -Wed Jan 29 18:03:39 UTC 2014 - arvidjaar@gmail.com - -- fix timeout stopping user@.service (bnc#841544) - * 0001-core-introduce-new-KillMode-mixed-which-sends-SIGTER.patch - * 0002-service-allow-KillMode-mixed-in-conjunction-with-PAM.patch - * 0003-core-make-sure-to-always-go-through-both-SIGTERM-and.patch - -------------------------------------------------------------------- -Tue Jan 28 12:44:07 UTC 2014 - werner@suse.de - -- Add patch 0001-upstream-systemctl-halt-reboot-error-handling.patch - to be able to detect if the sysctl reboot() returns. -- Add patch 0001-add-hdflush-for-reboot-or-hddown-for-poweroff.patch - A check for unmaintained disk like devices is added to be able to - flush and maybe shut them down. Also the missing sync() system - call is added for the direct halt/reboot systemctl command. Then - the system halt is used as fallback if poweroff fails for both - the direct poweroff systemctl command as well as for the - systemd-shutdown utility. - -------------------------------------------------------------------- -Thu Jan 23 13:24:53 UTC 2014 - werner@suse.de - -- Make systemd-mini build - -------------------------------------------------------------------- -Thu Jan 23 13:18:39 UTC 2014 - werner@suse.de - -- Make requires bash-completion a recommends - -------------------------------------------------------------------- -Tue Jan 21 13:05:59 UTC 2014 - werner@suse.de - -- Add patch 1017-skip-native-unit-handling-if-sysv-already-handled.patch - to avoid that enabled boot scripts will be handled as unit files - by systemctl status command (bnc#818044) - -------------------------------------------------------------------- -Tue Jan 21 12:51:20 UTC 2014 - werner@suse.de - -- Drop patch 1017-enforce-sufficient-shutdown-warnings.patch - as the original code behaves exactly as the shutdown code of - the old SysVinit (bnc#750845) -- Rename support-powerfail-with-powerstatus.patch to - 1016-support-powerfail-with-powerstatus.patch - -------------------------------------------------------------------- -Mon Jan 20 10:18:20 UTC 2014 - fcrozat@suse.com - -- Add analyze-fix-crash-in-command-line-parsing.patch: fix crash in - systemd-analyze (bnc#859365) - -------------------------------------------------------------------- -Fri Jan 17 16:09:24 UTC 2014 - werner@suse.de - -- Add patch - 1019-make-completion-smart-to-be-able-to-redirect.patch - to make redirections work with the bash command completions for - for systemd command tools (bnc#856858, bnc#859072) - -------------------------------------------------------------------- -Fri Jan 17 12:24:13 UTC 2014 - werner@suse.de - -- Add patch - 1018-Make-LSB-Skripts-know-about-Required-and-Should.patch - to support the "+" to tag wanted dependencies as well as make - sure that required dependencies are handles as required ones. - This should fix bnc#858864 and bnc#857204. - -------------------------------------------------------------------- -Thu Jan 16 16:08:00 UTC 2014 - lnussel@suse.de - -- apply preset also to service files that are new in upgrade - -------------------------------------------------------------------- -Wed Jan 15 14:11:02 UTC 2014 - werner@suse.de - -- Change support-powerfail-with-powerstatus.patch to use BindsTo - instead of BindTo - -------------------------------------------------------------------- -Wed Jan 15 12:34:53 UTC 2014 - werner@suse.de - -- Add patch 1017-enforce-sufficient-shutdown-warnings.patch - Warn once per hour in the last 3 hours, then all 30 minutes in last - hour, all 15 minutes in the last 45 minutes, all 10 minutes in the - last 15 minutes, and then all minute in the last 10 minutes (bnc#750845) - -------------------------------------------------------------------- -Tue Jan 14 18:28:09 UTC 2014 - werner@suse.de - -- Add patch support-powerfail-with-powerstatus.patch and source - file systemd-powerfail to implement SIGPWR support with evaluation - of the file /var/run/powerstatus (bnc#737690) - -------------------------------------------------------------------- -Fri Dec 20 12:06:18 UTC 2013 - werner@suse.de - -- Adapt patch - 1011-check-4-valid-kmsg-device.patch - to fit current upstream version maybe related to bnc#854884 -- Change patch - 1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch - to check if XDG_RUNTIME_DIR is set before the call of pam_putenv() - may fix bnc#855160 - -------------------------------------------------------------------- -Fri Dec 20 09:40:01 UTC 2013 - lbsousajr@gmail.com - -- Disable multi-seat-x build, since package xorg-x11-server - currently in Factory no longer needs it. - -------------------------------------------------------------------- -Wed Dec 18 18:56:01 UTC 2013 - hrvoje.senjan@gmail.com - -- Added 0001-logind-garbage-collect-stale-users.patch: Don't stop a - running user manager from garbage-collecting the user. Original - behavior caused bnc#849870 - -------------------------------------------------------------------- -Mon Dec 16 11:08:33 UTC 2013 - lbsousajr@gmail.com - -- Add build-sys-make-multi-seat-x-optional.patch - * See: http://cgit.freedesktop.org/systemd/systemd/commit/?id=bd441fa27a22b7c6e11d9330560e0622fb69f297 - * Now systemd-multi-seat-x build can be disabled with configure option - --disable-multi-seat-x. It should be done when xorg-x11-server - no longer needs it (work in progress). - -------------------------------------------------------------------- -Mon Dec 16 09:43:29 UTC 2013 - fcrozat@suse.com - -- Update insserv-generator.patch: fix crash in insserv generator - (bnc#854314). -- Update apply-ACL-for-nvidia-device-nodes.patch with latest fixes - for Nvidia cards (bnc#808319). - -------------------------------------------------------------------- -Fri Dec 6 13:30:19 UTC 2013 - werner@suse.de - -- Add patch - 1014-journald-with-journaling-FS.patch - which now uses the file system ioctls for switching off atime, - compression, and copy-on-write of the journal directory of the - the systemd-journald (bnc#838475) -- Let us build require the package config for libpcre (bnc#853293) - -------------------------------------------------------------------- -Sat Nov 30 08:16:02 UTC 2013 - arvidjaar@gmail.com - -- Add patch - 0001-core-replace-OnFailureIsolate-setting-by-a-more-gene.patch - Make sure emergency shell is not killed by attempt to start another unit - (bnc#852021). Backported from d420282b28f50720e233ccb1c02547c562195653. -- Add patch - make-emergency.service-conflict-with-syslog.socket.patch - Previous patch did not fix problem if syslog connection request came - after emergency shell was already started. So forcibly stop syslog.socket - when starting emergency.service. (bnc#852232) - -------------------------------------------------------------------- -Thu Nov 28 10:25:58 UTC 2013 - lbsousajr@gmail.com - -- Add U_logind_revert_lazy_session_activation_on_non_vt_seats.patch - * See: http://cgit.freedesktop.org/systemd/systemd/commit/?id=3fdb2494c1e24c0a020f5b54022d2c751fd26f50 - -------------------------------------------------------------------- -Tue Nov 26 15:12:58 UTC 2013 - werner@suse.de - -- Add patch - 1012-pam_systemd_do_override_XDG_RUNTIME_DIR_of_the_original_user.patch - to avoid (xdg-)su to set XDG_RUNTIME_DIR to the original user and - avoid that e.g. pulseaudio will create /run/user//pulse owned - by root (bnc#852015) - -------------------------------------------------------------------- -Thu Nov 21 12:27:11 UTC 2013 - werner@suse.de - -- Add patch - 1011-check-4-valid-kmsg-device.patch - to avoid a busy systemd-journald (bnc#851393) - -------------------------------------------------------------------- -Wed Nov 6 09:42:05 UTC 2013 - werner@suse.de - -- Add patch - 1010-do-not-install-sulogin-unit-with-poweroff.patch - that is do not install console-shell.service in any system target - as this will cause automatic poweroff at boot (bnc#849071) - -------------------------------------------------------------------- -Mon Nov 4 15:23:02 UTC 2013 - werner@suse.de - -- Add upstream patch - 0001-analyze-set-text-on-side-with-most-space.patch - to place the text on the side with most space - -------------------------------------------------------------------- -Fri Oct 25 12:12:48 UTC 2013 - werner@suse.de - -- Add upstream patch - 0001-analyze-set-white-background.patch - to make SVG output of systemd analyze readable - -------------------------------------------------------------------- -Mon Oct 21 09:27:36 UTC 2013 - werner@suse.de - -- Add patch - 1009-make-xsltproc-use-correct-ROFF-links.patch - to have valid ROFF links in manual pages working again (bnc#842844) - -------------------------------------------------------------------- -Tue Oct 15 13:50:52 CEST 2013 - fcrozat@suse.com - -- Add - 0001-gpt-auto-generator-exit-immediately-if-in-container.patch: - don't start gpt auto-generator in container (git). -- Add - 0001-manager-when-verifying-whether-clients-may-change-en.patch: - fix reload check in selinux case (git). -- Add 0001-logind-fix-bus-introspection-data-for-TakeControl.patch: - fix introspection for TakeControl (git). -- Add 0001-mount-check-for-NULL-before-reading-pm-what.patch: fix - crash when parsing some incorrect unit (git). -- Add - 0001-shared-util-fix-off-by-one-error-in-tag_to_udev_node.patch: - Fix udev rules parsing (git). -- Add - 0001-systemd-serialize-deserialize-forbid_restart-value.patch: - Fix incorrect deserialization for forbid_restart (git). -- Add - 0001-core-unify-the-way-we-denote-serialization-attribute.patch: - Ensure forbid_restart is named like other attributes (git). -- Add 0001-journald-fix-minor-memory-leak.patch: fix memleak in - journald (git). -- Add - 0001-do-not-accept-garbage-from-acpi-firmware-performance.patch: - Improve ACPI firmware performance parsing (git). -- Add - 0001-journald-remove-rotated-file-from-hashmap-when-rotat.patch: - Fix journal rotation (git). -- Add - 0001-login-fix-invalid-free-in-sd_session_get_vt.patch: - Fix memory corruption in sd_session_get_vt (git). -- Add 0001-login-make-sd_session_get_vt-actually-work.patch: Ensure - sd_session_get_vt returns correct value (git). -- Add 0001-Never-call-qsort-on-potentially-NULL-arrays.patch: Don't - call qsort on NULL arrays (git). -- Add 0001-dbus-common-avoid-leak-in-error-path.patch: Fix memleak - in dbus-common code (git). -- Add 0001-drop-ins-check-return-value.patch: Fix return value for - drop-ins checks (git). -- Add 0001-shared-util-Fix-glob_extend-argument.patch: Fix - glob_extend argument (git). -- Add 0001-Fix-bad-assert-in-show_pid_array.patch: Fix bad assert - in show_pid_array (git). - - -------------------------------------------------------------------- -Thu Oct 3 08:43:51 UTC 2013 - fcrozat@suse.com - -- Add 0001-acpi-fptd-fix-memory-leak-in-acpi_get_boot_usec.patch: - fix acpi memleak. -- Add - 0002-fix-lingering-references-to-var-lib-backlight-random.patch: - fix invalid path in documentation. -- Add - 0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch: - fix invalid memory free. -- Add 0004-systemctl-fix-name-mangling-for-sysv-units.patch: fix - name mangling for sysv units. -- Add - 0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch: - fix OOM handling. -- Add 0006-journald-add-missing-error-check.patch: add missing - error check. -- Add 0007-bus-fix-potentially-uninitialized-memory-access.patch: - fix uninitialized memory access. -- Add 0008-dbus-fix-return-value-of-dispatch_rqueue.patch: fix - return value. -- Add 0009-modules-load-fix-error-handling.patch: fix error - handling. -- Add 0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch: - fix incorrect memory access. -- Add 0011-strv-don-t-access-potentially-NULL-string-arrays.patch: - fix incorrect memory access. -- Add - 0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch: - fix invalid pointer. -- Add - 0014-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch: - fix permission on /run/log/journal. -- Add - 0001-systemd-order-remote-mounts-from-mountinfo-before-re.patch: - order remote mount points properly before remote-fs.target. - -------------------------------------------------------------------- -Wed Oct 2 14:10:41 UTC 2013 - hrvoje.senjan@gmail.com - -- Explicitly require pam-config for %post of the main package - -------------------------------------------------------------------- -Wed Oct 2 08:03:30 UTC 2013 - fcrozat@suse.com - -- Release v208: - + logind gained support for facilitating privileged input and drm - devices access for unprivileged clients (helps Wayland / - kmscon). - + New kernel command line luks.options= allows to specify LUKS - options, when used with luks.uuid= - + tmpfileS.d snippets can uses specifier expansion in path names - (%m, %b, %H, %v). - + New tmpfiles.d command "m" introduced to change - owner/group/access mode of a file/directory only if it exists. - + MemorySoftLimit= cgroup settings is no longer supported - (underlying kernel cgroup attribute will disappear in the - future). - + memeory.use_hierarchy cgroup attribute is enabled for all - cgroups systemd creates in memory cgroup hierarchy. - + New filed _SYSTEMD_SLICE= is logged in journal messages related - to a slice. - + systemd-journald will no longer adjust the group of journal - files it creates to "systemd-journal" group. Permissions and - owernship is adjusted when package is upgraded. - + Backlight and random seed files are now stored in - /var/lib/systemd. - + Boot time performance measurements included ACPI 5.0 FPDT - informations if available. -- Drop merged patches: - 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch, - 0002-cgroup-correct-the-log-information.patch, - 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch, - 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch, - 0005-core-cgroup-first-print-then-free.patch, - 0006-swap-fix-reverse-dependencies.patch, - 0008-swap-create-.wants-symlink-to-auto-swap-devices.patch, - 0009-polkit-Avoid-race-condition-in-scraping-proc.patch, - Fix-timeout-when-stopping-Type-notify-service.patch, - set-ignoreonisolate-noauto-cryptsetup.patch, - 0001-Fix-buffer-overrun-when-enumerating-files.patch, - 0007-libudev-fix-move_later-comparison.patch. -- Refresh patches - remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch, - delay-fsck-cryptsetup-after-md-dmraid-lvm-are-started.patch, - handle-root_uses_lang-value-in-etc-sysconfig-language.patch, - handle-SYSTEMCTL_OPTIONS-environment-variable.patch, - Revert-service-drop-support-for-SysV-scripts-for-the-early.patch. -- Own more ghost files. -- Do not run pam-config in systemd-mini %post. -- Add after-local.service to run after.local late during the boot - process (bnc#778715). - -------------------------------------------------------------------- -Tue Oct 1 17:09:01 UTC 2013 - fcrozat@suse.com - -- Update Fix-timeout-when-stopping-Type-notify-service.patch with - upstream fix. -- No longer start ask-password-wall, was causing too much spam on - terminals (bnc#747783). - -------------------------------------------------------------------- -Mon Sep 30 15:42:45 UTC 2013 - fcrozat@suse.com - -- Add set-ignoreonisolate-noauto-cryptsetup.patch: ensure noauto - encrypted mounts survives runlevel changes (bnc#843085). -- Add 0001-Fix-buffer-overrun-when-enumerating-files.patch: fix - logind crash when /run/systemd/sessions was too big (bnc#840055, - initial fix from hpj@suse.com). -- Update sysctl-handle-boot-sysctl.conf-kernel_release.patch to - only check for /boot/sysctl.conf- presence. -- Add service wrapper for after.local (bnc#778715). - -------------------------------------------------------------------- -Fri Sep 27 15:47:15 UTC 2013 - fcrozat@suse.com - -- Update use-usr-sbin-sulogin-for-emergency-service.patch to apply - to all services using sulogin and remove generated files from - upstream tarball (bnc#841398). - -------------------------------------------------------------------- -Mon Sep 23 13:09:06 UTC 2013 - arvidjaar@gmail.com - -- Fix-timeout-when-stopping-Type-notify-service.patch - Make sure MAINPID is watched when it becomes known (bnc#841544) - -------------------------------------------------------------------- -Mon Sep 23 13:11:08 CEST 2013 - fcrozat@suse.com - -- Remove output and error redirection to /dev/null in install - script, it might help tracing pam related issue (bnc#841573). - -------------------------------------------------------------------- -Thu Sep 19 16:37:03 CEST 2013 - fcrozat@suse.com - -- Move symlink migration trigger to post (bnc#821800). - -------------------------------------------------------------------- -Wed Sep 18 23:55:09 UTC 2013 - crrodriguez@opensuse.org - -- 0009-polkit-Avoid-race-condition-in-scraping-proc.patch - VUL-0: polkit: process subject race condition [bnc#835827] - CVE-2013-4288 - -------------------------------------------------------------------- -Wed Sep 18 23:45:54 UTC 2013 - crrodriguez@opensuse.org - -- Build with --disable-ima as the openSUSE kernel - does not support IMA (CONFIG_IMA is not set) - -------------------------------------------------------------------- -Wed Sep 18 23:40:27 UTC 2013 - crrodriguez@opensuse.org - -- Build with --disable-smack as the openSUSE kernel - does not support smack (CONFIG_SECURITY_SMACK is not set) - -------------------------------------------------------------------- -Wed Sep 18 12:05:47 UTC 2013 - fcrozat@suse.com - -- Don't use a trigger to create symlink for sysctl.conf, always run - the test on %post (bnc#840864). -- Update sysctl-handle-boot-sysctl.conf-kernel_release.patch to - ensure /boot is mounted before reading /boot/sysctl.conf-* - (bnc#809420). - -------------------------------------------------------------------- -Mon Sep 16 17:41:24 UTC 2013 - crrodriguez@opensuse.org - -- 0008-swap-create-.wants-symlink-to-auto-swap-devices.patch - really fixes the swap unit problem mentioned in previous - commit & the opensuse-factory mailing list. - -------------------------------------------------------------------- -Sat Sep 14 19:01:24 UTC 2013 - crrodriguez@opensuse.org - -- 0001-cgroup-add-the-missing-setting-of-variable-s-value.patch - missing important check on return value. -- 0002-cgroup-correct-the-log-information.patch fix misleading - log information. -- 0003-cgroup-fix-incorrectly-setting-memory-cgroup.patch fix - setting memory cgroup -- 0004-random-seed-we-should-return-errno-of-failed-loop_wr.patch - should fail if write fails. -- 0005-core-cgroup-first-print-then-free.patch use-after-free - will trigger if there is an error condition. -- 0006-swap-fix-reverse-dependencies.patch reported in - opensuse-factory list, topic "swap isn't activated" -- 0007-libudev-fix-move_later-comparison.patch libudev - invalid usage of "move_later". - -------------------------------------------------------------------- -Sat Sep 14 06:52:32 UTC 2013 - crrodriguez@opensuse.org - -- while testing this new release I get in the logs ocassionally - at boot "systemd[1]: Failed to open private bus connection: - Failed to connect to socket /var/run/dbus/system_bus_socket: - No such file or directory" indeed DBUS_SYSTEM_BUS_DEFAULT_ADDRESS - is defined to /var/run/dbus/system_bus_socket instead of - /run/dbus/system_bus_socket and that does not fly when /var/run - is not yet available. (systemd-dbus-system-bus-address.patch) - -------------------------------------------------------------------- -Fri Sep 13 07:47:40 UTC 2013 - fcrozat@suse.com - -- Enable Predictable Network interface names (bnc#829526). - -------------------------------------------------------------------- -Fri Sep 13 03:14:36 UTC 2013 - crrodriguez@opensuse.org - -- version 207, distribution specific changes follow, for overall - release notes see NEWS. -- Fixed: - * Failed at step PAM spawning /usr/lib/systemd/systemd: - Operation not permitted - * Fix shutdown hang "a stop job is running for Session 1 of user root" - that was reported in opensuse-factory list. -- systemd-sysctl no longer reads /etc/sysctl.conf however backward - compatbility is to be provides by a symlink created at %post. -- removed previously disabled upstream patches (merged): - 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch, - 0004-disable-the-cgroups-release-agent-when-shutting-down.patch, - 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch, - 0006-suppress-status-message-output-at-shutdown-when-quie.patch, -- removed upstream merged patches: - exclude-dev-from-tmpfiles.patch, - logind_update_state_file_after_generating_....patch -- Add systemd-pam_config.patch: use correct include name for PAM - configuration on openSUSE. - -------------------------------------------------------------------- -Mon Sep 9 14:39:46 UTC 2013 - fcrozat@suse.com - -- Add exclude-dev-from-tmpfiles.patch: allow to exclude /dev from - tmpfiles (bnc#835813). - -------------------------------------------------------------------- -Fri Sep 6 15:02:08 UTC 2013 - fcrozat@suse.com - -- Remove - force-lvm-restart-after-cryptsetup-target-is-reached.patch and - remove additional dependencies on LVM in other patches: LVM has - now systemd support, no need to work around it anymore in - systemd. - -------------------------------------------------------------------- -Wed Aug 21 10:42:35 UTC 2013 - idonmez@suse.com - -- Add patch logind_update_state_file_after_generating_the_session_fifo_not_before.patch - to fix https://bugs.freedesktop.org/show_bug.cgi?id=67273 - -------------------------------------------------------------------- -Tue Aug 6 09:24:07 UTC 2013 - lnussel@suse.de - -- explicitly enable getty@tty1.service instead of getty@.service as - the tty1 alias has been removed from the file (bnc#833494) - -------------------------------------------------------------------- -Thu Aug 1 15:52:20 UTC 2013 - fcrozat@suse.com - -- Ensure /usr/lib/systemd/system/shutdown.target.wants is created - and owned by systemd package. - -------------------------------------------------------------------- -Mon Jul 29 14:01:48 UTC 2013 - fcrozat@suse.com - -- Fix drop-in for getty@tty1.service - -------------------------------------------------------------------- -Thu Jul 25 12:35:29 UTC 2013 - fcrozat@suse.com - -- Move systemd-journal-gateway to subpackage to lower dependencies - in default install. - -------------------------------------------------------------------- -Tue Jul 23 01:32:38 UTC 2013 - crrodriguez@opensuse.org - -- version 206 , highlights: -* Unit files now understand the new %v specifier which - resolves to the kernel version string as returned by "uname-r". -* "journalctl -b" may now be used to look for boot output of a - specific boot. Try "journalctl -b -1" -* Creation of "dead" device nodes has been moved from udev - into kmod and tmpfiles. -* The udev "keymap" data files and tools to apply keyboard - specific mappings of scan to key codes, and force-release - scan code lists have been entirely replaced by a udev - "keyboard" builtin and a hwdb data file. - -- remove patches now in upstream -- systemd now requires libkmod >=14 and cryptsetup >= 1.6.0 -- systemd now require the kmod tool in addition to the library. - -------------------------------------------------------------------- -Sun Jul 14 05:25:51 UTC 2013 - arvidjaar@gmail.com - -- use-usr-sbin-sulogin-for-emergency-service.patch - emergency.service failed to start because sulogin is in /usr/sbin now - -------------------------------------------------------------------- -Fri Jul 12 17:09:23 CEST 2013 - mls@suse.de - -- fix build with rpm-4.11.1: /etc/xdg/system/user is a symlink, - not a directory - -------------------------------------------------------------------- -Fri Jul 5 02:17:19 UTC 2013 - crrodriguez@opensuse.org - -- 0002-core-mount.c-mount_dump-don-t-segfault-if-mount-is-n.patch - fix segfault at shutdown -- 0004-disable-the-cgroups-release-agent-when-shutting-down.patch - disable the cgroups release agent when shutting down. -- 0005-cgroups-agent-remove-ancient-fallback-code-turn-conn.patch - remove ancient fallback code; turn connection error into warning -- 006-suppress-status-message-output-at-shutdown-when-quie.patch - make shutdown honour "quiet" kernel cmdline. - -------------------------------------------------------------------- -Fri Jul 5 02:09:55 UTC 2013 - crrodriguez@opensuse.org - -- fix broken symlink, service is called systemd-random-seed now. - -------------------------------------------------------------------- -Thu Jul 4 10:20:23 CEST 2013 - fcrozat@suse.com - -- Update to release 205: - + two new unit types have been introduced: - - Scope units are very similar to service units, however, are - created out of pre-existing processes -- instead of PID 1 - forking off the processes. - - Slice units may be used to partition system resources in an - hierarchial fashion and then assign other units to them. By - default there are now three slices: system.slice (for all - system services), user.slice (for all user sessions), - machine.slice (for VMs and containers). - + new concept of "transient" units, which are created at runtime - using an API and not based on configuration from disk. - + logind has been updated to make use of scope and slice units to - manage user sessions. Logind will no longer create cgroups - hierchies itself but will relying on PID 1. - + A new mini-daemon "systemd-machined" has been added which - may be used by virtualization managers to register local - VMs/containers. machinectl tool has been added to query - meta-data from systemd-machined. - + Low-level cgroup configuration options ControlGroup=, - ControlGroupModify=, ControlGroupPersistent=, - ControlGroupAttribute= have been removed. High-level attribute - settings or slice units should be used instead? - + A new bus call SetUnitProperties() has been added to alter - various runtime parameters of a unit, including cgroup - parameters. systemctl gained set-properties command to wrap - this call. - + A new tool "systemd-run" has been added which can be used to - run arbitrary command lines as transient services or scopes, - while configuring a number of settings via the command - line. - + nspawn will now inform the user explicitly that kernels with - audit enabled break containers, and suggest the user to turn - off audit. - + Support for detecting the IMA and AppArmor security - frameworks with ConditionSecurity= has been added. - + journalctl gained a new "-k" switch for showing only kernel - messages, mimicking dmesg output; in addition to "--user" - and "--system" switches for showing only user's own logs - and system logs. - + systemd-delta can now show information about drop-in - snippets extending unit files. - + systemd will now look for the "debug" argument on the kernel - command line and enable debug logging, similar to - "systemd.log_level=debug" already did before. - + "systemctl set-default", "systemctl get-default" has been - added to configure the default.target symlink, which - controls what to boot into by default. - + "systemctl set-log-level" has been added as a convenient - way to raise and lower systemd logging threshold. - + "systemd-analyze plot" will now show the time the various - generators needed for execution, as well as information - about the unit file loading. - + libsystemd-journal gained a new sd_journal_open_files() call - for opening specific journal files. journactl also gained a - new switch to expose this new functionality (useful for - debugging). - + systemd gained the new DefaultEnvironment= setting in - /etc/systemd/system.conf to set environment variables for - all services. - + If a privileged process logs a journal message with the - OBJECT_PID= field set, then journald will automatically - augment this with additional OBJECT_UID=, OBJECT_GID=, - OBJECT_COMM=, OBJECT_EXE=, ... fields. This is useful if - system services want to log events about specific client - processes. journactl/systemctl has been updated to make use - of this information if all log messages regarding a specific - unit is requested. -- Remove 0001-journal-letting-interleaved-seqnums-go.patch, - 0002-journal-remember-last-direction-of-search-and-keep-o.patch, - 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch, - 0006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch, - 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch, - 0160-mount-when-learning-about-the-root-mount-from-mounti.patch, - 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch, - Start-ctrl-alt-del.target-irreversibly.patch, - systemctl-does-not-expand-u-so-revert-back-to-I.patch: merged - upstream. -- Regenerate patches 1007-physical-hotplug-cpu-and-memory.patch, - 1008-add-msft-compability-rules.patch, - Revert-service-drop-support-for-SysV-scripts-for-the-early.patch, - fix-support-for-boot-prefixed-initscript-bnc-746506.patch, - handle-SYSTEMCTL_OPTIONS-environment-variable.patch, - handle-numlock-value-in-etc-sysconfig-keyboard.patch, - insserv-generator.patch, - optionally-warn-if-nss-myhostname-is-called.patch, - remain_after_exit-initscript-heuristic-and-add-new-LSB-hea.patch, - restore-var-run-and-var-lock-bind-mount-if-they-aren-t-sym.patch, - service-flags-sysv-service-with-detected-pid-as-RemainAfte.patch. -- Update macros.systemd.upstream with latest upstream revision. - -------------------------------------------------------------------- -Mon Jul 1 13:43:31 UTC 2013 - fcrozat@suse.com - -- Replace - parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch - patch with insserv-generator.patch: no longer patch systemd main - binary but generate systemd drop-in files using a generator, for - insserv.conf compatibility. - -------------------------------------------------------------------- -Mon Jul 1 09:14:55 UTC 2013 - coolo@suse.com - -- systemd-mini doesn't need dbus-1, only dbus-1-devel - -------------------------------------------------------------------- -Wed Jun 26 09:31:14 UTC 2013 - rmilasan@suse.com - -- Re-add fixed udev MSFT compability rules (bnc#805059, bnc#826528). - add: 1008-add-msft-compability-rules.patch - -------------------------------------------------------------------- -Wed Jun 26 08:51:29 UTC 2013 - rmilasan@suse.com - -- Drop 1007-add-msft-compability-rules.patch, breaks boot and links - in /dev/disk/by-id, will need proper rework (bnc#826528). - -------------------------------------------------------------------- -Mon Jun 24 00:15:24 UTC 2013 - crrodriguez@opensuse.org - -- 0160-mount-when-learning-about-the-root-mount-from-mounti.patch Another - case where we are trying to umount the root directory at shutdown. -- 0185-core-only-attempt-to-connect-to-a-session-bus-if-one.patch - only attempt to connect to a session bus if one likely exists - -------------------------------------------------------------------- -Fri Jun 21 12:40:27 UTC 2013 - rmilasan@suse.com - -- Automatically online CPUs/Memory on CPU/Memory hotplug add events - (bnc#703100, fate#311831). - add: 1008-physical-hotplug-cpu-and-memory.patch - -------------------------------------------------------------------- -Wed Jun 19 08:44:06 UTC 2013 - mhrusecky@suse.com - -- Dropped backward compatibility -- Added check for upstream rpm macros changes - -------------------------------------------------------------------- -Mon Jun 18 12:13:25 UTC 2013 - mhrusecky@suse.com - -- Split out RPM macros into separate package to simplify dependencies - -------------------------------------------------------------------- -Tue Jun 18 00:33:10 UTC 2013 - crrodriguez@opensuse.org - -- 0001-journal-letting-interleaved-seqnums-go.patch and - 0002-journal-remember-last-direction-of-search-and-keep-o.patch - fix possible infinite loops in the journal code, related to - bnc #817778 - -------------------------------------------------------------------- -Sun Jun 16 23:59:28 UTC 2013 - jengelh@inai.de - -- Explicitly list libattr-devel as BuildRequires -- More robust make install call. Remove redundant %clean section. - -------------------------------------------------------------------- -Thu Jun 13 16:00:25 CEST 2013 - sbrabec@suse.cz - -- Cleanup NumLock setting code - (handle-numlock-value-in-etc-sysconfig-keyboard.patch). - -------------------------------------------------------------------- -Wed Jun 12 10:00:53 UTC 2013 - fcrozat@suse.com - -- Only apply 1007-add-msft-compability-rules.patch when not - building systemd-mini. - -------------------------------------------------------------------- -Tue Jun 11 11:01:46 UTC 2013 - rmilasan@suse.com - -- Add udev MSFT compability rules (bnc#805059). - add: 1007-add-msft-compability-rules.patch -- Add sg3_utils requires, need it by 61-msft.rules (bnc#805059). -- Clean-up spec file, put udev patches after systemd patches. -- Rebase patches so they would apply nicely. - -------------------------------------------------------------------- -Tue Jun 11 02:29:49 UTC 2013 - crrodriguez@opensuse.org - -- 0004-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch - fixes : - * systemd-journald[347]: Failed to set ACL on - /var/log/journal/11d90b1c0239b5b2e38ed54f513722e3/user-1000.journal, - ignoring: Invalid argument -- 006-systemctl-core-allow-nuking-of-symlinks-to-removed-u.patch - systemctl disable should remove dangling symlinks. -- 0008-service-don-t-report-alien-child-as-alive-when-it-s-.patch - alien childs are reported as alive when they are really dead. - -------------------------------------------------------------------- -Wed May 29 10:44:11 CEST 2013 - fcrozat@suse.com - -- Update to release 204: - + systemd-nspawn creates etc/resolv.conf in container if needed. - + systemd-nspawn will store metadata about container in container - cgroup including its root directory. - + cgroup hierarchy has been reworked, all objects are now suffxed - (with .session for user sessions, .user for users, .nspawn for - containers). All cgroup names are now escaped to preven - collision of object names. - + systemctl list-dependencies gained --plain, --reverse, --after - and --before switches. - + systemd-inhibit shows processes name taking inhibitor lock. - + nss-myhostname will now resolve "localhost" implicitly. - + .include is not allowed recursively anymore and only in unit - files. Drop-in files should be favored in most cases. - + systemd-analyze gained "critical-chain" command, to get slowest - chain of units run during boot-up. - + systemd-nspawn@.service has been added to easily run nspawn - container for system services. Just start - "systemd-nspawn@foobar.service" and container from - /var/lib/container/foobar" will be booted. - + systemd-cgls has new --machine parameter to list processes from - one container. - + ConditionSecurity= can now check for apparmor and SMACK. - + /etc/systemd/sleep.conf has been introduced to configure which - kernel operation will be execute when "suspend", "hibernate" or - "hybrid-sleep" is requrested. It allow new kernel "freeze" - state to be used too. (This setting won't have any effect if - pm-utils is installed). - + ENV{SYSTEMD_WANTS} in udev rules will now implicitly escape - passed argument if applicable. -- Regenerate some patches for this new release. -- Rename hostname-setup-shortname.patch to - ensure-shortname-is-set-as-hostname-bnc-820213.patch to be git - format-patch friendly. -- Update apply-ACL-for-nvidia-device-nodes.patch to apply ACL to - /dev/nvidia* (bnc#808319). -- Remove Ensure-debugshell-has-a-correct-value.patch, doable with a - configure option. -- Add systemctl-does-not-expand-u-so-revert-back-to-I.patch: avoids - expansion errors. -- Add Start-ctrl-alt-del.target-irreversibly.patch: ctrl-alt-del - should be irreversible for reliability. - -------------------------------------------------------------------- -Tue May 28 03:24:39 UTC 2013 - crrodriguez@opensuse.org - -- Drop Add-bootsplash-handling-for-password-dialogs.patch bootsplash -support has been removed from the kernel. -- Drop ensure-systemd-udevd-is-started-before-local-fs-pre-for-lo.patch -fixed in systemd v199, commit 89d09e1b5c65a2d97840f682e0932c8bb499f166 -- Apply rules-add-lid-switch-of-ARM-based-Chromebook-as-a-power-sw.patch -only on ARM, patch rejected upstream because is too generic. -- no such define TARGET_SUSE exists but it is used in -Revert-service-drop-support-for-SysV-scripts-for-the-early.patch -use HAVE_SYSV_COMPAT instead. - -------------------------------------------------------------------- -Fri May 24 11:37:49 UTC 2013 - fcrozat@suse.com - -- Do no ship defaults for sysctl, they should be part of aaa_base - (currently in procps). -- Add hostname-setup-shortname.patch: ensure shortname is set as - hostname (bnc#820213). - -------------------------------------------------------------------- -Fri May 17 15:53:33 UTC 2013 - fcrozat@suse.com - -- Rebase - parse-etc-insserv.conf-and-adds-dependencies-accordingly.patch to - fix memory corruption (thanks to Michal Vyskocil) (bnc#820454). - -------------------------------------------------------------------- -Fri May 17 11:46:02 UTC 2013 - fcrozat@suse.com - -- Add sysctl-handle-boot-sysctl.conf-kernel_release.patch: ensure - /boot/sysctl.conf- is handled (bnc#809420). - -------------------------------------------------------------------- -Wed May 15 13:02:05 UTC 2013 - fcrozat@suse.com - -- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch: don't - free variable whose content is still be used (bnc#819970). - -------------------------------------------------------------------- -Tue May 14 14:22:05 UTC 2013 - fcrozat@suse.com - -- Add configure flags to ensure boot.local/halt.local are run on - startup/shutdown. - -------------------------------------------------------------------- -Mon May 13 18:08:41 UTC 2013 - rmilasan@suse.com - -- Fix firmware loading by enabling --with-firmware-path (bnc#817551). - -------------------------------------------------------------------- -Mon Apr 29 14:50:37 UTC 2013 - dschung@cs.uni-kl.de - -- Fix systemd-sysv-convert, so empty runlevel folders don't lead - to "line 44: [: too many arguments" - -------------------------------------------------------------------- -Fri Apr 26 16:37:28 CEST 2013 - fcrozat@suse.com - -- Fix handle-etc-HOSTNAME.patch to properly set hostname at startup - when using /etc/HOSTNAME. - -------------------------------------------------------------------- -Thu Apr 25 08:19:30 UTC 2013 - rmilasan@suse.com - -- Rename remaning udev patches (clean-up). -- Generate %{_libexecdir}/modules-load.d/sg.conf so we load sg module at - boot time not from udev (bnc#761109). -- Drop unused patches: - 1001-Reinstate-TIMEOUT-handling.patch - 1005-udev-fix-sg-autoload-regression.patch - 1026-re-add-persistent-net.patch - -------------------------------------------------------------------- -Tue Apr 23 14:58:47 CEST 2013 - fcrozat@suse.com - -- Use drop-in file to fix bnc#804158. - -------------------------------------------------------------------- -Tue Apr 23 12:44:16 UTC 2013 - coolo@suse.com - -- add some more conflicts to make bootstrap work - -------------------------------------------------------------------- -Mon Apr 22 09:48:22 UTC 2013 - fcrozat@suse.com - -- Do not provide %{release} for systemd-analyze -- Add more conflicts to -mini packages -- Disable Predictable Network interface names until it has been - reviewed by network team, with /usr/lib/tmpfiles.d/network.conf. -- Don't package /usr/lib/firmware/update (not used) - -------------------------------------------------------------------- -Sun Apr 21 22:24:15 UTC 2013 - crrodriguez@opensuse.org - -- Fix packaging error, there is no syslog.target anymore - do not pretend there is one. - -------------------------------------------------------------------- -Fri Apr 19 16:40:17 UTC 2013 - fcrozat@suse.com - -- Update to release 202: - + 'systemctl list-jobs' got some polishing. '--type=' argument - may now be passed more than once. 'systemctl list-sockets' has - been added. - + systemd gained a new unit 'systemd-static-nodes.service' - that generates static device nodes earlier during boot, and - can run in conjunction with udev. - + systemd-nspawn now places all containers in the new /machine - top-level cgroup directory in the name=systemd hierarchy. - + bootchart can now store its data in the journal. - + journactl can now take multiple --unit= and --user-unit= - switches. - + The cryptsetup logic now understands the "luks.key=" kernel - line switch. If a configured key file is missing, it - will fallback to prompting the user. -- Rebase some patches -- Update handle-SYSTEMCTL_OPTIONS-environment-variable.patch to - properly handle SYSTEMCTL_OPTIONS - -------------------------------------------------------------------- -Fri Apr 19 12:47:13 UTC 2013 - max@suse.com - -- Fix regression in the default for tmp auto-deletion - (systemd-tmp-safe-defaults.patch, FATE#314974). - -------------------------------------------------------------------- -Fri Apr 12 16:58:31 UTC 2013 - fcrozat@suse.com - -- Update to release 201: - + udev now supports different nameng policies for network - interface for predictable names. - + udev gained support for loading additional device properties - from an indexed database. %udev_hwdb_update macro should be - used by packages adding entries to this database. - + Journal gained support for "Message Catalog", indexed database - to link up additional information with journal entries. - %journal_catalog_update macro should be used by packages adding - %entries to this database. - + "age" field for tmpfiles entries can be set to 0, forcing - removal of files matching this entry. - + coredumpctl gained "gdb" verb to invoke gdb on selected - coredump. - + New rpm macros has been added: %udev_rules_update(), - %_udevhwdbdir, %_udevrulesdir, %_journalcatalogdir, - %_tmpfilesdir, %_sysctldir. - + In service files, %U can be used for configured user name of - the service. - + nspawn can be invoked without a controlling TTY. - + systemd and nspawn can accept socket file descriptors when - started for socket activation. This allow socket activated - nspawn containers. - + logind can now automatically suspend/hibernate/shutdown system - on idle. - + ConditionACPower can be used in unit file to detect if AC power - source is connected or if system is on battery power. - + EnvironmentFile= in unit files supports file globbing. - + Behaviour of PrivateTmp=, ReadWriteDirectories=, - ReadOnlyDirectories= and InaccessibleDirectories= has - changed. The private /tmp and /var/tmp directories are now - shared by all processes of a service (which means - ExecStartPre= may now leave data in /tmp that ExecStart= of - the same service can still access). When a service is - stopped its temporary directories are immediately deleted - (normal clean-up with tmpfiles is still done in addition to - this though). - + Resource limits (as exposed by cgroup controlers) can be - controlled dynamically at runtime for all units, using - "systemctl set-cgroup-attr foobar.server cgroup.attribute - value". Those settings are stored persistenly on disk. - + systemd-vconsole-setup will now copy all fonts settings to all - allocated VTs. - + timedated now exposes CanNTP property to indicate if a local - NTP service is available. - + pstore file system is mounted by default, if available. - + SMACK policies are loaded at early boot, if available. - + Timer units now support calendar time events. - + systemd-detect-virt detect xen PVs. - + Some distributions specific LSB targets has been dropped: - $x-display-manager, $mail-transfer-agent, - $mail-transport-agent, $mail-transfer-agent, $smtp, $null. As - well mail-transfer-agent.target and syslog.target has been - removed. - + systemd-journal-gatewayd gained SSL support and now runs as - unprivileged user/group - "systemd-journal-gateway:systemd-journal-gateway" - + systemd-analyze will read, when available, boot time - performance from EFI variable from boot loader supporting it. - + A new generator for automatically mounting EFI System Partition - (ESP) to /boot (if empty and no other file system has been - configured in fstab for it). - + logind will now send out PrepareForSleep(false) out - unconditionally, after coming back from suspend. - + tmpfiles gained a new "X" line type, that allows - configuration of files and directories (with wildcards) that - shall be excluded from automatic cleanup ("aging"). - + udev default rules set the device node permissions now only - at "add" events, and do not change them any longer with a - later "change" event. - + A new bootctl tool has been added that is an interface for - certain EFI boot loader operations. - + A new tool kernel-install has been added to install kernel - images according to Boot Loader Specification. - + A new tool systemd-activate can be used to test socket - activation. - + A new group "systemd-journal" is now owning journal files, - replacing "adm" group. - + journalctl gained "--reverse" to show output in reverse order, - "--pager-end" to jump at the end of the journal in the - pager (only less is supported) and "--user-unit" to filter for - user units. - + New unit files has been addedto ease for systemd usage in - initrd. - + "systemctl start" now supports "--irreversible" to queue - operations which can be reserved. It is now used to make - shutdown requests more robust. - + Auke Kok's bootchart has been merged and relicensed to - LGPLv2.1+. - + nss-myhostname has been merged in systemd codebase. - + some defaults sysctl values are now set by default: the safe - sysrq options are turned on, IP route verification is turned - on, and source routing disabled. The recently added hardlink - and softlink protection of the kernel is turned on. - + Add support for predictable network naming logic. It can be - turned off with kernel command line switch: net.ifnames=0 - + journald will now explicitly flush journal files to disk at the - latest 5 min after each write and will mark file offline until - next read. This should increase reliability in case of crash. - + remote-fs-setup.target target has been added to pull in - specific services when at least one remote file system is to be - mounted. - + timers.target and paths.target have been added as canonical - targets to pull user timer and path units, similar to - sockets.targets. - + udev daemon now sets default number of worker processes in - parallel based on number of CPUs instead of RAM. - + Most unit file settings which takes likst of items can now be -reset by assigning empty string to them, using drop-in. - + Add support for drop-in configuration file for units. - + Most unit file settings which takes likst of items can now be - reset by assigning empty string to them, using drop-in. - + improve systemg-cgtop output. - + improve 'systemctl status' output for socket, drop-in for units. - + 'hostnamectl set-hostname' allows setting FQDN hostnames. - + fractional time intervals are now parsed properly. - + localectl can list available X11 keymaps. - + systemd-analyze dot can filter for specific units and has been - rewritten in C. - + systemctl gained "list-dependencies" command. - + Inhibitors are now honored no only in GNOME. -- Many patches has been dropped, being merged upstream. -- Many patches has been renamed and regenerated with git, to have - consistent naming, authorship and comments embedded. -- Add - Revert-service-drop-support-for-SysV-scripts-for-the-early.patch: - re-add support for boot.* initscripts until they are all migrated - to systemd unit files. -- Merge patches for nss-myhostname package to this package. - -------------------------------------------------------------------- -Fri Apr 12 16:17:04 UTC 2013 - rschweikert@suse.com - -- Add chromebook lid switch as a power switch to logind rule to - enable suspend on lid close - -------------------------------------------------------------------- -Mon Apr 8 14:51:47 CEST 2013 - fcrozat@suse.com - -- Add improve-readahead-spinning.patch: improve readahead - performance on spinning media with ext4. -- Add fix-journal-vacuum-logic.patch: fix vacuum logic in journal - (bnc#789589). -- Add fix-lsb-provides.patch: ensure LSB provides are correctly - handled if also referenced as dependencies (bnc#809646). -- Add fix-loopback-mount.patch: ensure udevd is started (and - therefore static devices are created) before mounting - (bnc#809820). -- Update systemd-sysv-convert to search services files in new - location (bnc#809695). -- Add logind-nvidia-acl.diff: set ACL on nvidia devices - (bnc#808319). -- Add do-no-isolate-on-fsck-failure.patch: do not turn off services - if fsck fails (bnc#812874) -- Add wait-for-processes-killed.patch: wait for processes killed by - SIGTERM before killing them with SIGKILL. -- Update systemctl-options.patch to only apply SYSTEMCTL_OPTIONS to - systemctl command (bnc#801878). - -------------------------------------------------------------------- -Tue Apr 2 22:09:42 CEST 2013 - sbrabec@suse.cz - -- Fixed disabling CapsLock and enabling NumLock (bnc#746595, - 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch, - systemd-numlock-suse.patch). -- Explicitly require libgcrypt-devel to fix build failure. - -------------------------------------------------------------------- -Thu Mar 28 09:24:43 UTC 2013 - rmilasan@suse.com - -- udev: ensure that the network interfaces are renamed even if they - exist (bnc#809843). - add: 1027-udev-always-rename-network.patch - -------------------------------------------------------------------- -Wed Mar 20 10:14:59 UTC 2013 - rmilasan@suse.com - -- udev: re-add persistent network rules (bnc#809843). - add: 1026-re-add-persistent-net.patch -- rebase all patches, ensure that they apply properly. - -------------------------------------------------------------------- -Thu Feb 21 14:45:12 UTC 2013 - fcrozat@suse.com - -- Add rbind-mount.patch: handle rbind mount points correctly - (bnc#804575). - -------------------------------------------------------------------- -Tue Feb 19 11:20:31 CET 2013 - fcrozat@suse.com - -- Ensure journal is flushed on disk when systemd-logger is - installed for the first time. -- Add improve-journal-perf.patch: improve journal performance on - query. -- Add support-hybrid-suspend.patch: add support for hybrid suspend. -- Add forward-to-pmutils.patch: forward suspend/hibernation calls - to pm-utils, if installed (bnc#790157). - -------------------------------------------------------------------- -Tue Feb 19 09:51:18 UTC 2013 - rmilasan@suse.com - -- udev: usb_id: parse only 'size' bytes of the 'descriptors' buffer - add: 1024-udev-usb_id-parse-only-size-bytes-of-the-descriptors.patch -- udev: expose new ISO9660 properties from libblkid - add: 1025-udev-expose-new-ISO9660-properties-from-libblkid.patch - -------------------------------------------------------------------- -Mon Feb 18 09:27:05 UTC 2013 - jengelh@inai.de - -- Create getty@tty1.service to restore traditional SUSE behavior - of not clearing tty1. (bnc#804158) -- Better use of find -exec - -------------------------------------------------------------------- -Fri Feb 15 16:04:39 UTC 2013 - fcrozat@suse.com - -- Add early-sync-shutdown.patch: start sync just when - shutdown.target is beginning -- Update parse-multiline-env-file.patch to better handle continuing - lines. -- Add handle-HOSTNAME.patch: handle /etc/HOSTNAME (bnc#803653). -- Add systemctl-print-wall-on-if-successful.patch: only print on - wall if successful. -- Add improve-bash-completion.patch: improve bash completion. - -------------------------------------------------------------------- -Fri Feb 15 13:05:19 UTC 2013 - lnussel@suse.de - -- disable nss-myhostname warning (bnc#783841) - => disable-nss-myhostname-warning-bnc-783841.diff - -------------------------------------------------------------------- -Wed Feb 13 11:34:06 UTC 2013 - rmilasan@suse.com - -- rework patch: - 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch -- udev: use unique names for temporary files created in /dev. - add: 1022-udev-use-unique-names-for-temporary-files-created-in.patch -- cdrom_id: add data track count for bad virtual drive. - add: 1023-cdrom_id-add-data-track-count-for-bad-virtual-drive.patch - -------------------------------------------------------------------- -Tue Feb 12 09:16:23 UTC 2013 - rmilasan@suse.com - -- usb_id: ensure we have a valid serial number as a string (bnc#779493). - add: 1020-usb_id-some-strange-devices-have-a-very-bogus-or-strage-serial.patch -- cdrom_id: created links for the default cd/dvd drive (bnc#783054). - add: 1021-create-default-links-for-primary-cd_dvd-drive.patch - -------------------------------------------------------------------- -Fri Feb 1 16:27:45 UTC 2013 - fcrozat@suse.com - -- Add cryptsetup-accept-read-only.patch: accept "read-only" in - addition to "readonly" in crypttab -- Update parse-multiline-env-file.patch to correctly handle - commented lines (bnc#793411) - -------------------------------------------------------------------- -Tue Jan 29 13:32:30 UTC 2013 - rmilasan@suse.com - -- udev: Fix device matching in the accelerometer - add: 1019-udev-Fix-device-matching-in-the-accelerometer.patch -- keymap: add aditional support for some keyboard keys - add: 1018-keymap-add-aditional-support.patch -- journalctl: require argument for --priority - add: journalctl-require-argument-for-priority -- dropped useless patches: - libudev-validate-argument-udev_enumerate_new.patch - kmod-fix-builtin-typo.patch -- rename udev-root-symlink.service to systemd-udev-root-symlink.service. -- fix in udev package missing link in basic.target.wants for - systemd-udev-root-symlink.service - -------------------------------------------------------------------- -Mon Jan 28 10:49:21 UTC 2013 - fcrozat@suse.com - -- Add tmpfiles-X-type.patch: allow to clean directories with - removing them. -- Add systemd-fix-merge-ignore-dependencies.patch: fix merging with - --ignore-dependencies waiting for dependencies (bnc#800365). -- Update systemd-numlock-suse.patch: udev-trigger.service is now - called systemd-udev-trigger.service. -- Add improve-man-environment.patch: improve manpage regarding - Environment value. - -------------------------------------------------------------------- -Tue Jan 22 17:02:04 UTC 2013 - fcrozat@suse.com - -- Add systemctl-options.patch: handle SYSTEMCTL_OPTIONS internaly - (bnc#798620). -- Update crypt-loop-file.patch to correctly detect crypto loop - files (bnc#799514). -- Add journalctl-remove-leftover-message.patch: remove debug - message in systemctl. -- Add job-avoid-recursion-when-cancelling.patch: prevent potential - recursion when cancelling a service. -- Add sysctl-parse-all-keys.patch: ensure sysctl file is fully - parsed. -- Add journal-fix-cutoff-max-date.patch: fix computation of cutoff - max date for journal. -- Add reword-rescue-mode-hints.patch: reword rescue prompt. -- Add improve-overflow-checks.patch: improve time overflow checks. -- Add fix-swap-behaviour-with-symlinks.patch: fix swap behaviour - with symlinks. -- Add hostnamectl-fix-set-hostname-with-no-argument.patch: ensure - hostnamectl requires an argument when called with set-hostname - option. -- Add agetty-overrides-term.patch: pass correctly terminal type to - agetty. -- Add check-for-empty-strings-in-strto-conversions.patch: better - check for empty strings in strto* conversions. -- Add strv-cleanup-error-path-loops.patch: cleanup strv on error - path. -- Add cryptsetup-handle-plain.patch: correctly handle "plain" - option in cryptsetup. -- Add fstab-generator-improve-error-message.patch: improve error - message in fstab-generator. -- Add delta-accept-t-option.patch: accept -t option in - systemd-delta. -- Add highlight-ordering-cycle-deletions.patch: highlight ordering - cycle deletions in logs. -- Add core-interpret-escaped-semicolon-as-escaped.patch: accept \; - in ExecStart. -- Add hostnamectl-fix-parsing-no-ask-password.patch: accept - no-ask-password in hostnamectl. -- Add systemd-cgls-fix-piping-output.patch: fix piping output of - systemd-cgls. -- Add core-load-fragment-improve-error-message.patch: improve error - message when parsing fragments. -- Add fix-potential-bad-mem-access.patch: fix potential bad memory - access. -- Add socket-improve-error-message.patch: improve error message in - socket handling. -- Add journal-send-always-send-syslog_identifier.patch: always send - syslog_identifier if available for journal. -- Add crypsetup-handle-nofail.patch: handle nofail in cryptsetup. -- Add crypsetup-generator-state-file-name-in-error-message.patch: - add filename in error message from crypsetup-generator. -- Add fstab-generator-error-message-on-duplicates.patch: improve - error message on duplicate in fstab-generator. -- Add systemctl-verbose-message-on-missing-install.patch: reword - missing install error message in systemctl. -- Add shutdown-improvements.patch: various improvements at - shutdown. -- Add localectl-fix-assertion.patch: fix assertion in localectl. -- Add path-util-fix-potential-crash.patch: fix potential crash in - path-util. -- Add coredumpctl-fix-crash.patch: fix crash in coredumpctl. -- Add socket-verbose-error-message.patch: add more verbose error - message in socket handling. -- Add pam-properly-handle-ssh-logins-without-pam-tty-field.patch: - handle properly ssh-logins without pam tty field. -- Add fstab-generator-properly-detect-bind-mounts.patch: properly - detect bind-mounts in fstab-generator. -- Add localectl-support-systems-without-locale-archive.patch: - localectl now supports systemd without locale-archive file. -- Add logind-capability-making-seats-without-fb.patch: allows - capability of making seats without fb. -- Add service-forking-ignore-exit-status-main-process.patch: ignore - exit-statis of main process when forking, if specified in unit - file. -- Add systemctl-no-assert-on-reboot-without-dbus.patch: don't - assert on reboot if dbus isn't there. -- Add logind-ignore-non-tty-non-x11-session-on-shutdown.patch: - ignore non tty non-x11 session on shutdown. -- Add journalctl-quit-on-io-error.patch: fix journalctl quit on io - error. -- Add do-not-make-sockets-dependent-on-lo.patch: do not make - sockets dependent on lo interface. -- Add shutdown-dont-force-mnt-force-on-final-umount.patch: don't - force MNT_FORCE on final umount at shutdown. -- Add shutdown-ignore-loop-devices-without-backing-file.patch: - ignore loop devices without backing file at shutdown. -- Add fix-bad-mem-access.patch: fix bad memory access -- Add parse-multiline-env-file.patch: correctly parse multiline - environment files (bnc#793411). - -------------------------------------------------------------------- -Thu Jan 10 15:43:25 UTC 2013 - fcrozat@suse.com - -- Add multiple-sulogin.patch: allows multiple sulogin instance - (bnc#793182). - -------------------------------------------------------------------- -Wed Jan 9 09:42:50 UTC 2013 - rmilasan@suse.com - -- udev: path_id - handle Hyper-V devices - add: 1008-udev-path_id-handle-Hyper-V-devices.patch -- keymap: Update the list of Samsung Series 9 models - add: 1009-keymap-Update-the-list-of-Samsung-Series-9-models.patch -- keymap: Add Samsung 700T - add: 1010-keymap-Add-Samsung-700T.patch -- libudev: avoid leak during realloc failure - add: 1011-libudev-avoid-leak-during-realloc-failure.patch -- libudev: do not resolve $attr{device} symlinks - add: 1012-libudev-do-not-resolve-attr-device-symlinks.patch -- libudev: validate 'udev' argument to udev_enumerate_new() - add: 1013-libudev-validate-udev-argument-to-udev_enumerate_new.patch -- udev: fix whitespace - add: 1014-udev-fix-whitespace.patch -- udev: properly handle symlink removal by 'change' event - add: 1015-udev-properly-handle-symlink-removal-by-change-event.patch -- udev: builtin - do not fail builtin initialization if one of - them returns an error - add: 1016-udev-builtin-do-not-fail-builtin-initialization-if-o.patch -- udev: use usec_t and now() - add: 1017-udev-use-usec_t-and-now.patch - -------------------------------------------------------------------- -Tue Jan 8 12:47:43 UTC 2013 - rmilasan@suse.com - -- udevd: add missing ':' to getopt_long 'e'. - add: 1007-udevd-add-missing-to-getopt_long-e.patch -- clean up systemd.spec, make it easy to see which are udev and - systemd patches. -- make 'reload' and 'force-reload' LSB compliant (bnc#793936). - -------------------------------------------------------------------- -Tue Dec 11 00:22:50 UTC 2012 - crrodriguez@opensuse.org - -- detect-btrfs-ssd.patch: Fix btrfs detection on SSD. -- timedated-donot-close-bogus-dbus-connection.patch: Avoid - closing an non-existent dbus connection and getting assertion - failures. - -------------------------------------------------------------------- -Mon Dec 10 14:22:21 UTC 2012 - coolo@suse.com - -- add conflicts between udev-mini and udev-mini-devel to libudev1 - -------------------------------------------------------------------- -Thu Dec 6 22:47:09 UTC 2012 - crrodriguez@opensuse.org - -- revert-of-9279749b84cc87c7830280b7895a48bed03c9429.patch: - do not consider failure to umount / and /usr an error. - -------------------------------------------------------------------- -Wed Dec 5 15:13:27 UTC 2012 - fcrozat@suse.com - -- Add fix-devname-prefix.patch: fix modules.devname path, it isn't - in /usr. -- Move post script to fix symlinks in /etc/systemd/system to a - trigger to run it after old systemd is uninstalled. - -------------------------------------------------------------------- -Tue Dec 4 16:51:32 UTC 2012 - fcrozat@suse.com - -- Add fix-debugshell.patch: use /bin/bash if sushell isn't - installed (bnc#789052). -- Add handle-root-uses-lang.patch: handle ROOT_USES_LANG=ctype - (bnc#792182). -- Ensure libudev1 and libudev-mini1 conflicts. - -------------------------------------------------------------------- -Thu Nov 22 14:22:00 UTC 2012 - rmilasan@suse.com - -- Fix creation of /dev/root link. - -------------------------------------------------------------------- -Tue Nov 20 18:25:49 CET 2012 - fcrozat@suse.com - -- Add remount-ro-before-unmount.patch: always remount read-only - before unmounting in final shutdown loop. -- Add switch-root-try-pivot-root.patch: try pivot_root before - overmounting / - -------------------------------------------------------------------- -Tue Nov 20 09:36:43 UTC 2012 - fcrozat@suse.com - -- links more manpages for migrated tools (from Christopher - Yeleighton). -- disable boot.localnet service, ypbind service will do the right - thing now (bnc#716746) -- add xdm-display-manager.patch: pull xdm.service instead of - display-manager.service (needed until xdm initscript is migrated - to native systemd service). -- Add fix-permissions-btmp.patch: ensure btmp is owned only by root - (bnc#777405). -- Have the udev package create a tape group, as referenced by - 50-udev-default.rules and 60-persistent-storage-tape.rules - (DimStar). -- Add fix-bad-memory-access.patch: fix crash in journal rotation. -- Add fix-dbus-crash.patch: fix D-Bus caused crash. -- Add sync-on-shutdown.patch: ensure sync is done when initiating - shutdown. -- Add mount-efivars.patch: mount efivars if booting on UEFI. - - -------------------------------------------------------------------- -Thu Nov 15 14:31:28 UTC 2012 - fcrozat@suse.com - -- Ship a empty systemd-journald initscript in systemd-logger to - stop insserv to complain about missing syslog dependency. -- Update - 0001-service-Fix-dependencies-added-when-parsing-insserv..patch - with bug fixes from Debian. - -------------------------------------------------------------------- -Wed Nov 14 17:36:05 UTC 2012 - fcrozat@suse.com - -- /var/log/journal is now only provided by systemd-logger (journal - won't be persistent for people using another syslog - implementation). -- install README in /var/log (in systemd-logger) and /etc/init.d -- create adm group when installing systemd. -- fix path in udev-root-symlink.systemd. -- Enforce Requires(post) dependency on libudev in main systemd - package (help upgrade). -- Ensure configuration is reloaded when upgrading and save random - seed when installing. -- Create /lib/udev symlink, if we do a fresh install. -- Add fix-build-glibc217.patch: fix build with latest glibc. -- Add libgcrypt.m4: copy of autoconf macro from libgcrypt, only - used to bootstrap systemd-mini. - -------------------------------------------------------------------- -Tue Nov 6 14:40:37 UTC 2012 - coolo@suse.com - -- adding a package systemd-logger that blocks syslog implementations - from installation to make an installation that only uses the journal - -------------------------------------------------------------------- -Mon Nov 5 14:37:46 UTC 2012 - fcrozat@suse.com - -- Don't hardcode path for systemctl in udev post script. -- Ensure systemd-udevd.service is shadowing boot.udev when booting - under systemd. -- Fix udev daemon upgrade under both systemd and sysvinit. -- Add fix-logind-pty-seat.patch: fix logind complaining when doing - su/sudo in X terminal. - -------------------------------------------------------------------- -Sat Nov 3 07:21:44 UTC 2012 - coolo@suse.com - -- add libudev1 to baselibs.conf - -------------------------------------------------------------------- -Fri Nov 2 14:07:15 UTC 2012 - coolo@suse.com - -- udev is GPL-2.0, the rest remains LGPL-2.1+ (bnc#787824) - -------------------------------------------------------------------- -Mon Oct 29 13:01:20 UTC 2012 - fcrozat@suse.com - -- Add var-run-lock.patch: make sure /var/run and /var/lock are - handled as bind mount if they aren't symlinks. -- Update storage-after-cryptsetup.patch with new systemctl path. -- Migrate broken symlinks in /etc/systemd/system due to new systemd - location. - -------------------------------------------------------------------- -Fri Oct 26 13:37:52 UTC 2012 - fcrozat@suse.com - -- Update to release 195: - + journalctl agained --since and --until, as well as filtering - for units with --unit=/-u. - + allow ExecReload properly for Type=oneshot (needed for - iptables.service, rpc-nfsd.service). - + journal daemon supports time-based rotation and vaccuming. - + journalctl -F allow to list all values of a certain field in - journal database. - + new commandline clients for timedated, locald and hostnamed - + new tool systemd-coredumpctl to list and extract coredumps from - journal. - + improve gatewayd: follow mode, filtering, support for - HTML5/JSON Server-Sent-Events. - + reload support in SysV initscripts is now detected when file is - parted. - + "systemctl status --follow" as been removed, use "journalctl -fu - instead" - + journald.conf RuntimeMinSize and PersistentMinSize settings - have been removed. -- Add compatibility symlink for systemd-ask-password and systemctl - in /bin. - -------------------------------------------------------------------- -Thu Oct 18 12:27:07 UTC 2012 - fcrozat@suse.com - -- Create and own more systemd drop-in directories. - -------------------------------------------------------------------- -Tue Oct 16 13:18:13 UTC 2012 - fcrozat@suse.com - -- Improve mini packages for bootstrapping. -- do not mount /tmp as tmpfs by default. - -------------------------------------------------------------------- -Tue Oct 16 07:40:23 UTC 2012 - fcrozat@suse.com - -- Fix install script when there is no inittab - -------------------------------------------------------------------- -Mon Oct 15 14:48:47 UTC 2012 - fcrozat@suse.com - -- Create a systemd-mini specfile to prevent cycle in bootstrapping - -------------------------------------------------------------------- -Thu Oct 4 11:23:42 UTC 2012 - fcrozat@suse.com - -- udev and its subpackages are now generated by systemd source - package. -- migrate udev and systemd to /usr -- Update to version 194: - + if /etc/vconsole.conf is non-existent or empty and if - /etc/sysconfig/console:CONSOLE_FONT (resp - /etc/sysconfig/keyboard:KEYTABLE) set, console font (resp - keymap) is not modified. -- Changes from version 44 to 193: - + journalctl gained --cursor= to show entries starting from a - specified location in journal. - + Size limit enforced to 4K for fields exported with "-o json" in - journalctl. Use --all to disable this behavior. - + Optional journal gateway daemon - (systemd-journal-gatewayd.service) to access journal via HTTP - and JSON. Use "wget http://localhost:19531/entries" to get - /var/log/messages compatible format and - 'curl -H"Accept: application/json" - http://localhost:19531/entries' for JSON formatted content. - HTML5 static page is also available as explained on - http://0pointer.de/public/journal-gatewayd - + do not mount cpuset controler, doesn't work well by default - ATM. - + improved nspawn behaviour with /etc/localtime - + journald logs its maximize size on disk - + multi-seat X wrapper (partially merged in upstream X server). - + HandleSleepKey has been splitted into HandleSuspendKey and - HandleHibernateKey. - + systemd and logind now handle system sleep states, in - particular suspending and hibernating. - + new cgroups are mounted by default (cpu, cpuacct, - net_cls, net_pri) - + sync at shutdown is now handled by kernel - + imported journalctl output (colors, filtering, pager, bash - completion). - + suffix ".service" may now be ommited on most systemctl command - involving service unit names. - + much improved nspawn containers support. - + new conditions added : ConditionFileNotEmpty, ConditionHost, - ConditionPathIsReadWrite - + tmpfiles "w" supports file globbing - + logind handles lid switch, power and sleep keys all the time, - unless systemd-inhibit - --what=handle-power-key:handle-sleep-key:handle-lid-switch is - run by Desktop Environments. - + support for reading structured kernel message is used by - default (need kernel >= 3.5). /proc/kmsg is now used only by - classic syslog daemons. - + Forward Secure Sealing is now support for Journal files. - + RestartPrevenExitStatus and SuccessExitStatus allow configure - of exit status (exit code or signal). - + handles keyfile-size and keyfile-offset in /etc/crypttab. - + TimeoutSec settings has been splitted into TimeoutStartSec and - TimeoutStopSec. - + add SystemCallFilters option to add blacklist/whitelist to - system calls, using SECCOMP mode 2 of kernel >= 3.5. - + systemctl udevadm info now takes a /dev or /sys path as argument: - - udevadm info /dev/sda - + XDG_RUNTIME_DIR now uses numeric UIDs instead of usernames. - + systemd-loginctl and systemd-journalctl have been renamed - to loginctl and journalctl to match systemctl. - + udev: RUN+="socket:..." and udev_monitor_new_from_socket() is - no longer supported. udev_monitor_new_from_netlink() needs to - be used to subscribe to events. - + udev: when udevd is started by systemd, processes which are left - behind by forking them off of udev rules, are unconditionally - cleaned up and killed now after the event handling has finished. - Services or daemons must be started as systemd services. - Services can be pulled-in by udev to get started, but they can - no longer be directly forked by udev rules. - + For almost all files, license is now LGPL2.1+ (from previous - GPL2.0+). Exception are some minor stuff in udev (will be - changed to LGPL2.1 eventually) and MIT license sd-daemon.[ch] - library. - + var-run.mount and var-lock.mount are no longer provided - (should be converted to symlinks). - + A new service type Type=idle to avoid ugly interleaving of - getty output and boot status messages. - + systemd-delta has been added, a tool to explore differences - between user/admin configuration and vendor defaults. - + /tmp mouted as tmpfs by default. - + /media is now longer mounted as tmpfs - + GTK tool has been split off to systemd-ui package. - + much improved documentation. -- Merge BuildRequires from udev package: - gobject-introspection-devel, gtk-doc, libsepol-devel, - libusb-devel, pkgconfig(blkid), pkgconfig-glib-2.0), - pjgconfig(libcryptsetup), pkgconfig(libpci), - pkgconfig(libqrencode), pkgconfig(libselinux), - pkgconfig(usbutils). -- Add pkgconfig(libqrencode) and pkgconfig(libmicrohttpd) -- Merge sources from udev package: boot.udev, write_dev_root.rules, - udev-root-symlink.systemd. -- Merge patches from udev package: numbered started from 1000): - 0001-Reinstate-TIMEOUT-handling.patch, - 0013-re-enable-by_path-links-for-ata-devices.patch, - 0014-rules-create-by-id-scsi-links-for-ATA-devices.patch, - 0026-udev-netlink-null-rules.patch, - 0027-udev-fix-sg-autoload-regression.patch. -- Remove following patches, merged upstream: - 0001-util-never-follow-symlinks-in-rm_rf_children.patch, - fixppc.patch, logind-logout.patch, fix-getty-isolate.patch, - fix-swap-priority.patch, improve-restart-behaviour.patch, - fix-dir-noatime-tmpfiles.patch, journal-bugfixes.patch, - ulimit-support.patch, change-terminal.patch, - fix-tty-startup.patch, fix-write-user-state-file.patch, - fix-analyze-exception.patch, use_localtime.patch, - journalctl-pager-improvement.patch, - avoid-random-seed-cycle.patch, - 0001-add-sparse-support-to-detect-endianness-bug.patch, - drop-timezone.patch. -- Rebase the following patches: - 0001-Add-bootsplash-handling-for-password-dialogs.patch, - 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch, - 0001-service-Fix-dependencies-added-when-parsing-insserv..patch, - 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch, - crypt-loop-file.patch, - delay-fsck-cryptsetup-after-md-lvm-dmraid.patch, - dm-lvm-after-local-fs-pre-target.patch, fastboot-forcefsck.patch, - fix-enable-disable-boot-initscript.patch, modules_on_boot.patch, - new-lsb-headers.patch, storage-after-cryptsetup.patch, - support-suse-clock-sysconfig.patch, support-sysvinit.patch, - sysctl-modules.patch, systemd-numlock-suse.patch, tty1.patch. - -------------------------------------------------------------------- -Thu Aug 23 11:11:25 CEST 2012 - fcrozat@suse.com - -- Add use_localtime.patch: use /etc/localtime instead of - /etc/timezone (bnc#773491) -- Add support-suse-clock-sysconfig.patch: read SUSE - /etc/sysconfig/clock file. -- Add drop-timezone.patch: drop support for /etc/timezone, never - supported on openSUSE. -- Add journalctl-pager-improvement.patch: better handle output when - using pager. -- Add fix-enable-disable-boot-initscript.patch: support boot.* - initscripts for systemctl enable /disable (bnc#746506). - -------------------------------------------------------------------- -Mon Jul 30 11:37:17 UTC 2012 - fcrozat@suse.com - -- Ensure systemd macros never fails (if systemd isn't install) - -------------------------------------------------------------------- -Mon Jul 23 08:28:15 UTC 2012 - fcrozat@suse.com - -- Add fix-analyze-exception.patch: prevent exception if running - systemd-analyze before boot is complete (bnc#772506) - -------------------------------------------------------------------- -Fri Jul 20 19:24:08 CEST 2012 - sbrabec@suse.cz - -- Fix NumLock detection/set race condition (bnc#746595#c47). - -------------------------------------------------------------------- -Wed Jul 18 13:14:37 UTC 2012 - fcrozat@suse.com - -- Move systemd-analyse to a subpackage, to remove any python - dependencies from systemd main package (bnc#772039). - -------------------------------------------------------------------- -Tue Jul 10 16:48:20 UTC 2012 - fcrozat@suse.com - -- Add fastboot-forcefsck.patch: ensure fastboot and forcefsck on - kernel commandline are handled. -- Add fix-write-user-state-file.patch: write logind state file - correctly. -- Disable logind-logout.patch: cause too many issues (bnc#769531). - -------------------------------------------------------------------- -Mon Jul 9 11:01:20 UTC 2012 - fcrozat@suse.com - -- Add fix-tty-startup.patch: don't limit tty VT to 12 (bnc#770182). - -------------------------------------------------------------------- -Tue Jul 3 20:07:47 CEST 2012 - sbrabec@suse.cz - -- Fix SUSE specific sysconfig numlock logic for 12.2 (bnc#746595). - -------------------------------------------------------------------- -Tue Jul 3 17:58:39 CEST 2012 - fcrozat@suse.com - -- Add fix-dir-noatime-tmpfiles.patch: do not modify directory - atime, which was preventing removing empty directories - (bnc#751253, rh#810257). -- Add improve-restart-behaviour.patch: prevent deadlock during - try-restart (bnc#743218). -- Add journal-bugfixes.patch: don't crash when rotating journal - (bnc#768953) and prevent memleak at rotation time too. -- Add ulimit-support.patch: add support for system wide ulimit - (bnc#744818). -- Add change-terminal.patch: use vt102 instead of vt100 as terminal - for non-vc tty. -- Package various .wants directories, which were no longer packaged - due to plymouth units being removed from systemd package. -- Fix buildrequires for manpages build. - -------------------------------------------------------------------- -Mon Jul 2 15:44:28 UTC 2012 - fcrozat@suse.com - -- Do not ship plymouth units, they are shipped by plymouth package - now (bnc#769397). -- Fix module loading (bnc#769462) - -------------------------------------------------------------------- -Thu Jun 7 13:14:40 UTC 2012 - fcrozat@suse.com - -- Add fix-swap-priority: fix default swap priority (bnc#731601). - -------------------------------------------------------------------- -Fri May 25 11:08:27 UTC 2012 - fcrozat@suse.com - -- Re-enable logind-logout.patch, fix in xdm-np PAM file is the real - fix. - -------------------------------------------------------------------- -Thu May 24 11:45:54 UTC 2012 - fcrozat@suse.com - -- Update new-lsb-headers.patch to handle entries written after - description tag (bnc#727771, bnc#747931). - -------------------------------------------------------------------- -Thu May 3 11:40:20 UTC 2012 - fcrozat@suse.com - -- Disable logind-logout.patch: it crashes sudo session (if called - after su -l) (bnc#746704). - -------------------------------------------------------------------- -Tue Apr 24 15:46:54 UTC 2012 - fcrozat@suse.com - -- Add fix-getty-isolate.patch: don't quit getty when changing - runlevel (bnc#746594) - -------------------------------------------------------------------- -Fri Apr 20 17:16:37 CEST 2012 - sbrabec@suse.cz - -- Implemented SUSE specific sysconfig numlock logic (bnc#746595). - -------------------------------------------------------------------- -Thu Apr 19 10:07:47 UTC 2012 - fcrozat@suse.com - -- Add dbus-1 as BuildRequires to fix build. - -------------------------------------------------------------------- -Tue Apr 3 09:37:09 UTC 2012 - dvaleev@suse.com - -- apply ppc patch to systemd-gtk too (fixes build) - -------------------------------------------------------------------- -Thu Mar 22 08:47:36 UTC 2012 - fcrozat@suse.com - -- Update fixppc.patch with upstream patches -- Add comments from upstream in - 0001-util-never-follow-symlinks-in-rm_rf_children.patch. -- Add logind-logout.patch: it should fix sudo / su with pam_systemd - (bnc#746704). - -------------------------------------------------------------------- -Mon Mar 19 14:07:23 UTC 2012 - fcrozat@suse.com - -- Add 0001-add-sparse-support-to-detect-endianness-bug.patch: fix - endianness error, preventing journal to work properly on ppc. -- Add fixppc.patch: fix build and warnings on ppc. - -------------------------------------------------------------------- -Mon Mar 19 10:11:23 UTC 2012 - fcrozat@suse.com - -- Add 0001-util-never-follow-symlinks-in-rm_rf_children.patch: fix - CVE-2012-1174 (bnc#752281). - -------------------------------------------------------------------- -Fri Mar 16 09:21:54 UTC 2012 - fcrozat@suse.com - -- Update to version 43: - + Support optional initialization of the machine ID from the KVM - or container configured UUID. - + Support immediate reboots with "systemctl reboot -ff" - + Show /etc/os-release data in systemd-analyze output - + Many bugfixes for the journal, including endianess fixes and - ensuring that disk space enforcement works - + non-UTF8 strings are refused if used in configuration and unit - files. - + Register Mimo USB Screens as suitable for automatic seat - configuration - + Reorder configuration file lookup order. /etc now always - overrides /run. - + manpages for journal utilities. -- Drop fix-c++-compat.patch, no-tmpfs-fsck.patch, - systemd-journald-fix-endianess-bug.patch. -- Requires util-linux >= 2.21 (needed to fix fsck on tmpfs). - -------------------------------------------------------------------- -Mon Mar 12 08:50:36 UTC 2012 - fcrozat@suse.com - -- Add fix-c++-compat.patch: fix C++ compatibility error in header. - -------------------------------------------------------------------- -Wed Feb 29 13:22:17 UTC 2012 - fcrozat@suse.com - -- Add systemd-journald-fix-endianess-bug.patch: fix journald not - starting on ppc architecture. -- Add correct_plymouth_paths_and_conflicts.patch: ensure plymouth - is correctly called and conflicts with bootsplash. - -------------------------------------------------------------------- -Tue Feb 21 08:58:31 UTC 2012 - fcrozat@suse.com - -- Remove rsyslog listen.conf, handled directly by rsyslog now - (bnc#747871). - -------------------------------------------------------------------- -Mon Feb 20 13:33:45 UTC 2012 - fcrozat@suse.com - -- Update to version 43: - + requires /etc/os-release, support for /etc/SuSE-release is no - longer present. - + Track class of PAM logins to distinguish greeters from normal - user logins. - + Various bug fixes. - -------------------------------------------------------------------- -Sun Feb 19 07:56:05 UTC 2012 - jengelh@medozas.de - -- Use pkgconfig symbols for BuildRequires and specify version - -------------------------------------------------------------------- -Fri Feb 17 09:22:50 UTC 2012 - tittiatcoke@gmail.com - -- Enable Plymouth integration. - * Bootsplash related files will be moved to the bootsplash - package - -------------------------------------------------------------------- -Mon Feb 13 12:11:17 UTC 2012 - fcrozat@suse.com - -- Update to version 42: - + Various bug fixes - + Watchdog support for supervising services is now usable - + Service start rate limiting is now configurable and can be - turned off per service. - + New CanReboot(), CanPowerOff() bus calls in systemd-logind -- Dropped fix-kmod-build.patch, fix-message-after-chkconfig.patch, - is-enabled-non-existing-service.patch (merged upstream) -- Add libxslt1 / docbook-xsl-stylesheets as BuildRequires for - manpage generation - -------------------------------------------------------------------- -Thu Feb 9 16:19:38 UTC 2012 - fcrozat@suse.com - -- Update to version 41: - + systemd binary is now installed in /lib/systemd (symlink for - /bin/systemd is available now) - + kernel modules are now loaded through libkmod - + Watchdog support is now useful (not complete) - + new kernel command line available to set system wide - environment variable: systemd.setenv - + journald capabilities set is now limited - + SIGPIPE is ignored by default. This can be disabled with - IgnoreSIGPIPE=no in unit files. -- Add fix-kmod-build.patch: fix build with libkmod -- Drop remote-fs-after-network.patch (merged upstream) -- Add dm-lvm-after-local-fs-pre-target.patch: ensure md / lvm - /dmraid is started before mounting partitions, if fsck was - disabled for them (bnc#733283). -- Update lsb-header patch to correctly disable heuristic if - X-Systemd-RemainAfterExit is specified (whatever its value) -- Add fix-message-after-chkconfig.patch: don't complain if only - sysv services are called in systemctl. -- Add is-enabled-non-existing-service.patch: fix error message when - running is-enabled on non-existing service. - -------------------------------------------------------------------- -Tue Feb 7 14:43:58 UTC 2012 - fcrozat@suse.com - -- Update to version 40: - + reason why a service failed is now exposed in the"Result" D-Bus - property. - + Rudimentary service watchdog support (not complete) - + Improve bootcharts, by immediatly changing argv[0] after - forking to to reflect which process will be executed. - + Various bug fixes. -- Add remote-fs-after-network.patch and update insserv patch: - ensure remote-fs-pre.target is enabled and started before network - mount points (bnc#744293). -- Ensure journald doesn't prevent syslogs to read from /proc/kmsg. - -------------------------------------------------------------------- -Tue Jan 31 13:40:51 CET 2012 - fcrozat@suse.com - -- Ensure systemd show service status when started behind bootsplash - (bnc#736225). -- Disable core dump redirection to journal, not stable atm. - -------------------------------------------------------------------- -Thu Jan 26 16:00:27 UTC 2012 - fcrozat@suse.com - -- Update modules_on_boot.patch to not cause failed state for - systemd-modules-load.service (bnc#741481). - -------------------------------------------------------------------- -Wed Jan 25 10:37:06 UTC 2012 - fcrozat@suse.com - -- Update to version 39: - + New systemd-cgtop tool to show control groups by their resource - usage. - + Linking against libacl for ACLs is optional again. - + If a group "adm" exists, journal files are automatically owned - by them, thus allow members of this group full access to the - system journal as well as all user journals. - + The journal now stores the SELinux context of the logging - client for all entries. - + Add C++ inclusion guards to all public headers. - + New output mode "cat" in the journal to print only text - messages, without any meta data like date or time. - + Include tiny X server wrapper as a temporary stop-gap to teach - XOrg udev display enumeration (until XOrg supports udev - hotplugging for display devices). - + Add new systemd-cat tool for executing arbitrary programs with - STDERR/STDOUT connected to the journal. Can also act as BSD - logger replacement, and does so by default. - + Optionally store all locally generated coredumps in the journal - along with meta data. - + systemd-tmpfiles learnt four new commands: n, L, c, b, for - writing short strings to files (for usage for /sys), and for - creating symlinks, character and block device nodes. - + New unit file option ControlGroupPersistent= to make cgroups - persistent. - + Support multiple local RTCs in a sane way. - + No longer monopolize IO when replaying readahead data on - rotating disks. - + Don't show kernel threads in systemd-cgls anymore, unless - requested with new -k switch. -- Drop systemd-syslog_away_early_on_shutdown.patch: fixed upstream. -- Add fdupes to BuildRequires and use it at build time. - -------------------------------------------------------------------- -Thu Jan 19 13:47:39 UTC 2012 - tittiatcoke@gmail.com - -- Make the systemd journal persistent by creating the - /var/log/journal directory - -------------------------------------------------------------------- -Wed Jan 18 09:03:51 UTC 2012 - tittiatcoke@gmail.com - -- Update to version 38 : - - Bugfixes - - Implementation of a Journal Utility Library - - Implementation of a 128 Bit ID Utility Library -- 11 Patches integrated upstream -- Add systemd-syslog_away_early_on_shutdown.patch: make sure - syslog socket goes away early during shutdown. -- Add listen.conf for rsyslog. This will ensure that it will still - work fine with rsyslog and the new journal. - -------------------------------------------------------------------- -Mon Jan 9 17:01:22 UTC 2012 - fcrozat@suse.com - -- Add fix-is-enabled.patch: ensure systemctl is-enabled work - properly when systemd isn't running. -- Add logind-console.patch: do not bail logind if /dev/tty0 doesn't - exist (bnc#733022, bnc#735047). -- Add sysctl-modules.patch: ensure sysctl is started after modules - are loaded (bnc#725412). -- Fix warning in insserv patch. -- Update avoid-random-seed-cycle.patch with better upstream - approach. -- Update storage-after-cryptsetup.patch to restart lvm before - local-fs.target, not after it (bnc#740106). -- Increase pam-config dependency (bnc#713319). - -------------------------------------------------------------------- -Wed Dec 7 15:15:07 UTC 2011 - fcrozat@suse.com - -- Remove storage-after-cryptsetup.service, add - storage-after-cryptsetup.patch instead to prevent dependency - cycle (bnc#722539). -- Add delay-fsck-cryptsetup-after-md-lvm-dmraid.patch: ensure - fsck/cryptsetup is run after lvm/md/dmraid have landed - (bnc#724912). -- Add cron-tty-pam.patch: Fix cron filling logs (bnc#731358). -- Add do_not_warn_pidfile.patch: Fix PID warning in logs - (bnc#732912). -- Add mount-swap-log.patch: Ensure swap and mount output is - redirected to default log target (rhb#750032). -- Add color-on-boot.patch: ensure colored status are displayed at - boot time. -- Update modules_on_boot.patch to fix bnc#732041. -- Replace private_tmp_crash.patch with log_on_close.patch, better - upstream fix for bnc#699829 and fix bnc#731719. -- Update vconsole patch to fix memleaks and crash (bnc#734527). -- Add handle-racy-daemon.patch: fix warnings with sendmail - (bnc#732912). -- Add new-lsb-headers.patch: support PIDFile: and - X-Systemd-RemainAfterExit: header in initscript (bnc#727771). -- Update bootsplash services to not start if vga= is missing from - cmdline (bnc#727771) -- Add lock-opensuse.patch: disable /var/lock/{subsys,lockdev} and - change default permissions on /var/lock (bnc#733523). -- Add garbage_collect_units: ensure error units are correctly - garbage collected (rhb#680122). -- Add crypt-loop-file.patch: add support for crypt file loop - (bnc#730496). - -------------------------------------------------------------------- -Sat Nov 19 15:40:38 UTC 2011 - coolo@suse.com - -- add libtool as buildrequire to avoid implicit dependency - -------------------------------------------------------------------- -Fri Nov 4 14:44:18 UTC 2011 - fcrozat@suse.com - -- Fix rpm macros to only call presets on initial install - (bnc#728104). - -------------------------------------------------------------------- -Thu Oct 27 13:39:03 UTC 2011 - fcrozat@suse.com - -- Add no-tmpfs-fsck.patch: don't try to fsck tmpfs mountpoint - (bnc#726791). - -------------------------------------------------------------------- -Wed Oct 19 13:18:54 UTC 2011 - fcrozat@suse.com - -- Add avoid-random-seed-cycle.patch: fix dependency cycle between - cryptsetup and random-seed-load (bnc#721666). -- Add crash-isolating.patch: fix crash when isolating a service. -- Fix bootsplash being killed too early. -- Fix some manpages not being redirected properly. -- Add storage-after-cryptsetup.service to restart lvm after - cryptsetup. Fixes lvm on top of LUKS (bnc#724238). - -------------------------------------------------------------------- -Fri Oct 14 13:07:07 UTC 2011 - fcrozat@suse.com - -- Recommends dbus-1-python, do not requires python (bnc#716939) -- Add private_tmp_crash.patch: prevent crash in debug mode - (bnc#699829). -- Add systemctl-completion-fix.patch: fix incorrect bash completion - with some commands (git). - -------------------------------------------------------------------- -Wed Oct 12 13:21:15 UTC 2011 - fcrozat@suse.com - -- Shadow single sysv service, it was breaking runlevel 1. -- Add modules_on_boot.patch to handle /etc/sysconfig/kernel - MODULES_ON_BOOT variable (bnc#721662). - -------------------------------------------------------------------- -Wed Oct 12 08:38:36 UTC 2011 - fcrozat@suse.com - -- Update to release 37: - - many bugfixes - - ConditionCapability added, useful for containers. - - locale mechanism got extend to kbd configuration for - both X and the console - - don't try to guess PID for SysV services anymore (bnc#723194) -- Drop detect-non-running.patch, logind-warning.patch. -- Rewrite systemd-sysv-convert in bash (bnc#716939) -------------------------------------------------------------------- -Tue Oct 11 13:57:32 UTC 2011 - coolo@suse.com - -- make sure updaters get in the /sbin/init from here - the sub package - of the split package will decide which init wins in update case - -------------------------------------------------------------------- -Tue Oct 11 13:10:27 UTC 2011 - coolo@suse.com - -- under openSUSE if it's not systemd, chances are good it's - sysvinit - -------------------------------------------------------------------- -Tue Oct 11 11:07:02 UTC 2011 - coolo@suse.com - -- do not list specific sbin_init providers - -------------------------------------------------------------------- -Wed Oct 5 16:18:48 UTC 2011 - fcrozat@suse.com - -- Add logind-warning.patch: fix pam warning (bnc#716384) - -------------------------------------------------------------------- -Fri Sep 30 13:55:31 UTC 2011 - fcrozat@suse.com - -- Update to version 36 : - - many bugfixes - - systemd now requires socket-activated syslog implementations - - After=syslog.target is no longer needed in .service files - - X-Interactive is ignored in LSB headers (was not working) -- Enable back insserv.conf parsing in systemd core and fix added - dependencies (bnc#721428). -- Fix detection of LSB services status when running daemon - (bnc#721426). -- Drop 0001-execute-fix-bus-serialization-for-commands.patch, - fix-reload.patch - -------------------------------------------------------------------- -Thu Sep 29 16:08:33 UTC 2011 - fcrozat@suse.com - -- Add services to stop bootsplash at end of startup and start it at - beginning of shutdown. -- Fix bootsplash call and ensure dependencies are set right. - -------------------------------------------------------------------- -Thu Sep 29 13:43:00 UTC 2011 - fcrozat@suse.com - -- Add detect-non-running.patch: fix assertion when running - systemctl under non systemd system (git). -- Requires presets branding package. -- Improve macros a little bit. - -------------------------------------------------------------------- -Mon Sep 26 14:52:46 UTC 2011 - fcrozat@suse.com - -- Merge migration rpm macros into service_add/service_del macros. -- Use systemd presets in rpm macros -- Add fix-reload.patch: handle daemon-reload and start condition - properly (bnc#719221). - -------------------------------------------------------------------- -Fri Sep 23 15:39:03 UTC 2011 - fcrozat@suse.com - -- Add systemd-splash / bootsplash-startup.service: enable - bootsplash at startup. - -------------------------------------------------------------------- -Fri Sep 16 15:54:54 UTC 2011 - fcrozat@suse.com - -- Create -32bit package (bnc#713319) - -------------------------------------------------------------------- -Mon Sep 12 08:33:04 UTC 2011 - fcrozat@suse.com - -- Do not mask localnet service, it is not yet handled by systemd. - (bnc#716746) - -------------------------------------------------------------------- -Fri Sep 9 09:28:54 UTC 2011 - fcrozat@suse.com - -- Add revert_insserv_conf_parsing.patch and systemd-insserv_conf: - remove insserv.conf parsing from systemd and use generator - instead. -- put back default.target creation at package install and remove - inittab generator, Yast2 is now able to create it. - -------------------------------------------------------------------- -Thu Sep 1 09:25:40 UTC 2011 - fcrozat@novell.com - -- Update to version 34: - * Bugfixes - * optionaly apply cgroup attributes to cgroups systemd creates - * honour sticky bit when trimming cgroup trees - * improve readahead -- Add libacl-devel as BuildRequires (needed for systemd-uaccess) -- Add some %{nil} to systemd.macros to fix some build issues. -- Fix dbus assertion -- move gtk part to its own package, to reduce bootstrapping - (bnc#713981). - -------------------------------------------------------------------- -Fri Aug 26 14:10:30 UTC 2011 - fcrozat@suse.com - -- Update compose_table patch to use two separate loadkeys call, - compose table overflows otherwise (spotted by Werner Fink). - -------------------------------------------------------------------- -Wed Aug 24 13:02:12 UTC 2011 - fcrozat@novell.com - -- Add tty1.patch: ensure passphrase are handled before starting - gettty on tty1. -- Add inittab generator, creating default.target at startup based - on /etc/inittab value. -- No longer try to create /etc/systemd/system/default.target at - initial package install (bnc#707418) -- Fix configuration path used for systemd user manager. -- Ensure pam-config output is no display in install script. -- Remove buildrequires on vala, no longer needed. - -------------------------------------------------------------------- -Fri Aug 19 15:29:49 UTC 2011 - fcrozat@suse.com - -- Handle disable_capslock, compose table and kbd_rate -- Add rpm macros.systemd file. -- Do not disable klogd, it has its own service now. -- Handle kexec correctly (bnc#671673). -- Disable preload services, they are conflicting with systemd. - -------------------------------------------------------------------- -Fri Aug 19 08:15:15 UTC 2011 - fcrozat@suse.com - -- enable pam_systemd module, using pam-config. - -------------------------------------------------------------------- -Thu Aug 18 07:31:12 UTC 2011 - aj@suse.de - -- Fix crash with systemctl enable. - -------------------------------------------------------------------- -Tue Aug 16 17:02:27 UTC 2011 - fcrozat@suse.com - -- Fix localfs.service to no cause cycle and starts it after - local-fs.target. - -------------------------------------------------------------------- -Thu Aug 4 15:59:58 UTC 2011 - fcrozat@suse.com - -- Remove root-fsck.patch, mkinitrd will use the same path as - dracut. -- Add systemd-cryptsetup.patch: don't complain on "none" option in - crypttab. -- Add systemd-cryptsetup-query.patch: block boot until passphrase - is typed. - -------------------------------------------------------------------- -Wed Aug 3 16:03:25 UTC 2011 - fcrozat@suse.com - -- Add root-fsck.patch: do not run fsck on / if it is rw -- Ship a non null localfs.service, fixes static mount points not - being mounted properly. - -------------------------------------------------------------------- -Wed Aug 3 07:11:33 UTC 2011 - aj@suse.de - -- Update to version 33: - * optimizations and bugfixes. - * New PrivateNetwork= service setting which allows you to shut off - networking for a specific service (i.e. all routable network - interfaces will disappear for that service). - * Merged insserv-parsing.patch and bash-completion-restart.patch - patches. - -------------------------------------------------------------------- -Tue Aug 2 08:29:30 UTC 2011 - fcrozat@suse.com - -- Add insserv-parsing.patch: read/parse insserv.conf. -- Add bash-completion-restart.patch: fix restart service list - (bnc#704782). - -------------------------------------------------------------------- -Mon Aug 1 09:04:53 UTC 2011 - aj@suse.de - -- Split up devel package. -- restart logind after upgrade. -- Adjust rpmlintrc for changes. - -------------------------------------------------------------------- -Fri Jul 29 10:48:20 UTC 2011 - aj@suse.de - -- Update to version 32: - * bugfixes - * improve selinux setup - -------------------------------------------------------------------- -Thu Jul 28 07:27:32 UTC 2011 - aj@suse.de - -- Update to version 31: - * rewrite of enable/disable code: New features systemctl --runtime, - systemctl mask, systemctl link and presets. - * sd-daemon is now shared library. - -------------------------------------------------------------------- -Tue Jul 19 11:56:43 UTC 2011 - aj@suse.de - -- Update to version 30: - + Logic from pam_systemd has been moved to new systemd-login. - + VT gettys are autospawn only when needed - + Handle boot.local/halt.local on SUSE distribution - + add support for systemctl --root - -------------------------------------------------------------------- -Wed Jun 29 12:54:24 UTC 2011 - fcrozat@suse.com - -- Make sure to not start kbd initscript, it is handled by systemd - natively. - -------------------------------------------------------------------- -Fri Jun 17 09:34:24 UTC 2011 - fcrozat@novell.com - -- version 29: - + enable chkconfig support in systemctl for openSUSE. - + systemctl: plug a leak upon create_symlink mismatch - + mount /run without MS_NOEXEC - + dbus: fix name of capability property - + systemctl: fix double unref of a dbus message - + cryptsetup-generator: fix /etc/cryptsetup options - + selinux: selinuxfs can be mounted on /sys/fs/selinux - + readahead-common: fix total memory size detection - + systemctl: fix 'is-enabled' for native units under /lib - + systemctl: fix a FILE* leak - + pam-module: add debug= parameter - + remote-fs.target: do not order after network.target -- update tarball url. - -------------------------------------------------------------------- -Wed Jun 15 10:00:29 UTC 2011 - saschpe@suse.de - -- Use RPM macros instead of $RPM_FOO variables -- Don't require %{version}-%{release} of the base package, - %{version} is sufficient - -------------------------------------------------------------------- -Tue Jun 14 15:10:41 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - mount /run without MS_NOEXEC - - readahead-common: fix total memory size detection - - enable chkconfig support in systemctl for openSUSE - - selinux: selinuxfs can be mounted on /sys/fs/selinux - - cryptsetup-generator: fix /etc/cryptsetup options - - systemctl: fix double unref of a dbus message -- drop merged chkconfig patch - -------------------------------------------------------------------- -Tue Jun 14 12:39:25 UTC 2011 - fcrozat@novell.com - -- Add sysv chkconfig patch to be able to enable / disable sysv - initscripts with systemctl. -- Ensure plymouth support is buildable conditionnally. - -------------------------------------------------------------------- -Thu May 26 21:16:06 CEST 2011 - kay.sievers@novell.com - -- version 28 - - drop hwclock-save.service - - fix segfault when a DBus message has no interface - - man: update the list of unit search locations - - readahead-collect: ignore EACCES for fanotify - - rtc in localtime: use settimeofday(NULL, tz) - instead of hwclock(8) - -------------------------------------------------------------------- -Sat May 21 23:57:30 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - fix crash in D-Bus code - -------------------------------------------------------------------- -Sat May 21 18:17:59 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - socket: always use SO_{RCV,SND}BUFFORCE to allow larger values - - util: use new VT ESC sequence to clear scrollback buffer - - sd-daemon: move _sd_hidden_ from .h to .c file - - missing: add IP_TRANSPARENT - -------------------------------------------------------------------- -Sat May 21 16:17:38 CEST 2011 - kay.sievers@novell.com - -- version 27 - - util: use open_terminal() in chvt() too - - socket: expose SO_BROADCAST - - git: add .mailmap - - exec: expose tty reset options in dbus introspection data - - socket: expose IP_TRANSPARENT - - exec: hangup/reset/deallocate VTs in gettys - - socket: use 666 socket mode by default since neither fifos, - nor sockets, nor mqueues need to be executable - - socket: add POSIX mqueue support - - README: document relation to nss-myhostname - - hostnamed: check that nss-myhostname is installed - -------------------------------------------------------------------- -Tue May 17 19:15:17 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - sysctl: apply /etc/sysctl.conf last - - systemd-analyze: print hostname, kernelversion and arch at - the top of the plot - - pam: downgrade a few log msgs - - hostnamed: SetPrettyHostname() should check PK action - org.freedesktop.hostname1.set-static-hostname - - user-sessions: ignore EROFS when unlinking /etc/nologin if - the file doesn't exist anyway - - unit: make ignoring in snapshots a per unit property, - instead of a per unit type property - - vconsole: use open_terminal() instead of open() - - units: enable automount units only if the kernel supports them - -------------------------------------------------------------------- -Thu May 5 07:45:46 UTC 2011 - coolo@opensuse.org - -- remove policy filter - -------------------------------------------------------------------- -Thu May 5 08:59:46 CEST 2011 - meissner@suse.de - -- add missing buildrequires dbus-1-devel, vala, libxslt-devel -- touch vala files for rebuilding to unbreak Factory - -------------------------------------------------------------------- -Mon May 2 23:05:35 CEST 2011 - kay.sievers@novell.com - -- also delete plymouth files - -------------------------------------------------------------------- -Mon May 2 19:00:41 CEST 2011 - kay.sievers@novell.com - -- disable plymouth sub-package until plymouth gets into Factory - -------------------------------------------------------------------- -Sun May 1 22:51:28 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - binfmt, modules-load, sysctl, tmpfiles: add missing - ConditionDirectoryNotEmpty= - - binfmt, modules-load, sysctl, tmpfiles: read /usr/local/lib - and where appropriate /lib directories - -------------------------------------------------------------------- -Sat Apr 30 04:56:55 CEST 2011 - kay.sievers@novell.com - -- version 26 - - plymouth: introduce plymouth.enable=0 kernel command line - - util: don't AND cx with cx - - man: typo in sd_daemon reference - - util: conf_files_list() return list as parameter - - dbus: make daemon reexecution synchronous - -------------------------------------------------------------------- -Thu Apr 28 14:07:12 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - service: properly notice when services with a main process - that isn't a child of init die - - unit: fix assert when trying to load unit instances for - uninstanciable types - - def: lower default timeout to 90s - - manager: fix serialization counter - -------------------------------------------------------------------- -Wed Apr 27 04:19:05 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - dbus: don't hit assert when dumping properties - - cryptsetup: fix keyfile size option processing - - socket: improve warning message when we get POLLHUP - - mount: failure to mount cgroup hierarchies should not be fatal - - configure: add AC_SYS_LARGEFILE - -------------------------------------------------------------------- -Mon Apr 25 21:45:02 CEST 2011 - kay.sievers@novell.com - -- new snapshot - - tmpfiles.d: switch to stacked config dirs in /lib, /etc, /run - - sysctl.d, binfmt.d, modules-load.d: switch to stacked config - dirs in /lib, /etc, /run - - manager: mkdir /run/systemd/system when starting up - - man: Spelling fixes - -------------------------------------------------------------------- -Thu Apr 21 04:39:57 CEST 2011 - kay.sievers@novell.com - -- version 25 - - mount: Allow creating mount units for /var/lib/nfs/rpc_pipefs - and /proc/fs/nfsd. - - socket: support ListeSpecial= sockets - - vconsole: don't set console font/keymap if settings are empty - - nspawn: don't fail when we receive SIGCHLD - - cgroup: don't accidentaly trim on reload - - units: set capability bounding set for syslog services - - socket: log more information about invalid poll events - - man: fix specification of default timeouts - - mount,crypto: rework meaning of noauto/nofail - - fsck: don't fsck against basic.target in order to properly - allow automount /home - - manager: when running in test mode, do not write generated - unit files to /run/systemd/generator - - mount: properly parse timeouts options in the middle of - the string - - hostnamed: drop all caps but CAP_SYS_ADMIN - - execute: when we run as PID 1 the kernel doesn't give us - CAP_SETPCAP by default. Get that temporarily when dropping - capabilities for good - - mount: make device timeout configurable - - cryptsetup: do not order crypto DM devices against the - cryptsetup service - - socket: reuse existing FIFOs - - socket: guarantee order in which sockets are passed to be - the one of the configuration file - - systemctl: always consider unit files with no - [Install] section but stored in /lib enabled - - job: also print status messages when we successfully started - a unit - - hostnamed: add reference to SMBIOS specs - - man: runlevel 5 is usually more comprehensive, so use it - instead of 3 to detect whether a sysv service is enabled - - polkit: follow the usual syntax for polkit actions - - hostnamed: introduce systemd-hostnamed - - units: order quotacheck after remount-rootfs - - hostname: split out hostname validation into util.c - - dbus: split out object management code into dbus-common, - and simplify it - - strv: properly override settings in env_append() - - strv: detect non-assignments in env blocks properly in - env_append() - - strv: handle empty lists in strv_copy() properly - - util: truncate newline inside of read_one_line_file() - - util: modernize get_parent_of_pid() a bit - - crypto: let the cryptsetup binary handles its own - configurable timeouts - - logger,initctl: use global exit timeout - - ask-password: use default timeout - - manager: drop all pending jobs when isolating - - manager: introduce IgnoreOnIsolate flag so that we can keep - systemd-logger around when isolating - - units: never pull in sysinit from utmp, so that we can - shutdown from emergency mode without pulling in sysinit - - manager: downgrade a few log messages - - units: require syslog.socket from the logger because we - simply fail if we don't have it - - logger: adjust socket description to match service - - units: set stdout of kmsg syslogd to /dev/null - - units: add --no-block when starting normal service after - shell exited - - ask-password: use kill(PID, 0) before querying a password - - ask-password: support passwords without timeouts - - ask-password: always send final NUL char - - ask-password: properly accept empty passwords from agent - - unit: skip default cgroup setup if we have no hierarchy - - units: isolate emergency.target instead of emergency.service - when we fail to mount all file systems - - mount: don't pull in stdio logger for root mount unit - - cgroup: be nice to Ingo Molnar - - pam: use /proc/self/sessionid only with CAP_AUDIT_CONTROL - - pam: use /proc/self/loginuid only with CAP_AUDIT_CONTROL - - socket: try creating a socket under our own identity if we - have no perms to consult the selinux database - - socket: fix check for SEQPACKET - - execute: don't fail if we cannot fix OOM in a container - - unit: fix dump output - - socket: be a bit more verbose when refusing to start a - socket unit - - socket: support netlink sockets - - local-fs: invoke emergency.service mounting at boot fails - - path: optionally, create watched directories in .path units - - tmpfiles: don't warn if two identical lines are configured - - man: add man page for ask-password - - dbus: expose monotonic timestamps on the bus - - manager: no need to use randomized generator dir when running - as system manager - - don't make up buffer sizes, use standard LINE_MAX instead - - unit: disallow configuration of more than one on_failure - dependencies if OnFailureIsolate= is on - - unit: pull in logger unit only when running in system mode - - manager: serialize/deserialize max job id and /usr taint flag - - manager: don't garbage collect jobs when isolating, to change - global state - - unit: introduce OnFailureIsolate= - - mount: relabel both before and after a mount, just in case - - cmdline: we actually want to parse the kernel cmdline in VMs, - just not in containers - - units: rename rtc-set.target to time-sync.target and pull it - in by hwclock-load.service - - job: fix deserialization of jobs: do not ignore ordering - - systemctl: properly parse JobNew signals - - service: fix units with more than one socket - - systemctl: make most operations NOPs in a chroot - - manager: don't show PID for incoming signals if it is 0 - - man: fix description of systemctl reload-or-try-restart - - mount: block creation of mount units for API file systems - - units: call the logger a bridge too - - build-sys: always place user units in /usr/lib/systemd - - pkgconfig: update .pc file accordingly - - lookup: always also look into /usr/lib for units - - exec: support unlimited resources - - selinux: relabel /run the same way as /dev after loading - the policy since they both come pre-filled and unlabelled - - manager: fd must be int, not char - - change remaining /var/run to /run - - units: move user units from /usr/share to /usr/lib since - they might be arch-dependent - - man: document /etc/sysctl.d/ - - binfmt: add binfmt tool to set up binfmt_misc at boot - - tmpfiles: create leading directories for d/D instructions - - condition: add ConditionSecurity - - load-fragment: unify config_parse_condition_{kernel, virt} - - condition: fix dumping of conditions - - initctl: /dev/initctl is a named pipe, not a socket - - kmsg-syslogd: pass facility value into kmsg - - move /var/lock to HAVE_SYSV_COMPAT - - tmpfiles: split off rules for legacy systems into legacy.conf - - general: replace a few uses of /var/run by /run - - tmpfiles: enforce new /var/lock semantics - - man: document ConditionPathIsDirectory= - - mount: also relabel pre-mounted API dirs - - log: don't strip facility when writing to kmsg - - build-sys: create a number of drop-in config dirs - - random: do not print warning if random seed doesn't exist - - plymouth: use PID file to detect whether ply is running - - build-sys: install systemd-analyze by default - - analyze: improve output - - analyze: add plotter - - unit: when deserializing do reconnect to dbus/syslog when - they show up - - analyze: beautify output a bit - - add systemd-analyze tool - - unit: don't override timestamps due to state changes when - deserializing - - plymouth: don't explicitly enable status message when - plymouth is up - - status: show status messages unconditionally if plymouth - is around - - taint: add missing cgroups taint flag - - locale: don't access misinitialized variable - - quota: do not pull in quota tools for mounts that do not - originate in neither /etc/fstab nor fragment files - - manager: fix taint check for /usr - - unit: never apply /etc/rcN.d/ priority to native services - - unit: fix parsing of condition-result - - unit: don't complain about failed units when deserializing - - exec: drop process group kill mode since it has little use - and confuses the user - - cgroup: explain when we cannot initialize the cgroup stuff - - systemctl: don't truncate description when using pager - - ask-password: also accept Backspace as first keypress as - silent mode switch - - unit: when deserializing jobs, don't pull in dependencies - - locale: fix LC_MESSAGES variable name - - plymouth: Remove the calls to plymouth message - - udev: systemd-tag all ttys - - tmpfiles fix /run/lock permissions - - ask-password: use TAB to disable asterisk password echo - - execute: socket isn't abstract anymore - - use /run instead of /dev/.run - - man: explain a couple of default dependencies - - mount: pull in quota services from local mountpoints with - usr/grpquota options - - service: pull in sysv facility targets from the sysv units, - not the other way round - - units: pull in syslog.target from syslog.socket - - units: don't ever pull in SysV targets from other SysV - targets - - units: document that some targets exists only for compat - with SysV - - man: document pidns containers - - units: deemphesize Names= settings, and explain why nobody - whould use them - - units: on mandriva/fedora create single.service alias via - symlink, not Names= - - units: get rid of runlevel Names=, the symlinks in - /lib/systemd/system are much more useful - - rework syslog detection so that we need no compile-time - option what the name of the syslog implementation is - - man: document .requires/ directories - - special: get rid of dbus.target - - exec: properly apply capability bounding set, add inverted - bounding sets - - dbus: add service D-Bus property "Sockets" - - dbus: consolidate service SysV conditionals - - unit: serialize condition test results - - def: centralize definition of default timeout in one place - - chkconfig: check against runlevel 5 instead of 3, since it is - a superset of the latter - - systemctl: accept condstop as alias for stop - - dbus: allow LoadUnit to unprivileged users - - umount: make sure skip_ro is always correctly initialized -- create /run (link it to /var/run) -- refresh splash password patch -- conflict with old mkinitrd version (we need /run) -- conflict with old udev (we need /run) - -------------------------------------------------------------------- -Wed Mar 16 18:38:04 CET 2011 - kay.sievers@novell.com - -- new snapshot - - man: fix systemctl try-restart description - - Add Frugalware display-manager service - - main: revert recognition of "b" argument - - main: interpret all argv[] arguments unconditionally when - run in a container - - loopback: downgrade an error to warning - - nspawn: bind mount /etc/localtime - - nspawn: make tty code more robust against closed/reopened - /dev/console - - util: make touched files non-writable by default - - nspawn: allocate a new pty instead of passing ours through - to avoid terminal settings chaos - - main: parse the whole arv[] as kernel command line - - main: check if we have a valid PID before getting the name - - ask-password: reset signal mask after we are done - - cgroup: don't recheck all the time whether the systemd - hierarchy is mounted, to make strace outputs nicer and save - a few stat()s - - man: document systemd-nspawn - - cgls: don't strip user processes and kernel threads from - default output - - umount: don't try to remount bind mounts ro during shutdown - - getty: move automatic serial getty logic into generator - - container: skip a few things when we are run in a container - such as accessing /proc/cmdline - - cgls: by default start with group of PID 1 - - pam: determine user cgroup tree from cgroup of PID 1 - - nspawn: move container into its own name=systemd cgroup - - manager: don't show kernel boot-up time for containers - - manager: show who killed us - - units: add console-shell.service which can be used insted of - the gettys to get a shell on /dev/console - -------------------------------------------------------------------- -Mon Mar 14 18:29:23 CET 2011 - kay.sievers@novell.com - -- new snapshot - - build-sys: move remaining tools from sbin/ to bin/ since they - might eventually be useful for user execution - - hostname: don't override the hostname with localhost if it - is already set and /etc/hostname unset - - audit: give up sending auditing messages when it failed due - to EPERM - - nspawn: don't require selinux on if it is compiled in - - main: remove AF_UNIX sockets before binding - - shutdown: print a nice message when terminating a container - - nspawn: mount /selinux if needed - - shutdown: just call exit() if we are in a container - - umount: assume that a non-existing /dev/loop device means it - is already detached - - socket: use 777 as default mode for sockets - - main: log to the console in a container - - main: don't parse /proc/cmdline in containers - - util: add detect_container() - - nspawn: reset environment and load login shell - - core: move abstract namespace sockets to /dev/.run - - nspawn: add simple chroot(1) like tool to execute commands - in a namespace container - - util: return exit status in wait_for_terminate_and_warn() - - util: properly identify pty devices by their major - -------------------------------------------------------------------- -Sat Mar 12 14:26:28 CET 2011 - kay.sievers@novell.com - -- new snapshot - - polkit: autogenerate polkit policy with correct paths - - systemctl: support remote and privileged systemctl access - via SSH and pkexec - - gnome-ask-password-agent: fix path to watch - -------------------------------------------------------------------- -Fri Mar 11 13:59:34 CET 2011 - kay.sievers@novell.com - -- fix broken sysctl.service linking - -------------------------------------------------------------------- -Fri Mar 11 01:39:41 CET 2011 - kay.sievers@novell.com - -- new snapshot - - units: move the last flag files to /dev/.run - - util: close all fds before freezing execution - - dbus: timeout connection setup - - main: properly handle -b boot option - - pam: do not leak file descriptor if flock fails -- disable sysv services natively provided by systemd - -------------------------------------------------------------------- -Thu Mar 10 14:16:50 CET 2011 - kay.sievers@novell.com - -- new snapshot - - main: refuse system to be started in a chroot - - main: don't check if /usr really is a mount point, since it is - fine if it is passed pre-mounted to us from the initrd - - condition: take a timestamp and store last result of conditions - - dev: use /dev/.run/systemd as runtime directory, instead of - /dev/.systemd - - machine-id: move machine-id-setup to /sbin - - pkconfig: export full search path as .pc variable - - selinux: bump up error level when in non-enforcing mode - - dbus: fix dbus assert due to uninitialized error - - dbus: properly generate UnknownInterface, UnknownProperty - and PropertyReadOnly errors - - mount: use /dev/.run as an early boot alias for /var/run - -------------------------------------------------------------------- -Tue Mar 8 19:06:45 UTC 2011 - kay.sievers@novell.com - -- version 20 - - service: prefix description with LSB only if script has LSB header, - use 'SysV:' otherwise - - unit: don't accidently create ordering links to targets when - default deps are off for either target and unit - - mount: support less cumbersome x-systemd-xxx mount options - - unit: distuingish mandatory from triggering conditions - - dbus: return DBUS_ERROR_UNKNOWN_OBJECT when an object - is unknown - - systemctl: when forwarding is-enabled to chkconfig - hardcode runlevel 3 - - job: introduce new job result code 'skipped' to use when pre - conditions of job did not apply - - job: convert job type as early as we can, to simplify things - - Keep emacs configuration in one configuration file. - - syslog: make sure the kmsg bridge is always pulled in and - never terminated automatically - - mount: make /media a tmpfs - -------------------------------------------------------------------- -Mon Mar 7 17:24:46 CET 2011 - kay.sievers@novell.com - -- new snapshot - - add org.freedesktop.DBus.Properies.Set method - - main: introduce /etc/machine-id - - systemctl: fix exit code when directing is-enabled - to chkconfig - - dbus: add 'Tainted' property to Manager object - - dbus: expose distribution name and features on manager - object as properties - - man: document changed EnvironmentFile= behaviour - - main: add link to wiki page with longer explanation of the - /usr madness - - execute: load environment files at time of execution, not - when we load the service configuration - - path: after installing inotify watches, recheck file again - to fix race - - path: don't use IN_ATTRIB on parent dirs when watching a - file, since those cannot be removed without emptying the dir - first anyway and we need IN_ATTRIB only to detect the link - count dropping to 0 - - kill: always send SIGCONT after SIGTERM - - readahead: disable collector automatically on read-only media - - sysctl: use scandir() instead of nftw() to guarantee - systematic ordering - - support DT_UNKNOWN where necessary for compat with reiserfs - - systemctl: always null-terminate the password -- call systemd-machine-id-setup at installation - -------------------------------------------------------------------- -Tue Mar 1 12:28:01 CET 2011 - kay.sievers@novell.com - -- version 19 - - udev: don't ignore non-encrypted block devices with no - superblock - - udev: expose ttyUSB devices too - - udev: mark hvc devices for exposure in systemd - - cryptsetup: add a terse help - - agent: don't print warnings if a password was removed or - timed out - - systemctl: shutdown agent explicitly so that it can reset - the tty properly - - never clean up a service that still has a process in it - - label: udev might be making changes in /dev while we - iterate through it - - systemctl: properly handle job results - - job: also trigger on-failure dependencies when jobs faile - due to dependencies, timeout - - job: when cancelling jobs, make sure to propagate this - properly to depending jobs - - job: start job timeout on enqueuing not when we start to - process a job - - unit: increase default timeout to 3min - - logger: leave the logger longer around and allow it do - handle more connections - - dbus: pass along information why a job failed when it - failed (dbus api change!) - - general: unify error code we generate on timeout - - units: synchronize gettys to plymouth even if plymouth is - killed by gdm - - job: start job timer when we begin running the job, not - already when we add it to the queue of jobs - - cryptsetup: try to show the mount point for a crypto disk - if we can - - rescue: terminate plymouth entirely when going into - rescue mode - - ask-password: fix handling of timeouts when waiting - for password - - ask-password: supported plymouth cached passwords - - main: print warning if /usr is on a seperate partition - - ensure we start not a single getty before plymouth is - gone because we never know which ttys plymouth still controls - - unit: introduce ConditionVirtualization= - -------------------------------------------------------------------- -Mon Feb 21 19:30:30 CET 2011 - kay.sievers@novell.com - -- new snapshot - - dbus: don't rely that timer/path units have an initialized - unit field (bnc#671561) - -------------------------------------------------------------------- -Mon Feb 21 13:58:51 CET 2011 - kay.sievers@novell.com - -- new snapshot - - order network mounts after network.target (bnc#672855) - -------------------------------------------------------------------- -Mon Feb 21 04:19:15 CET 2011 - kay.sievers@novell.com - -- new snapshot - - kmsg-syslogd: increase terminate timeout to 5min to generte - less debug spew - - shutdown(8) - call kexec if kexec kernel is loaded (bnc#671673) - - unit: don't timeout fsck - - man: fixed typo in SyslogIdentifier= - - tmpfiles: never clean up block devices - - main: refuse --test as root - -------------------------------------------------------------------- -Fri Feb 18 13:52:22 CET 2011 - kay.sievers@novell.com - -- new snapshot - - units: order fsck@.service before basic.target - instead of local-fs.target to relax things a little - - readahead: remove misleading error messages - - man: don't do more reloads than necessary in spec files - - util: retry opening a TTY on EIO - - util: beef up logic to find ctty name - - tmpfiles: kill double slashes in unix socket names -- drop vhangup patch, it is fixed in login(3) by forwarding the - SIGHUP to the child process - -------------------------------------------------------------------- -Fri Feb 18 09:33:55 UTC 2011 - coolo@novell.com - -- revert back to conflicts: sysvinit - -------------------------------------------------------------------- -Thu Feb 17 15:04:44 CET 2011 - werner@suse.de - -- Add temporary workaround for bnc#652633, that is do a vhangup - to all processes on a tty line used for a getty - -------------------------------------------------------------------- -Wed Feb 16 21:39:20 CET 2011 - kay.sievers@novell.com - -- version 18 - - systemctl: introduce --ignore-dependencies - - systemctl: introduce --failed to show only failed services - - systemctl: introduce --failed to show only failed services - - rescue: make 'systemctl default' fail if there is already - something running when the shell exited - - util: seperate welcome line from other output by empty lines - - manager: don't consider transaction jobs conflicting with - queued jobs redundant - - udev: ignore block devices which no known contents, to avoid - trying of mounts/swapons when devices aren't set up full yet - - swap: handle "nofail" from fstab - - mount,swap: properly add dependencies to logger if needed - - service: change default std output to inherit - - exec: introduce global defaults for the standard output - of services - - udev: use SYSTEMD_READY to mask uninitialized DM devices - - fsck: output to /dev/console by default in addition to syslog - - execute: optionally forward program output to /dev/console in - addition to syslog/kmsg - - socket: refuse socket activation for SysV services - - fsck: do not fail boot if fsck returns with an error code that - hasn't 2 or 6 set - - shutdown: execute all binaries in /lib/systemd/system-shutdown - as last step before invoking reboot() - - job: make status message printing more verbose - - cryptsetup: fix unit file description - - tmpfiles: never delete AF_UNIX sockets that are alive - - getty: don't parse console= anymore, use - /sys/class/tty/console/active instead - - properly resolve /dev/console if more than once console= - argument was passed on the kernel command line - - getty: do not auto-spawn getty's on VC ttys if console=ttyN - - fsck: skip root fsck if dracut already did it - - util: when determining the right TERM for /dev/console - consult /sys/class/tty/console/active - - pam: introduce whitelist and blacklist user list feature - - systemctl: minor optimizations - - systemctl: don't unnecessarily close stdin/stdout/stderr for - tty agent so that locking by tty works - - readahead: disable readahead in virtual machines - - tmpfiles: move binary to /bin to make it publicly available - - tmpfiles: take names of tmpfiles configuration files on the - command line - - tmpfiles: log to stderr if possible - - tmpfiles: support globs - - units: introduce and hook up sound.target - - dbus: allow all clients access to org.freedesktop.DBus.Peer - - consider udev devices with SYSTEMD_READY=0 as unplugged - - systemctl: don't start agent for --user - - systemctl: make sure the tty agent does not retain a copy - of stdio - -------------------------------------------------------------------- -Tue Feb 8 19:10:06 CET 2011 - kay.sievers@novell.com - -- new snapshot - - plymouth: move plymouth out of TARGET_FEDORA - - build-sys: fix AC_COMPILE_IFELSE tests - - build-sys: ensure selinux configure check follows logic of - other optional features - - build-sys: autodetect and use pkg-config for libselinux - - dbus: use ControlGroup as property name to match config option - - pam: optionally reset cgroup memberships for login sessions - - load-fragment: properly parse Nice= value - - automount: use unit_pending_inactive() where appropriate - -------------------------------------------------------------------- -Tue Feb 8 17:40:29 CET 2011 - jeffm@suse.de - -- Removed unecessary workaround for plymouth startup. - -------------------------------------------------------------------- -Fri Feb 4 21:24:11 CET 2011 - jeffm@suse.de - -- Split plymouth support into systemd-plymouth package. - -------------------------------------------------------------------- -Sat Jan 22 14:42:34 CET 2011 - kay.sievers@novell.com - -- new snapshot - - clang: fix some issues found with clang-analyzer - - gcc: make gcc shut up - -------------------------------------------------------------------- -Sat Jan 22 14:40:24 CET 2011 - kay.sievers@novell.com - -- version 17 - - vala 0.10 seem to work fine - - cryptsetup: fix ordering loop when dealing with encrypted - swap devices - - main: don't warn if /etc/mtab is a symlink to /proc/mounts - - socket: don't crash if the .service unit for a .socket unit - is not found - - mount: ignore if an fsck is requested for a bind mount, - so that we don't wait for the bind 'device' to show up - - automount: fix segfault when shutting down - - man: give an example for vconsole.conf - - dbus: don't try to connect to the system bus before it is - actually up - - service: make chain of main commands and control commands - independent of each other, so that both can be executed - simultaneously and independently - - service: don't allow reload operations for oneshot services - - vala: convert from dbus-glib to gdbus - - systemctl: highlight failed processes in systemctl status - - systemctl: show process type along process exit codes - - service: when reloading a service fails don't fail the entire - service but just the reload job - -------------------------------------------------------------------- -Wed Jan 19 12:55:40 CET 2011 - kay.sievers@novell.com - -- new snapshot - - shutdown: use correct kexec options - - serial-getty: do not invoke /sbin/securetty; recent - pam_securetty looks for console= in /proc/cmdline - - systemctl: before spawning pager cache number of columns - - pam: optionally keep processes of root user around - - service: if a reload operation fails, don't shut down - the service - - execute: make sending of SIGKILL on shutdown optional - - mount: do not translate uuids to lowercase - - man: document missing KillSignal= and swap options -- require recent util-linux -- drop mtab symlink creation which is done in util-linux - -------------------------------------------------------------------- -Sat Jan 8 19:25:40 CET 2011 - kay.sievers@novell.com - -- version 16 - - device: don't warn if we cannot bump the udev socket buffer - - logger: when passing on PID info, fall back to our own if - originating process is already gone - - service: don't hit an assert if information in LSB headers is - incorrectly formatted - - execute,util: fix two small memory leaks - - getty: unset locale before execution - - execute: drop empty assignments from env blocks on execution - but keep them around otherwise to make them visible - - umount: don't try to detach the dm device the root dir is on, - to minimize warning messages - - locale: fix variable names - - fragment: allow prefixing of the EnvironmentFile= - path with - to ignore errors - - util: don't pass invalid fd to fdopendir() on error to avoid - corruption of errno - - tmpfiles: nicer message when two or more conflicting lines - are configured for the same file - - fragment: properly handle quotes in assignments in - EnvironmentFile= files - - sysctl: don't warn if sysctls are gone - - readahead: ignore if files are removed during collection or - before replay - - serial: use TERM=vt100 instead of TERM=vt100-nav - - cryptsetup: call mkswap on dm device, not on source device - - mount-setup: mount /dev/pts with mode=620,gid=5 by default - and make GID overridable via configure switch - - systemctl: implement auto-pager a la git - - shutdown: drop redundant sync() invocation - - util: invoke sync() implicitly on freeze() - - tmpfiles: do no follow symlinks when cleaning up dirs - -------------------------------------------------------------------- -Tue Dec 28 22:08:28 CET 2010 - jeffm@suse.de - -- Add support for building plymouth support with openSUSE - -------------------------------------------------------------------- -Mon Dec 27 22:15:41 CET 2010 - kay.sievers@novell.com - -- new snapshot - - pam: do not sort user sessions into their own cgroups in - the 'cpu' hierarchy - - mount-setup: drop noexec flag from default mount options - for /dev/shm - - systemd.pc: change 'session' to 'user' - -------------------------------------------------------------------- -Thu Dec 16 16:52:04 CET 2010 - kay.sievers@novell.com - -- new snapshot - - ifdef suse-only sysv script lookup code - -------------------------------------------------------------------- -Thu Dec 16 12:49:00 UTC 2010 - seife@opensuse.org - -- add bootsplash handling patch to be able to enter e.g. - crypto passphrases (bnc#659885) - -------------------------------------------------------------------- -Thu Dec 9 18:54:15 CET 2010 - kay.sievers@novell.com - -- new snapshot - - add LSB 'smtp' alias for mail-transport-agent.target - -------------------------------------------------------------------- -Wed Dec 8 12:43:53 CET 2010 - kay.sievers@novell.com - -- new snapshot - - path: fix watching the root directory - - update README - -------------------------------------------------------------------- -Fri Nov 26 19:17:46 CET 2010 - kay.sievers@novell.com - -- new snapshot - - gnome-ask-password-agent: also support libnotify < 0.7 for now - - udev: increase event buffer size -- require fsck -l - -------------------------------------------------------------------- -Thu Nov 25 06:45:41 CET 2010 - kay.sievers@novell.com - -- version 15 - - dbus: use the right data slot allocator - - manager: bump up max number of units to 128K - - build-sys: allow cross-compilation -- revert too new libnotify code/requirement -- revert fsck -l option requirement - -------------------------------------------------------------------- -Tue Nov 23 11:49:43 CET 2010 - kay.sievers@novell.com - -- new snapshot - - units: simplify shutdown scripts - - logger: fix error handling - - swap: order file-based swap devices after remount-rootfs -- revert too new libnotify code/requirement -- revert fsck -l option requirement - -------------------------------------------------------------------- -Mon Nov 22 10:10:59 CET 2010 - kay.sievers@novell.com - -- new snapshot - - systemctl: don't return LSB status error codes for 'show' - - mount: do not try to mount disabled cgroup controllers - - man: document /etc/modules-load.d/, /etc/os-release, - locale.conf, /etc/vconsole.conf, /etc/hostname - - units: move a couple of units from base.target to - sysinit.target - - man: reorder things to follow the same order everywhere -- revert too new libnotify code/requirement -- revert fsck -l option requirement - -------------------------------------------------------------------- -Sat Nov 20 19:58:14 CET 2010 - kay.sievers@novell.com - -- version 13 - - cryptsetup: actually show disk name - - cryptsetup: show udev device name when asking for password - - sysctl: implement native tool and support /etc/sysctl.d - - units: enable console ask-password agent by default - - introduce /etc/os-release distro description - - job: make sure we don't fail umount.target if a mount unit - failed to stop - - cgroup: after killing cgroup processes, ensure the group is - really dead gone. wait for 3s at max - - cgroup: if we couldn't remove a cgroup after killing - evertyhing in it then it's fine - - cryptsetup: automatically order crypt partitions before - cryptsetup.target - - man: trivial BindTo description fix - - manager: make list of default controllers configurable - - build: expose libcryptsetup dependency in build string - - pam: document controllers= switch - - cgroup: by default, duplicate service cgroup in the cpu hierarchy - - pam: duplicate cgroup tree in the cpu hierarchy by default, - optionally more -- enable native crypto handling instead of boot.crypto -- revert too new libnotify code/requirement -- revert fsck -l option requirement - -------------------------------------------------------------------- -Wed Nov 17 01:32:04 CET 2010 - kay.sievers@novell.com - -- version 12 - - ask-password: add --console mode to ask /dev/console -- revert too new libnotify code/requirement - -------------------------------------------------------------------- -Tue Nov 16 11:47:28 CET 2010 - kay.sievers@novell.com - -- new snapshot - - cryptsetup: reword questions a little - - units: order hwclock after readahead - - path: don't mention too many inotify msgs - - cryptsetup: include device name in password question - - cryptsetup: lock ourselves into memory as long as we deal - with passwords - - plymouth: use updated socket name - - units: set TERM for gettys again, since they acquire a TTY - - units: allow start-up of plymouth ask-password agent very early - - units: enable ask-paswword .path units early enough to be useful - for early mounts - - units: delay getty until logins are allowed - - pam: always rely on loginuid instead of uid to determine cgroup - and XDG_RUNTIME_DIR name - - cgroup: call root cgroup system instead of systemd-1 - - exec: determine right TERM= setting based on tty name - - pam: rename master user cgroup to 'master' - - drop support for MANAGER_SESSION, introduce MANAGER_USER - - units: use ConditionDirectoryNotEmpty= where applicable - - unit: introduce ConditionDirectoryNotEmpty= - - delete tmp.mount which may conflict with an unrelated fstab - entry -- revert too new libnotify code/requirement -- disable native crypto handling - -------------------------------------------------------------------- -Mon Nov 15 18:45:31 CET 2010 - kay.sievers@novell.com - -- new snapshot - - load-dropin: add support for .requires directories - - manager: consider jobs already installed as redundant when - reducing new transactions - - manager: always pull 'following' units into transaction - - util: always highlight distro name - - units: make use of agetty mandatory - - manager: don't fail transaction if adding CONFLICTED_BY job fails - - job: make it possible to wait for devices to be unplugged - - tmpfiles: ignore files marked with the sticky bit - - cryptsetup: handle password=none properly - - cryptsetup: properly parse cipher= switch - - cryptsetup: support non-LUKS crypto partitions - - ask-password: enable password agent - - automatically start cryptsetup when looking for mount source - - log: add automatic log target - - cryptsetup: hook up tool with ask-password - - manager: hookup generators - - split mount_point_is_api() and mount_point_ignore() -- replace boot.crypto job with systemd native crypto handling -- enable readahead (requires 2.6.37+ kernel's fanotify to work) - -------------------------------------------------------------------- -Thu Nov 11 07:44:02 CET 2010 - kay.sievers@novell.com - -- new snapshot - - tmpfiles: include reference to man page in tmpfiles files - - vconsole: support additional keymap for toggling layouts - - main: warn if /etc/mtab is not a symlink - - add bash completion for systemctl --system - - man: minor tmpfiles(5) updates and reindenting - - main: rename process on startup to 'systemd' to avoid confusion - - unit: add ConditionNull= condition - - ac-power: make ac-power a proper binary that scripts can call - - manager: parse RD_TIMESTAMP passed from initrd - - modules-load: fix minor race - - label: use internal utility functions wher epossible - - cryptsetup: minimal cryptsetup unit generator - - selinux: relabel /dev after loading policy - - log: downgrade syslog connection failure message - - service: delay automatic restart if job is pending - - manager: when isolating undo all pending jobs, too - - manager: only minimize impact if we are in fail mode -- replace /etc/mtab with link to /proc/self/mounts - -------------------------------------------------------------------- -Fri Nov 5 00:28:10 CET 2010 - kay.sievers@novell.com - -- new snapshot - - man/tmpfiles.d.xml: add a manpage for tmpfiles - - do not overwrite other udev tags - - readahead: shortcut replay if /.readahead doesn't exist - -------------------------------------------------------------------- -Fri Oct 29 21:20:57 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - fsck: return SUCCESS when we skip the check - - fsck: skip checking / if it is writable - - units: fix variable expansion - - mount: don't pull in nofail mounts by default, but use them - if they are around - - job: recursively fail BoundBy dependencies - - fsck: fix target name to check for - - units: rename fedora/single.service to rescue.service - - units: introduce plymouth-start and plymouth-kexec - - unit: get rid of IgnoreDependencyFailure= - - use util-linux:agetty instead of mingetty - - unit: replace StopRetroactively= by BindTo= dependencies - - automount: show who's triggering an automount - - units: run sysctl only if /etc/sysctl.conf exists - - systemctl: always show what and where for mount units - - shutdown: reword a few messages a little - - manager: show which jobs are actually installed after a transaction - - timer: when deserializing timer state stay elapsed - - device: set recursive_stop=true by default - - unit: suppress incorrect deserialization errors - - swap: there's no reason not order swap after sysinit - - socket: fix IPv6 availability detection - -------------------------------------------------------------------- -Wed Oct 27 12:00:26 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - create /dev/stderr and friends early on boot - - run sysv related scripts with TERM=linux - - add only swaps listed in /etc/fstab automatically to swap.target - - errors: refer to systemctl status when useful - - swap: add default cgroup to swap exec env - - readahead: bump a device's request_nr when enabling readahead - - shutdown: properly handle sigtimedwait() timing out - - main: fix typo in kernel cmdline parameters help - - ord-tty: properly handle SIGINT/SIGTERM - - systemctl: automatically spawn temporary password agent - - ask-password: properly handle multiple pending passwords - - ask-password: enable plymouth agent by default - - ask-password: add minimal plymouth password agent - -------------------------------------------------------------------- -Tue Oct 26 13:10:01 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - make sure to pass TERM=linux to all sysv scripts - - don't unset HOME/TERM when run in session mode - - mount: add nosuid,nodev,noexec switches to /var/lock and /var/run - - tmpfiles: Don't clean /var/lock/subsys - - tmpfiles: Make wtmp match utmp perms, and add btmp - - umount: Make sure / is remounted ro on shutdown - - unset HOME and TERM set from the kernel - - activate wall agent automatically - - ask-password: add basic tty agent - -------------------------------------------------------------------- -Sat Oct 23 18:09:23 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - rename ask-password-agent to gnome-ask-password-agent - - fsck: suppress error message if we cannot change into single - user mode since - - dbus: epose FsckPassNo property for service objects - - man: document systemctl --force - - introduce 'systemctl kill' - -------------------------------------------------------------------- -Sat Oct 23 14:57:57 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - syslog: enable kmsg bridge by default - - fsck: add initial version of fsck and quotacheck wrappers - - tmpfiles: remove forcefsck/fastboot flag files after boot - - swap: listen for POLLPRI events on /proc/swaps if availabled - - tmpfiles: integrate native tmpwatch - - shutdown: loop only as long as we manage to unmount/detach devices - - umount: disable dm devices by devnode, not by path name - - introduce final.target - - replace distro-specific shutdown scripts with native services - - try to get rid of DM devices - - log to console by default - - introduce kexec.service, kexec.target and exit.target - - hook in fsck@.service instance for all mount points with passno > 0 - - systemctl: warn if user enables unit with no installation instructions - - dbus: add introspection to midlevel paths - - look for dynamic throw-away units in /dev/.systemd/system - - major rework, use /sbin/swapon for setting up swaps - - introduce Restart=on-failure and Restart=on-abort - - units: enable utmp for serial gettys too - - rename 'banned' load state to 'masked' - - optionally, create INIT_PROCESS/DEAD_PROCESS entries for a service -- use systemd-native fsck/mount -- use systemd-native tmpfiles.d/ instead of tmpwatch - -------------------------------------------------------------------- -Fri Oct 8 14:49:04 CEST 2010 - kay.sievers@novell.com - -new snapshot - - fix 'systemctl enable getty@.service' - - properly support 'banning' of services - - handle nologin - - add native reboot/shutdown implementation - -------------------------------------------------------------------- -Thu Oct 7 15:58:10 CEST 2010 - kay.sievers@novell.com - -- version 11 - -------------------------------------------------------------------- -Wed Oct 6 09:27:13 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - readahead fixes - -------------------------------------------------------------------- -Sun Oct 3 08:08:13 UTC 2010 - aj@suse.de - -- /etc/modules.d was renamed to modules-load.d -- only include tmpfiles.d/*conf files - -------------------------------------------------------------------- -Wed Sep 29 11:55:11 CEST 2010 - kay.sievers@novell.com - -- don't create sysv order deps on merged units -- fix Provides: handling in LSB headers (network.target) -- native (optional) readahead - -------------------------------------------------------------------- -Sun Sep 26 20:39:53 UTC 2010 - aj@suse.de - -- Do not package man pages twice. - -------------------------------------------------------------------- -Wed Sep 22 11:40:02 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - basic services are enabled by default now - -------------------------------------------------------------------- -Tue Sep 21 14:39:02 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - vconsole and locale setup - - hook up tmpwatch - -------------------------------------------------------------------- -Fri Sep 17 10:58:24 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - add new utility to initialize the virtual console - - initialize locale from /etc/locale by default - - ask-password: allow services query SSL/harddisk passphrases - -------------------------------------------------------------------- -Fri Sep 17 10:54:24 CEST 2010 - kay.sievers@novell.com - -- version 10 - - logger: support SOCK_STREAM /dev/log sockets - - make sure the file system is writable before we write utmp data - - systemctl: use isolate when called as telinit for a runlevel - - initctl: properly use isolate when activating runlevels - - set HOME=/root when running shells - - make sure we don't crash if there's an automount unit without - mount unit - - start logger only after syslog is up - -------------------------------------------------------------------- -Fri Sep 3 11:52:42 CEST 2010 - kay.sievers@novell.com - -- version 9 - - units: don't add shutdown conflicts dep to umount.target - - dbus: don't send cgroup agent messages directly to system bus - - dbus: don't accept activation requests anymore if we are going - down anyway - - systemctl: fix return value of systemctl start and friends - - service: wait for process exit only if we actually killed - somebody - -------------------------------------------------------------------- -Thu Aug 26 22:14:04 CEST 2010 - kay.sievers@novell.com - -- version 8 - - KERNEL 2.6.36+ REQUIRED! - - mount cgroup file systems to /sys/fs/cgroup instead of /cgroup - - invoke sulogin instead of /bin/sh - - systemctl: show timestamps for state changes - - add global configuration options for handling of auto mounts - -------------------------------------------------------------------- -Fri Aug 20 06:51:26 CEST 2010 - kay.sievers@novell.com - -- apply /etc/fstab mount options to all api mounts -- properly handle LABEL="" in fstab -- do not consider LSB exit codes 5 and 6 as failure - -------------------------------------------------------------------- -Tue Aug 17 22:54:41 CEST 2010 - kay.sievers@novell.com - -- prefix sysv job descriptions with LSB: -- add native sysctl + hwclock + random seed service files -- properly fallback to rescue.target if default.target is hosed -- rename ValidNoProcess= to RemainAfterExit= -- add systemd-modules-load tool to handle /etc/modules.d/ - -------------------------------------------------------------------- -Tue Aug 17 09:01:04 CEST 2010 - kay.sievers@novell.com - -- add support for delayed shutdown, similar to sysv in style -- rename Type=finish to Type=oneshot and allow multiple ExecStart= -- don't show ENOENT for non exitent configuration files -- log build time features on startup -- rearrange structs to make them smaller -- move runlevel[2-5] links to /lib -- create default.target link to /lib not /etc -- handle random-seed -- write utmp record before we kill all processes -- create /var/lock/subsys, /var/run/utmp - -------------------------------------------------------------------- -Wed Aug 11 11:29:17 CEST 2010 - kay.sievers@novell.com - -- add audit messages for service changes -- update utmp with external program -- all to refuse manual service starting/stopping - -------------------------------------------------------------------- -Tue Aug 10 06:54:23 CEST 2010 - kay.sievers@novell.com - -- version 7 - - hide output if quiet is passed on the kernel cmdline - - fix auto restarting of units after a configuration reload - - don't call bus_path_escape() with NULL unit name - -------------------------------------------------------------------- -Fri Aug 6 13:07:35 CEST 2010 - kay.sievers@novell.com - -- version 6 - - man page update - -------------------------------------------------------------------- -Fri Aug 6 09:48:34 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - downgrade a few log messages - - properly handle devices which are referenced before they exist - -------------------------------------------------------------------- -Fri Aug 6 01:59:50 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - fix dependency cycle of boot.* by splitting fsck.target - - sort boot.* before other sysv services - from sysinint.target - - start getty for serial console - -------------------------------------------------------------------- -Thu Aug 5 23:12:32 CEST 2010 - kay.sievers@novell.com - -- add licence to subpackages - -------------------------------------------------------------------- -Wed Aug 4 12:42:23 CEST 2010 - kay.sievers@novell.com - -- version 5 - - selinux fixes -- fix hanging 'reboot' started from vc - -------------------------------------------------------------------- -Mon Aug 2 16:33:20 CEST 2010 - kay.sievers@novell.com - -- enable getty.target by default - -------------------------------------------------------------------- -Sat Jul 24 11:16:52 CEST 2010 - kay.sievers@novell.com - -- at install, read old inittab for the defaul target/runlevel -- disable services on package uninstall - -------------------------------------------------------------------- -Sat Jul 24 09:50:05 CEST 2010 - kay.sievers@novell.com - -- version 4 - - merge systemd-install into systemctl - -------------------------------------------------------------------- -Fri Jul 23 10:39:19 CEST 2010 - kay.sievers@novell.com - -- create config files in /etc in %post -- mark files in /etc as config -- remove nodev from /dev/pts -- add selinux support - -------------------------------------------------------------------- -Thu Jul 22 10:51:16 CEST 2010 - kay.sievers@novell.com - -- version 4 (pre) - - require newer vala - - add [Install] section to getty.target and remote-fs.target -- re-enable post-build check - -------------------------------------------------------------------- -Wed Jul 21 08:51:22 CEST 2010 - kay.sievers@novell.com - -- do not add sysv services that are not enabled in /etc/rcN.d/ -- allow symlinking unit files to /dev/null -- remove only pam sessions we ourselves created -- unit files in /etc/ always take precedence, even over link targets - -------------------------------------------------------------------- -Tue Jul 20 21:20:43 CEST 2010 - kay.sievers@novell.com - -- fix access mode verification of FIFOs - -------------------------------------------------------------------- -Sun Jul 18 11:31:06 CEST 2010 - kay.sievers@novell.com - -- fix default mode of /var/run and /var/lock -- force /var/run and /var/lock to be on tmpfs - -------------------------------------------------------------------- -Wed Jul 14 17:49:57 CEST 2010 - kay.sievers@novell.com - -- always enable udev and dbus until we can require systemd from - packages providing systemd service files - -------------------------------------------------------------------- -Wed Jul 14 01:10:27 CEST 2010 - kay.sievers@novell.com - -- drop systemd-units.rpm - -------------------------------------------------------------------- -Wed Jul 14 00:07:24 CEST 2010 - kay.sievers@novell.com - -- version 3 - - treat non-existing cgroups like empty ones, to deal with races - - replace --running-as= by --session and --system - - always allow stopping of units that failed to load - -------------------------------------------------------------------- -Tue Jul 13 06:22:56 CEST 2010 - kay.sievers@novell.com - -- update - -------------------------------------------------------------------- -Mon Jul 12 18:23:41 CEST 2010 - kay.sievers@novell.com - -- drop libcgroup - -------------------------------------------------------------------- -Mon Jul 12 10:04:26 CEST 2010 - kay.sievers@novell.com - -- trim cgroups for services that are "active" but "exited" -- drop /bin/init hack and require now fixed mkinitrd - -------------------------------------------------------------------- -Sun Jul 11 23:38:45 CEST 2010 - kay.sievers@novell.com - -- fix reboot issue -- fix abstract namespace name handling (needs udev update) -- prefer private D-Bus socket wherever possible - -------------------------------------------------------------------- -Sun Jul 11 00:50:14 CEST 2010 - kay.sievers@novell.com - -- D-Bus 1.3.2 support -- use COLD_BOOT=1 on reboot to skip sysv boot.d/ handling - -------------------------------------------------------------------- -Fri Jul 9 10:05:00 CEST 2010 - kay.sievers@novell.com - -- fix typo in spec file - -------------------------------------------------------------------- -Fri Jul 9 09:09:33 CEST 2010 - kay.sievers@novell.com - -- provide /bin/init to be found by 'too simple' mkinitrd, and work - around mindless relinking of relative links in the buildsystem -- add rpmlintrc to silent warnings about intentional behavior - -------------------------------------------------------------------- -Fri Jul 9 06:18:52 CEST 2010 - kay.sievers@novell.com - -- version 2 - -------------------------------------------------------------------- -Thu Jul 8 23:48:09 CEST 2010 - kay.sievers@novell.com - -- fix 'reboot -w' to skip the actual reboot -- fix segfault in D-Bus code -- use unique instead of multiple keys in config file -- support continuation lines in config files -- support multiple commands in a single key in config files -- adapt log level of some messages - -------------------------------------------------------------------- -Wed Jul 7 06:20:00 CEST 2010 - kay.sievers@novell.com - -- version 1 - - default log level to INFO - - show welcome message - -------------------------------------------------------------------- -Tue Jul 6 08:55:03 CEST 2010 - kay.sievers@novell.com - -- add systemd-install --start option -- add more documentation - -------------------------------------------------------------------- -Mon Jul 5 16:23:28 CEST 2010 - kay.sievers@novell.com - -- new snapshot with extended D-Bus support - -------------------------------------------------------------------- -Sun Jul 4 21:31:49 CEST 2010 - kay.sievers@novell.com - -- new snapshot with default unit dependency handling - -------------------------------------------------------------------- -Sat Jul 3 16:54:19 CEST 2010 - kay.sievers@novell.com - -- new snapshot - -------------------------------------------------------------------- -Fri Jul 2 10:04:26 CEST 2010 - kay.sievers@novell.com - -- add more documentation - -------------------------------------------------------------------- -Thu Jul 1 17:40:28 CEST 2010 - kay.sievers@novell.com - -- new snapshot - -------------------------------------------------------------------- -Fri Jun 25 00:34:03 CEST 2010 - kay.sievers@novell.com - -- split off systemd-units.rpm which can be pulled-in by other - packages without further dependencies - -------------------------------------------------------------------- -Thu Jun 24 09:40:06 CEST 2010 - kay.sievers@novell.com - -- add more documentation - -------------------------------------------------------------------- -Tue Jun 22 22:13:02 CEST 2010 - kay.sievers@novell.com - -- more man pages and documentation - -------------------------------------------------------------------- -Tue Jun 22 18:14:05 CEST 2010 - kay.sievers@novell.com - -- conflict with upstart -- include all installed doc files - -------------------------------------------------------------------- -Tue Jun 22 09:33:44 CEST 2010 - kay.sievers@novell.com - -- provide pam module - -------------------------------------------------------------------- -Mon Jun 21 10:21:20 CEST 2010 - kay.sievers@novell.com - -- use private D-Bus connection -- properly handle replacing a running upstart - -------------------------------------------------------------------- -Fri Jun 18 09:37:46 CEST 2010 - kay.sievers@novell.com - -- implement wall message in halt/reboot/... -- speak /dev/initctl to old /sbin/init after installing - -------------------------------------------------------------------- -Thu Jun 17 23:54:59 CEST 2010 - kay.sievers@novell.com - -- drop no longer needed -fno-strict-aliasing -- add README and examples - -------------------------------------------------------------------- -Thu Jun 17 23:23:42 CEST 2010 - kay.sievers@novell.com - -- enable pam and libwrap - -------------------------------------------------------------------- -Thu Jun 17 23:10:57 CEST 2010 - kay.sievers@novell.com - -- provide systemd-sysvinit.rpm with /sbin/init and friends - -------------------------------------------------------------------- -Thu Jun 17 11:06:14 CEST 2010 - kay.sievers@novell.com - -- libwrap / pam support - -------------------------------------------------------------------- -Wed Jun 16 09:46:15 CEST 2010 - kay.sievers@novell.com - -- initial packaging of experimental version 0 - diff --git a/systemd-mini.spec b/systemd-mini.spec deleted file mode 100644 index e2e18d20..00000000 --- a/systemd-mini.spec +++ /dev/null @@ -1,1871 +0,0 @@ -# -# spec file for package systemd-mini -# -# 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via https://bugs.opensuse.org/ -# - - -# -# The git repository used to track all Suse specific changes can be -# found at: https://github.com/openSUSE/systemd. -# - -##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### -%define bootstrap 1 -##### WARNING: please do not edit this auto generated spec file. Use the systemd.spec! ##### -%define mini -mini -%define min_kernel_version 4.5 -%define suse_version +suse.47.g8521f8d22f -%define _testsuitedir /usr/lib/systemd/tests - -%if 0%{?bootstrap} -%bcond_with coredump -%bcond_with importd -%bcond_with journal_remote -%bcond_with machined -%bcond_with networkd -%bcond_with portabled -%bcond_with resolved -%bcond_with sd_boot -%bcond_with sysvcompat -%bcond_with experimental -%bcond_with testsuite -%else -%bcond_without coredump -%bcond_without importd -%bcond_without journal_remote -%bcond_without machined -%bcond_without networkd -%bcond_without portabled -%bcond_without resolved -%ifarch %{ix86} x86_64 aarch64 -%bcond_without sd_boot -%else -%bcond_with sd_boot -%endif -%bcond_without sysvcompat -%bcond_without experimental -%bcond_without testsuite -%endif -# Kept to ease migrations toward SLE -%bcond_with split_usr - -Name: systemd-mini -URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.5 -Release: 0 -Summary: A System and Session Manager -License: LGPL-2.1-or-later -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if ! 0%{?bootstrap} -BuildRequires: docbook-xsl-stylesheets -BuildRequires: kbd -BuildRequires: libapparmor-devel -BuildRequires: libgcrypt-devel -BuildRequires: libxslt-tools -BuildRequires: polkit -# python is only required for generating systemd.directives.xml -BuildRequires: python3-base -BuildRequires: python3-lxml -BuildRequires: pkgconfig(audit) -BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 -BuildRequires: pkgconfig(libdw) -BuildRequires: pkgconfig(libfido2) -BuildRequires: pkgconfig(liblz4) -BuildRequires: pkgconfig(liblzma) -BuildRequires: pkgconfig(libpcre2-8) -BuildRequires: pkgconfig(libqrencode) -BuildRequires: pkgconfig(libselinux) >= 2.1.9 -BuildRequires: pkgconfig(libzstd) -BuildRequires: pkgconfig(tss2-esys) -BuildRequires: pkgconfig(tss2-mu) -BuildRequires: pkgconfig(tss2-rc) -%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) >= 2.3.1 -%endif -%endif -BuildRequires: fdupes -BuildRequires: gperf -BuildRequires: libacl-devel -BuildRequires: libcap-devel -BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: meson >= 0.43 -BuildRequires: pam-devel -BuildRequires: python3-jinja2 -# regenerate_initrd_post macro is expanded during build, hence this -# BR. Also this macro was introduced since version 12.4. -BuildRequires: suse-module-tools >= 12.4 -BuildRequires: systemd-rpm-macros -BuildRequires: pkgconfig(blkid) >= 2.26 -BuildRequires: pkgconfig(libkmod) >= 15 -BuildRequires: pkgconfig(libpci) >= 3 -%if %{with importd} -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(zlib) -%endif -%if %{with journal_remote} -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 -%endif -%if %{with sd_boot} -BuildRequires: gnu-efi -%endif - -%if 0%{?bootstrap} -#!BuildIgnore: dbus-1 -Requires: this-is-only-for-build-envs -Provides: systemd = %{version}-%{release} -%else -# the buildignore is important for bootstrapping -#!BuildIgnore: udev -Requires: aaa_base >= 13.2 -Requires: dbus-1 >= 1.4.0 -Requires: kbd -Requires: netcfg >= 11.5 -Requires: systemd-default-settings-branding -Requires: systemd-presets-branding -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 -# ditto but dlopen()ed by systemd-cryptenroll -Recommends: libfido2 -Recommends: libtss2-esys0 -Recommends: libtss2-mu0 -Recommends: libtss2-rc0 -Requires(post): coreutils -Requires(post): findutils -Requires(post): systemd-presets-branding -Requires(post): pam-config >= 0.79-5 -%endif - -%if 0%{?bootstrap} -Conflicts: systemd -Conflicts: kiwi -%endif -Conflicts: sysvinit -Conflicts: filesystem < 11.5 -Conflicts: mkinitrd < 2.7.0 -Provides: systemd-logger = %{version}-%{release} -Obsoletes: systemd-logger < %{version}-%{release} -Provides: systemd-analyze = %{version}-%{release} -Obsoletes: pm-utils <= 1.4.1 -Obsoletes: suspend <= 1.0 -Obsoletes: systemd-analyze < 201 -Source0: systemd-v%{version}%{suse_version}.tar.xz -Source1: %{name}-rpmlintrc -Source2: systemd-user -%if %{with sysvcompat} -Source3: systemd-sysv-convert -Source4: systemd-sysv-install -%endif -Source5: tmpfiles-suse.conf -Source6: baselibs.conf -Source11: after-local.service -Source14: kbd-model-map.legacy - -Source100: scripts-systemd-fix-machines-btrfs-subvol.sh -Source101: scripts-systemd-upgrade-from-pre-210.sh -Source102: scripts-systemd-migrate-sysconfig-i18n.sh - -# Patches listed below are SUSE specific and should be kept at its -# minimum. We try hard to push our changes to upstream but sometimes -# they are only relevant for SUSE distros. Special rewards for those -# who will manage to get rid of one of them ! -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 -Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch -Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch -Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch -Patch9: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch -Patch10: 0001-conf-parser-introduce-early-drop-ins.patch -Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch -Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.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 -# repository. But in very few cases, some stuff might be broken in -# upstream and need an urgent fix. Even in this case, the patches are -# temporary and should be removed as soon as a fix is merged by -# upstream. - -%description -Systemd is a system and service manager, compatible with SysV and LSB -init scripts for Linux. systemd provides aggressive parallelization -capabilities, uses socket and D-Bus activation for starting services, -offers on-demand starting of daemons, keeps track of processes using -Linux cgroups, supports snapshotting and restoring of the system state, -maintains mount and automount points and implements an elaborate -transactional dependency-based service control logic. It can work as a -drop-in replacement for sysvinit. - -%if !0%{?bootstrap} -%package doc -Summary: HTML documentation for systemd -License: LGPL-2.1-or-later -Supplements: (systemd and patterns-base-documentation) - -%description doc -The HTML documentation for systemd. - -# /bootstrap -%endif - -%package devel -Summary: Development headers for systemd -License: LGPL-2.1-or-later -Requires: libsystemd0%{?mini} = %{version}-%{release} -Requires: systemd-rpm-macros -%if 0%{?bootstrap} -Conflicts: systemd-devel -%endif - -%description devel -Development headers and auxiliary files for developing applications for systemd. - -%package sysvinit -Summary: System V init tools -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -Provides: sbin_init -Conflicts: sbin_init -Provides: systemd-sysvinit = %{version}-%{release} -Provides: sysvinit:/sbin/init - -%description sysvinit -Drop-in replacement of System V init tools. - -%package -n libsystemd0%{?mini} -Summary: Component library for systemd -License: LGPL-2.1-or-later -%if 0%{?bootstrap} -Conflicts: libsystemd0 -Requires: this-is-only-for-build-envs -%endif - -%description -n libsystemd0%{?mini} -This library provides several of the systemd C APIs: - -* sd-bus implements an alternative D-Bus client library that is - relatively easy to use, very efficient and supports both classic - D-Bus as well as kdbus as transport backend. - -* sd-daemon(3): for system services (daemons) to report their status - to systemd and to make easy use of socket-based activation logic - -* sd-event is a generic event loop abstraction that is built around - Linux epoll, but adds features such as event prioritization or - efficient timer handling. - -* sd-id128(3): generation and processing of 128-bit IDs - -* sd-journal(3): API to submit and query journal log entries - -* sd-login(3): APIs to introspect and monitor seat, login session and - user status information on the local system. - -%package -n udev%{?mini} -Summary: A rule-based device node and kernel event manager -License: GPL-2.0-only -URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html -Requires: %{name} = %{version}-%{release} -%systemd_requires -Requires: kmod -Requires: system-group-hardware -Requires: group(kvm) -Requires(post): sed -Requires(post): coreutils -Requires(postun): coreutils - -Conflicts: filesystem < 11.5 -Conflicts: mkinitrd < 2.7.0 -Conflicts: dracut < 044.1 -Conflicts: util-linux < 2.16 -Conflicts: ConsoleKit < 0.4.1 -Requires: filesystem -%if 0%{?bootstrap} -Provides: udev = %{version}-%{release} -Conflicts: libudev1 -Conflicts: udev -# avoid kiwi picking it for bootstrap -Requires: this-is-only-for-build-envs -%endif - -%description -n udev%{?mini} -Udev creates and removes device nodes in /dev for devices discovered or -removed from the system. It receives events via kernel netlink messages -and dispatches them according to rules in %{_udevrulesdir}/. Matching -rules may name a device node, create additional symlinks to the node, -call tools to initialize a device, or load needed kernel modules. - -%package -n libudev%{?mini}1 -Summary: Dynamic library to access udev device information -License: LGPL-2.1-or-later -%if 0%{?bootstrap} -Conflicts: libudev1 -Conflicts: kiwi -# avoid kiwi picking it for bootstrap -Requires: this-is-only-for-build-envs -%endif - -%description -n libudev%{?mini}1 -This package contains the dynamic library libudev, which provides -access to udev device information - -%package -n libudev%{?mini}-devel -Summary: Development files for libudev -License: LGPL-2.1-or-later -Requires: libudev%{?mini}1 = %{version}-%{release} -%if 0%{?bootstrap} -Provides: libudev-devel = %{version}-%{version} -Conflicts: libudev1 = %{version} -Conflicts: libudev-devel -%endif - -%description -n libudev%{?mini}-devel -This package contains the development files for the library libudev, a -dynamic library, which provides access to udev device information. - -%if %{with coredump} -%package coredump -Summary: Systemd tools for coredump management -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -%systemd_requires -Provides: systemd:%{_bindir}/coredumpctl - -%description coredump -Systemd tools to store and manage coredumps. - -This package contains systemd-coredump, coredumpctl. -%endif - -%package container -Summary: Systemd tools for container management -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -%systemd_requires -Provides: systemd:%{_bindir}/systemd-nspawn -%if 0%{?bootstrap} -Conflicts: systemd-container -%endif - -%description container -Systemd tools to spawn and manage containers and virtual machines. - -This package contains systemd-nspawn, machinectl, systemd-machined, -and systemd-importd. - -%if %{with networkd} || %{with resolved} -%package network -Summary: Systemd tools for networkd and resolved -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -%systemd_requires -# This Recommends because some symbols of libidn2 are dlopen()ed by resolved -Recommends: pkgconfig(libidn2) -BuildRequires: pkgconfig(libidn2) -Provides: systemd:/usr/lib/systemd/systemd-networkd -Provides: systemd:/usr/lib/systemd/systemd-resolved - -%description network -Systemd tools to manage network settings using networkd and -resolver tools for resolved - -%endif - -%if %{with portabled} -%package portable -Summary: Systemd tools for portable services -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -%systemd_requires - -%description portable -Systemd tools to manage portable services. The feature is still -considered experimental so the package might change or vanish. -Use at own risk. - -More information can be found online: - -http://0pointer.net/blog/walkthrough-for-portable-services.html -https://systemd.io/PORTABLE_SERVICES -%endif - -%if ! 0%{?bootstrap} -%package -n nss-systemd -Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later - -%description -n nss-systemd -This package contains a plugin for the Name Service Switch (NSS), -which enables resolution of all dynamically allocated service -users. (See the DynamicUser= setting in unit files.) - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-systemd(8) manpage for more details. - -%package -n nss-myhostname -Summary: Plugin for local system host name resolution -License: LGPL-2.1-or-later - -%description -n nss-myhostname -This package contains a plug-in module for the Name Service Switch -(NSS), primarly providing hostname resolution for the locally -configured system hostname as returned by gethostname(2). For example, -it resolves the local hostname to locally configured IP addresses, as -well as "localhost" to 127.0.0.1/::1. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-hostname(8) manpage for more details. -%endif - -%if %{with resolved} -%package -n nss-resolve -Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1-or-later -Requires: %{name}-network = %{version}-%{release} - -%description -n nss-resolve -This package contains a plug-in module for the Name Service Switch -(NSS), which enables host name resolutions via the systemd-resolved(8) -local network name resolution service. It replaces the nss-dns plug-in -module that traditionally resolves hostnames via DNS. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. -%endif - -%if %{with machined} -%package -n nss-mymachines -Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later - -%description -n nss-mymachines -This package contains a plugin for the Name Service Switch (NSS), -providing host name resolution for all local containers and virtual -machines registered with systemd-machined to their respective IP -addresses. It also maps UID/GIDs ranges used by containers to useful -names. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-mymachines(8) manpage for more details. -%endif - -%if %{with journal_remote} -%package journal-remote -Summary: Gateway for serving journal events over the network using HTTP -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -%systemd_requires - -%description journal-remote -This extends the journal functionality to keep a copy of logs on a -remote server by providing programs to forward journal entries over -the network, using encrypted HTTP, and to write journal files from -serialized journal contents. - -This package contains systemd-journal-gatewayd, -systemd-journal-remote, and systemd-journal-upload. -%endif - -%if %{with testsuite} -%package testsuite -Summary: Testsuite for systemd -# Unit tests dependencies -License: LGPL-2.1-or-later -Recommends: python3 -Recommends: python3-colorama -# Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) -Recommends: dosfstools -# The following deps on libs are for test-dlopen-so whereas the -# pkgconfig ones are used by test-funtions to find the libs on the -# host and install them in the image, see install_missing_libraries() -# for details. -%if %{with resolved} -Requires: libidn2 pkgconfig(libidn2) -%endif -%if %{with experimental} -Requires: libpwquality1 pkgconfig(pwquality) -Requires: libqrencode4 pkgconfig(libqrencode) -%endif -Requires: %{name} = %{version}-%{release} -Requires: attr -Requires: binutils -Requires: busybox-static -Requires: cryptsetup -Requires: dosfstools -Requires: libcap-progs -Requires: lz4 -Requires: netcat -Requires: qemu-kvm -Requires: quota -Requires: socat -Requires: squashfs -Requires: systemd-container -Requires: libfido2 pkgconfig(libfido2) -Requires: libtss2-esys0 pkgconfig(tss2-esys) -Requires: libtss2-mu0 pkgconfig(tss2-mu) -Requires: libtss2-rc0 pkgconfig(tss2-rc) -%if %{with coredump} -Requires: systemd-coredump -%endif -%if %{with experimental} -Requires: systemd-experimental -%endif -%if %{with journal_remote} -Requires: systemd-journal-remote -%endif -%if %{with portabled} -Requires: systemd-portable -%endif -Requires: xz - -%description testsuite -This package contains the unit tests as well as the extended -testsuite. The unit tests are used to check various internal functions -used by systemd whereas the extended testsuite is used to test various -functionalities of systemd and all its components. - -Note that the extended testsuite only works with UID=0. - -Run the following python script to run all unit tests at once: -$ %{_testsuitedir}/run-unit-tests.py - -To run the full extended testsuite do the following: -$ NO_BUILD=1 %{_testsuitedir}/test/run-integration-tests.sh - -Or to run one specific integration test: -$ NO_BUILD=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run - -For more details on the available options to run the extended -testsuite, please refer to %{_testsuitedir}/test/README.testsuite. -%endif - -%if %{with experimental} -%package experimental -Summary: Experimental systemd features -License: LGPL-2.1-or-later -Requires: %{name} = %{version}-%{release} -%systemd_requires -# These Recommends because some symbols of these libs are dlopen()ed by home stuff -Recommends: libfido2 -Recommends: libpwquality1 -Recommends: libqrencode4 -# libfido2, libpwquality1 and libqrencode4 are build requirements for home stuff -BuildRequires: pkgconfig(libfido2) -BuildRequires: pkgconfig(libqrencode) -BuildRequires: pkgconfig(pwquality) -# fdisk and openssl are build requirements for home stuff and repart -BuildRequires: pkgconfig(fdisk) -BuildRequires: pkgconfig(openssl) - -%description experimental -This package contains optional extra services that are considered as -previews and are provided so users can do early experiments with the -new features or technologies without waiting for them to be fully -supported by either upstream and openSUSE. - -Please note that all services should be considered in development -phase and as such their behaviors details, unit files, option names, -etc... are subject to change without the usual backwards-compatibility -promises. - -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, pstore, repart, userdbd. - -Have fun with these services at your own risk. -%endif - -%if ! 0%{?bootstrap} -%lang_package -%endif - -%prep -%setup -q -n systemd-v%{version}%{suse_version} -%autopatch -p1 - -%build -# keep split-usr until all packages have moved their systemd rules to /usr -%meson \ - -Dmode=release \ - -Dversion-tag=%{version}%{suse_version} \ - -Ddocdir=%{_docdir}/systemd \ -%if %{with split_usr} - -Drootprefix=/usr \ - -Dsplit-usr=true \ -%endif - -Dsplit-bin=true \ - -Dsystem-uid-max=499 \ - -Dsystem-gid-max=499 \ - -Dpamconfdir=no \ - -Dpamlibdir=%{_pam_moduledir} \ - -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ - -Drpmmacrosdir=no \ - -Dcertificate-root=%{_sysconfdir}/pki/systemd \ - -Ddefault-hierarchy=unified \ - -Ddefault-kill-user-processes=false \ - -Drc-local=/etc/init.d/boot.local \ - -Dcreate-log-dirs=false \ - -Dbump-proc-sys-fs-nr-open=false \ - -Ddebug-shell=/bin/bash \ - -Dseccomp=auto \ - -Dselinux=auto \ - -Dapparmor=auto \ - -Dsmack=false \ - -Dima=false \ - -Delfutils=auto \ - -Doomd=false \ -%if %{with experimental} - -Dpstore=true \ - -Drepart=true \ - -Dhomed=true \ - -Duserdb=true \ -%else - -Dpstore=false \ - -Drepart=false \ - -Dhomed=false \ - -Duserdb=false \ -%endif -%if 0%{?bootstrap} - -Dnss-myhostname=false \ -%else - -Dtpm2=true \ - -Dman=true \ - -Dhtml=true \ -%endif -%if %{without coredump} - -Dcoredump=false \ -%endif -%if %{without sd_boot} - -Defi=false \ - -Dgnu-efi=false \ -%else - -Defi=true \ - -Dgnu-efi=true \ -%endif -%if %{without importd} - -Dimportd=false \ -%endif -%if %{without journal_remote} - -Dremote=false \ -%endif -%if %{without portabled} - -Dportabled=false \ -%endif -%if %{without machined} - -Dmachined=false \ -%endif -%if %{without networkd} - -Dnetworkd=false \ -%endif -%if %{without resolved} - -Dresolve=false \ -%endif -%if %{without sysvcompat} - -Dsysvinit-path= \ - -Dsysvrcnd-path= \ -%endif -%if %{with testsuite} - -Dtests=unsafe \ - -Dinstall-tests=true \ -%else - -Dtests=false \ - -Dinstall-tests=false \ -%endif - -Dadm-group=false \ - -Dwheel-group=false \ - -Dgshadow=false \ - -Dldconfig=false - -%meson_build - -%install -%meson_install - -%if 0%{?bootstrap} -rm %{buildroot}%{_libdir}/libnss_systemd.so* -rm -r %{buildroot}%{_datadir}/locale -%endif - -# Don't ship resolvconf symlink for now as it conflicts with the -# binary shipped by openresolv and provides limited compatibility -# only -%if %{with resolved} -rm %{buildroot}%{_sbindir}/resolvconf -rm %{buildroot}%{_mandir}/man1/resolvconf.1* -%endif - -%if %{with sysvcompat} -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated - -install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert -install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install -%endif - -mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network -mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn - -# Package the scripts used to fix all packaging issues. Also drop the -# "scripts-{systemd/udev}" prefix which is used because osc doesn't -# allow directory structure... -for s in %{S:100} %{S:101} %{S:102}; do - install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} -done - -%if %{with split_usr} -# Legacy sysvinit tools -mkdir -p %{buildroot}/sbin -ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init -ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot -ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt -ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown -ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff -%if %{with sysvcompat} -ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit -ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel -%endif -%endif - -# Make sure we don't ship static enablement symlinks in /etc during -# installation, presets should be honoured instead. -rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} -rm -f %{buildroot}/etc/systemd/system/default.target - -# Replace upstream systemd-user with the openSUSE one. -install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{S:2} - -# don't enable wall ask password service, it spams every console (bnc#747783) -rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path - -# do not ship sysctl defaults in systemd package, will be part of -# aaa_base (in procps for now) -rm -f %{buildroot}%{_sysctldir}/50-default.conf -rm -f %{buildroot}%{_sysctldir}/50-pid-max.conf - -# Make sure systemd-network polkit rules file starts with a suitable -# number prefix so it takes precedence over our polkit-default-privs. -%if %{with networkd} -mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ - %{buildroot}%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%endif - -# since v207 /etc/sysctl.conf is no longer parsed (commit -# 04bf3c1a60d82791), however backward compatibility is provided by -# /usr/lib/sysctl.d/99-sysctl.conf. -ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf - -# The definition of the basic users/groups are defined by system-user -# on SUSE (bsc#1006978). -rm -f %{buildroot}%{_sysusersdir}/basic.conf - -# Remove README file in init.d as (SUSE) rpm requires executable files -# in this directory... oh well. -rm -f %{buildroot}/etc/init.d/README - -# This dir must be owned (and thus created) by systemd otherwise the -# build system will complain. This is odd since we simply own a ghost -# file in it... -mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d - -# Make sure directories in /var exist -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog - -# Make sure the NTP units dir exists -mkdir -p %{buildroot}%{_ntpunitsdir} - -# Make sure the shutdown/sleep drop-in dirs exist -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ -mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/ - -# Make sure these directories are properly owned -mkdir -p %{buildroot}%{_unitdir}/basic.target.wants -mkdir -p %{buildroot}%{_unitdir}/default.target.wants -mkdir -p %{buildroot}%{_unitdir}/dbus.target.wants -mkdir -p %{buildroot}%{_unitdir}/halt.target.wants -mkdir -p %{buildroot}%{_unitdir}/kexec.target.wants -mkdir -p %{buildroot}%{_unitdir}/poweroff.target.wants -mkdir -p %{buildroot}%{_unitdir}/reboot.target.wants -mkdir -p %{buildroot}%{_unitdir}/shutdown.target.wants - -# Make sure the generator directories are created and properly owned. -mkdir -p %{buildroot}%{_systemdgeneratordir} -mkdir -p %{buildroot}%{_systemdusergeneratordir} -mkdir -p %{buildroot}%{_presetdir} -mkdir -p %{buildroot}%{_userpresetdir} -mkdir -p %{buildroot}%{_systemd_system_env_generator_dir} -mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} - -# ensure after.local wrapper is called -install -m 644 %{S:11} %{buildroot}%{_unitdir}/ -ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/ - -# ghost directories with default permissions. -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/backlight - -# ghost files with default permisssions. -touch %{buildroot}%{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf -touch %{buildroot}%{_sysconfdir}/vconsole.conf -touch %{buildroot}%{_sysconfdir}/locale.conf -touch %{buildroot}%{_sysconfdir}/machine-info -touch %{buildroot}%{_localstatedir}/lib/systemd/catalog/database -touch %{buildroot}%{_localstatedir}/lib/systemd/i18n-migrated - -%fdupes -s %{buildroot}%{_mandir} - -# Make sure to disable all services by default. The Suse branding -# presets package takes care of defining the right policies. -rm -f %{buildroot}%{_presetdir}/*.preset -echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset -echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset - -# The tmpfiles dealing with the generic paths is pretty messy -# currently because: -# -# 1. filesystem package wants to define the generic paths and some of -# them conflict with the definition given by systemd in var.conf, -# see bsc#1078466. -# -# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros -# (fate#314974) which conflict with tmp.conf. -# -# 3. There're also legacy.conf which defines various legacy paths -# which either don't match the SUSE defaults or don't look needed -# at all. -# -# 4. And to finish, we don't want the part in etc.conf which imports -# default upstream files in empty /etc, see below. -# -# To keep things simple, we remove all these tmpfiles config files but -# still keep the remaining paths that still don't have a better home -# in suse.conf. -rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf -install -m 644 %{S:5} %{buildroot}%{_tmpfilesdir}/suse.conf - -# The content of the files shipped by systemd doesn't match the -# defaults used by SUSE. Don't ship those files but leave the decision -# to use the mechanism to the individual packages that actually -# consume those configs (like glibc or pam), see bsc#1170146. -rm -fr %{buildroot}%{_datadir}/factory/* - -# Add entries for xkeyboard-config converted keymaps; mappings, which -# already exist in original systemd mapping table are being ignored -# though, i.e. not overwritten; needed as long as YaST uses console -# keymaps internally and calls localectl to convert from vconsole to -# X11 keymaps. Ideally YaST should switch to X11 layout names (the -# mapping table wouldn't be needed since each X11 keymap has a -# generated xkbd keymap) and let localectl initialize -# /etc/vconsole.conf and /etc/X11/xorg.conf.d/00-keyboard.conf -# (FATE#319454). -if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then - cat /usr/share/systemd/kbd-model-map.xkb-generated \ - >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map -fi - -# kbd-model-map.legacy is used to provide mapping for legacy keymaps, -# which may still be used by yast. -cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map - -# Don't ship systemd-journald-audit.socket as there's no other way for -# us to prevent journald from recording audit messages in the journal -# by default (bsc#1109252). -rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket -rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket - -%if %{with testsuite} -cp -a test %{buildroot}%{_testsuitedir}/ -find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; -%endif - -%if ! 0%{?bootstrap} -%find_lang systemd -%endif - -# Build of installation images uses a hard coded list of packages with -# a %%pre that needs to be run during the build. systemd is one of them -# so keep the section even if it's empty. -%pre -: - -%post -# Make /etc/machine-id an empty file during package installation. On -# the first boot, machine-id is initialized and either committed (if -# /etc/ is writable) or the system/image runs with a transient machine -# ID, that changes on each boot (if the image is read-only). This is -# especially important for appliance builds to avoid an identical -# machine ID in all images. -if [ $1 -eq 1 ]; then - touch %{_sysconfdir}/machine-id - chmod 444 %{_sysconfdir}/machine-id -fi - -# /etc/machine-id might have been created writeable incorrectly -# (boo#1092269). -if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then - echo "Incorrect file mode bits for /etc/machine-id which should be 0444, fixing..." - chmod 444 %{_sysconfdir}/machine-id -fi - -%if ! 0%{?bootstrap} -pam-config --add --systemd || : -%endif - -# systemd-sysusers is not available in %pre so this needs to be done -# in %%post. However this shouldn't be an issue since all files the -# main package ships are owned by root. -%sysusers_create systemd.conf - -[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : -/usr/lib/systemd/systemd-random-seed save || : - -systemctl daemon-reexec || : - -# Reexecute user manager instances (if any). It is asynchronous but it -# shouldn't be a problem in practice: a problem would arise only if -# the new version of a user service has a brand new option that is -# only understood by the latest version of the user manager and the -# user service is started before the user manager get reexecuted. But -# this case is very unlikely especially since we don't restart any -# user service for now on. -# -# Before doing this, we unfortunately have to wait until users will -# reexec their user manager (by either rebooting or restarting their -# session) to a version that supports SIGRTMIN+25 otherwise sending -# the signal to an old version will kill the manager which means -# tearing down the user session. -# -# systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : - -if [ "$1" -eq 1 ]; then - # Persistent journal is the default - mkdir -p %{_localstatedir}/log/journal -fi - -%journal_catalog_update -%tmpfiles_create - -# Create default config in /etc at first install. -# Later package updates should not overwrite these settings. -%systemd_post remote-cryptsetup.target -%systemd_post getty@.service -%systemd_post machines.target -%systemd_post remote-fs.target -%systemd_post systemd-timesyncd.service - -# v228 wrongly set world writable suid root permissions on timestamp -# files used by permanent timers. Fix the timestamps that might have -# been created by the affected versions of systemd (bsc#1020601). -for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do - chmod 0644 $stamp -done - -# Same for user lingering created by logind. -for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do - chmod 0644 $username -done - -# Due to the fact that DynamicUser= was turned ON during v235 and then -# switched back to off in v240, /var/lib/systemd/timesync might be a -# symlink pointing to /var/lib/private/systemd/timesync, which is -# inaccessible for systemd-timesync user as /var/lib/private is 0700 -# root:root, see https://github.com/systemd/systemd/issues/11329 for -# details. Note: only TW users might be affected by this bug. -if [ -L %{_localstatedir}/lib/systemd/timesync ]; then - rm %{_localstatedir}/lib/systemd/timesync - mv %{_localstatedir}/lib/private/systemd/timesync %{_localstatedir}/lib/systemd/timesync -fi - -# This includes all hacks needed when upgrading from SysV. -%{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : - -# Migrate old i18n settings previously configured in /etc/sysconfig to -# the new locations used by systemd (/etc/locale.conf, -# /etc/vconsole.conf, ...). Recent versions of systemd parse the new -# locations only. -# -# This is needed both at package updates and package installations -# because we might be upgrading from a system which was running SysV -# init (systemd package is being installed). -# -# It's run only once. -%{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : - -# During the migration to tmpfs for /tmp, a bug was introduced that -# affected users using tmpfs for /tmp and happened during the _second_ -# update following the one that introduced tmpfs on /tmp. It consisted -# in creating a dangling symlink /etc/systemd/system/tmp.mount -# pointing to the old copy that previous versions shipped in -# /usr/share/systemd, which doesn't exist anymore. So we migrate the -# link to the new location. -# -# Users have been exposed to this bug during a short period of time as -# it was present only in one release and was fixed shortly after by -# the next update. So we can assume that it's safe to drop it in 6 -# months (ie March 2021). -if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then - ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount -fi - -%postun -# daemon-reload is implied by %%systemd_postun_with_restart -%systemd_postun_with_restart systemd-journald.service -%systemd_postun_with_restart systemd-timesyncd.service -# Avoid restarting logind until fixed upstream (issue #1163) - -%pre -n udev%{?mini} -# New installations uses the last compat symlink generation number -# (currently at 2), which basically disables all compat symlinks. On -# old systems, the file doesn't exist. This is equivalent to -# generation #1, which enables the creation of all compat symlinks. -if [ $1 -eq 1 ]; then - echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation -fi - -%post -n udev%{?mini} -%regenerate_initrd_post -%udev_hwdb_update - -# add KERNEL name match to existing persistent net rules -sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ - /etc/udev/rules.d/70-persistent-net.rules 2>/dev/null || : - -# cleanup old stuff -rm -f /etc/sysconfig/udev -rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules - -%postun -n udev%{?mini} -%regenerate_initrd_post - -# The order of the units being restarted is important here because there's currently no -# way to queue multiple jobs into a single transaction atomically. Therefore systemctl -# will create 3 restart jobs that can be handled by PID1 separately and if the jobs for -# the sockets are being handled first then starting them again will fail as the service -# is still active hence the sockets held by udevd. However if the restart job for udevd -# is handled first, there should be enough time to queue the socket jobs before the stop -# job for udevd is processed. Hence PID1 will automatically sort the restart jobs -# correctly by stopping the service then the sockets and then by starting the sockets and -# the unit. -# -# Note that when systemd-udevd is restarted, there will always be a short time -# frame where no socket will be listening to the events sent by the kernel, no -# matter if the socket unit is restarted in first or not. -%service_del_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket - -%posttrans -n udev%{?mini} -%regenerate_initrd_posttrans - -%post -n libudev%{?mini}1 -p /sbin/ldconfig -%post -n libsystemd0%{?mini} -p /sbin/ldconfig - -%postun -n libudev%{?mini}1 -p /sbin/ldconfig -%postun -n libsystemd0%{?mini} -p /sbin/ldconfig - -%post container -%tmpfiles_create systemd-nspawn.conf -%if %{with machined} -if [ $1 -gt 1 ]; then - # Convert /var/lib/machines subvolume to make it suitable for - # rollbacks, if needed. See bsc#992573. The installer has been fixed - # to create it at installation time. - # - # The convertion might only be problematic for openSUSE distros - # (TW/Factory) where previous versions had already created the - # subvolume at the wrong place (via tmpfiles for example) and user - # started to populate and use it. In this case we'll let the user fix - # it manually. - # - # For SLE12 this subvolume was only introduced during the upgrade from - # v210 to v228 when we added this workaround. Note that the subvolume - # is still created at the wrong place due to the call to - # tmpfiles_create macro previously however it's empty so there - # shouldn't be any issues. - %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : -fi -%endif - -%if ! 0%{?bootstrap} -%post -n nss-myhostname -p /sbin/ldconfig -%postun -n nss-myhostname -p /sbin/ldconfig - -%post -n nss-systemd -p /sbin/ldconfig -%postun -n nss-systemd -p /sbin/ldconfig -%endif - -%if %{with resolved} -%post -n nss-resolve -p /sbin/ldconfig -%postun -n nss-resolve -p /sbin/ldconfig -%endif - -%if %{with machined} -%post -n nss-mymachines -p /sbin/ldconfig -%postun -n nss-mymachines -p /sbin/ldconfig -%endif - -%if %{with journal_remote} -%pre journal-remote -%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_add_pre systemd-journal-remote.socket systemd-journal-remote.service -%service_add_pre systemd-journal-upload.service - -%post journal-remote -# Assume that all files shipped by systemd-journal-remove are owned by root. -%sysusers_create systemd-remote.conf -%service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_add_post systemd-journal-remote.socket systemd-journal-remote.service -%service_add_post systemd-journal-upload.service - -%preun journal-remote -%service_del_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_del_preun systemd-journal-remote.socket systemd-journal-remote.service -%service_del_preun systemd-journal-upload.service - -%postun journal-remote -%service_del_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_del_postun systemd-journal-remote.socket systemd-journal-remote.service -%service_del_postun systemd-journal-upload.service -%endif - -%if %{with networkd} || %{with resolved} -%pre network -%if %{with networkd} -%service_add_pre systemd-networkd.service -%service_add_pre systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%service_add_pre systemd-resolved.service -%endif - -%post network -%if %{with networkd} -%service_add_post systemd-networkd.service -%service_add_post systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%service_add_post systemd-resolved.service -%endif - -%preun network -%if %{with networkd} -%service_del_preun systemd-networkd.service -%service_del_preun systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%service_del_preun systemd-resolved.service -%endif - -%postun network -%if %{with networkd} -%service_del_postun systemd-networkd.service -%service_del_postun systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%service_del_postun systemd-resolved.service -%endif -%endif - -%if %{with portabled} -%pre portable -%service_add_pre systemd-portabled.service - -%post portable -%tmpfiles_create portables.conf -%service_add_post systemd-portabled.service - -%preun portable -%service_del_preun systemd-portabled.service - -%postun portable -%service_del_postun systemd-portabled.service -%endif - -%if %{with experimental} -%pre experimental -%service_add_pre systemd-pstore.service -%service_add_pre systemd-userdbd.service systemd-userdbd.socket -%service_add_pre systemd-homed.service - -%post experimental -%tmpfiles_create systemd-pstore.conf -%service_add_post systemd-pstore.service -%service_add_post systemd-userdbd.service systemd-userdbd.socket -%service_add_post systemd-homed.service - -%preun experimental -%service_del_preun systemd-pstore.service -%service_del_preun systemd-userdbd.service systemd-userdbd.socket -%service_del_preun systemd-homed.service - -%postun experimental -%service_del_postun systemd-pstore.service -%service_del_postun systemd-userdbd.service systemd-userdbd.socket -%service_del_postun systemd-homed.service -%endif - -%files -%defattr(-,root,root) -%license LICENSE* -%if %{with sd_boot} -%{_bindir}/bootctl -%endif -%{_bindir}/busctl -%{_bindir}/hostnamectl -%{_bindir}/kernel-install -%{_bindir}/localectl -%{_bindir}/systemctl -%{_bindir}/systemd-analyze -%if ! 0%{?bootstrap} -%{_bindir}/systemd-cryptenroll -%endif -%{_bindir}/systemd-delta -%{_bindir}/systemd-dissect -%{_bindir}/systemd-escape -%{_bindir}/systemd-firstboot -%{_bindir}/systemd-id128 -%{_bindir}/systemd-path -%{_bindir}/systemd-sysusers -%{_bindir}/systemd-mount -%{_bindir}/systemd-umount -%{_bindir}/systemd-notify -%{_bindir}/systemd-run -%{_bindir}/systemd-sysext -%{_bindir}/journalctl -%{_bindir}/systemd-ask-password -%{_bindir}/loginctl -%{_bindir}/systemd-inhibit -%{_bindir}/systemd-tty-ask-password-agent -%{_bindir}/systemd-tmpfiles -%{_bindir}/systemd-machine-id-setup -%{_bindir}/systemd-socket-activate -%{_bindir}/systemd-stdio-bridge -%{_bindir}/systemd-detect-virt -%{_bindir}/timedatectl -%{_bindir}/systemd-cgls -%{_bindir}/systemd-cgtop -%{_bindir}/systemd-cat -%dir %{_prefix}/lib/kernel -%dir %{_prefix}/lib/kernel/install.d -%{_prefix}/lib/kernel/install.d/00-entry-directory.install -%{_prefix}/lib/kernel/install.d/50-depmod.install -%{_prefix}/lib/kernel/install.d/90-loaderentry.install -%dir %{_prefix}/lib/systemd -%dir %{_prefix}/lib/systemd/network -%dir %{_unitdir} -%{_userunitdir} -%if %{with coredump} -%exclude %{_prefix}/lib/systemd/systemd-coredump -%exclude %{_unitdir}/systemd-coredump* -%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket -%endif -%if %{with journal_remote} -%exclude %{_unitdir}/systemd-journal-gatewayd.* -%exclude %{_unitdir}/systemd-journal-remote.* -%exclude %{_unitdir}/systemd-journal-upload.* -%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd -%exclude %{_prefix}/lib/systemd/systemd-journal-remote -%exclude %{_prefix}/lib/systemd/systemd-journal-upload -%endif -%exclude %{_prefix}/lib/systemd/systemd-udevd -%exclude %{_unitdir}/systemd-udev*.* -%exclude %{_unitdir}/systemd-hwdb*.* -%exclude %{_unitdir}/*.target.wants/systemd-udev*.* -%exclude %{_unitdir}/*.target.wants/systemd-hwdb*.* -%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service -%exclude %{_unitdir}/kmod-static-nodes.service -%exclude %{_unitdir}/systemd-nspawn@.service -%if %{with machined} -%exclude %{_prefix}/lib/systemd/systemd-machined -%exclude %{_unitdir}/systemd-machined.service -%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service -%exclude %{_unitdir}/var-lib-machines.mount -%exclude %{_unitdir}/machine.slice -%exclude %{_unitdir}/machines.target.wants -%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount -%endif -%if %{with importd} -%exclude %{_prefix}/lib/systemd/systemd-import* -%exclude %{_prefix}/lib/systemd/systemd-pull -%exclude %{_prefix}/lib/systemd/import-pubring.gpg -%exclude %{_unitdir}/systemd-importd.service -%exclude %{_unitdir}/dbus-org.freedesktop.import1.service -%endif -%if %{with networkd} -%exclude %{_prefix}/lib/systemd/systemd-network-generator -%exclude %{_prefix}/lib/systemd/systemd-networkd -%exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online -%exclude %{_unitdir}/systemd-network-generator.service -%exclude %{_unitdir}/systemd-networkd.service -%exclude %{_unitdir}/systemd-networkd.socket -%exclude %{_unitdir}/systemd-networkd-wait-online.service -%exclude %{_prefix}/lib/systemd/systemd-resolved -%exclude %{_unitdir}/systemd-resolved.service -%endif -%if %{with portabled} -%exclude %{_prefix}/lib/systemd/systemd-portabled -%exclude %{_prefix}/lib/systemd/portable -%exclude %{_unitdir}/systemd-portabled.service -%exclude %{_unitdir}/dbus-org.freedesktop.portable1.service -%exclude %{_tmpfilesdir}/portables.conf -%endif -%if %{with experimental} -%exclude %{_prefix}/lib/systemd/systemd-pstore -%exclude %{_unitdir}/systemd-pstore.service -%exclude %{_tmpfilesdir}/systemd-pstore.conf -%exclude %{_unitdir}/systemd-repart.service -%exclude %{_unitdir}/initrd-root-fs.target.wants/systemd-repart.service -%exclude %{_unitdir}/sysinit.target.wants/systemd-repart.service -%exclude %{_prefix}/lib/systemd/systemd-userwork -%exclude %{_prefix}/lib/systemd/systemd-userdbd -%exclude %{_unitdir}/systemd-userdbd.service -%exclude %{_unitdir}/systemd-userdbd.socket -%exclude %{_prefix}/lib/systemd/systemd-homed -%exclude %{_prefix}/lib/systemd/systemd-homework -%exclude %{_unitdir}/systemd-homed-activate.service -%exclude %{_unitdir}/systemd-homed.service -%endif - -%{_unitdir}/*.automount -%{_unitdir}/*.service -%{_unitdir}/*.slice -%{_unitdir}/*.target -%{_unitdir}/*.mount -%{_unitdir}/*.timer -%{_unitdir}/*.socket -%{_unitdir}/*.wants -%{_unitdir}/*.path - -%{_unitdir}/user-.slice.d/ - -%{_prefix}/lib/systemd/systemd-* -%{_prefix}/lib/systemd/systemd -%{_prefix}/lib/systemd/libsystemd-shared-*.so -%{_prefix}/lib/systemd/scripts -%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh -%dir %{_journalcatalogdir} -%{_journalcatalogdir}/systemd.catalog -%{_journalcatalogdir}/systemd.*.catalog -%{_presetdir} -%{_userpresetdir} -%{_systemdgeneratordir} -%{_systemdusergeneratordir} -%{_systemd_system_env_generator_dir} -%{_systemd_user_env_generator_dir} -%dir %{_ntpunitsdir} -%{_ntpunitsdir}/80-systemd-timesync.list -%dir %{_prefix}/lib/systemd/system-shutdown/ -%dir %{_prefix}/lib/systemd/system-sleep/ - -%{_pam_moduledir}/pam_systemd.so - -%if %{with sd_boot} -%dir %{_prefix}/lib/systemd/boot -%dir %{_prefix}/lib/systemd/boot/efi -%{_prefix}/lib/systemd/boot/efi/*.efi -%{_prefix}/lib/systemd/boot/efi/*.stub -%endif - -%dir %{_sysconfdir}/modules-load.d -%{_modulesloaddir} - -%dir %{_sysusersdir} -%doc %{_sysusersdir}/README -%{_sysusersdir}/systemd.conf - -%dir %{_sysconfdir}/tmpfiles.d -%{_tmpfilesdir}/ -%exclude %{_tmpfilesdir}/systemd-nspawn.conf - -%{_environmentdir}/ - -%dir %{_binfmtdir} -%dir %{_sysconfdir}/binfmt.d - -%dir %{_sysctldir} -%dir %{_sysconfdir}/sysctl.d -%doc %{_sysctldir}/README -%{_sysctldir}/99-sysctl.conf - -%dir %{_sysconfdir}/X11/xorg.conf.d -%dir %{_sysconfdir}/systemd -%dir %{_sysconfdir}/systemd/network -%dir %{_sysconfdir}/systemd/system -%dir %{_sysconfdir}/systemd/user -%dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/xdg/systemd/user - -%dir %{_distconfdir}/X11/xinit -%dir %{_distconfdir}/X11/xinit/xinitrc.d -%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh - -%{_pam_vendordir}/systemd-user - -%config(noreplace) %{_sysconfdir}/systemd/journald.conf -%config(noreplace) %{_sysconfdir}/systemd/logind.conf -%config(noreplace) %{_sysconfdir}/systemd/sleep.conf -%config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf -%config(noreplace) %{_sysconfdir}/systemd/user.conf - -%dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/services -%dir %{_datadir}/dbus-1/system.d -%dir %{_datadir}/dbus-1/system-services - -%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf - -# FIXME: why do we have to own this dir ? -%dir %{_modprobedir} -%doc %{_modprobedir}/README -%{_modprobedir}/systemd.conf - -# Some files created at runtime. -%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ -%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf -%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf -%ghost %config(noreplace) %{_sysconfdir}/locale.conf -%ghost %config(noreplace) %{_sysconfdir}/machine-info -%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id - -%{_datadir}/systemd -%{_datadir}/factory - -%if %{with journal_remote} -%exclude %{_datadir}/systemd/gatewayd -%endif - -%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service - -%dir %{_datadir}/polkit-1 -%dir %{_datadir}/polkit-1/actions -%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy - -%if ! 0%{?bootstrap} -%{_mandir}/man1/[a-rt-z]*ctl.1* -%{_mandir}/man1/systemc*.1* -%{_mandir}/man1/systemd*.1* -%{_mandir}/man5/[a-tv-z]* -%{_mandir}/man5/user* -%{_mandir}/man7/[bdfks]* -%{_mandir}/man8/kern* -%{_mandir}/man8/pam_* -%{_mandir}/man8//rc-local.* -%{_mandir}/man8/systemd-[a-gik-tvx]* -%{_mandir}/man8/systemd-h[aioy]* -%{_mandir}/man8/systemd-journald* -%{_mandir}/man8/systemd-u[ps]* -%{_mandir}/man8/30-systemd-environment-d-generator.* -%if %{with coredump} -%exclude %{_mandir}/man1/coredumpctl* -%exclude %{_mandir}/man5/coredump.conf* -%exclude %{_mandir}/man8/systemd-coredump* -%endif -%exclude %{_mandir}/man*/*nspawn* -%if %{with machined} -%exclude %{_mandir}/man*/machinectl* -%exclude %{_mandir}/man*/systemd-machined* -%endif -%if %{with importd} -%exclude %{_mandir}/man*/systemd-importd* -%endif -%if %{with journal_remote} -%exclude %{_mandir}/man5/journal-remote.conf* -%exclude %{_mandir}/man5/journal-upload.conf* -%endif -%if %{with portabled} -%exclude %{_mandir}/man*/portablectl* -%exclude %{_mandir}/man*/systemd-portabled* -%endif -%if %{with experimental} -%exclude %{_mandir}/man*/*pstore* -%exclude %{_mandir}/man*/*repart* -%exclude %{_mandir}/man*/userdbctl* -%exclude %{_mandir}/man*/systemd-userdbd* -%exclude %{_mandir}/man*/*homectl* -%exclude %{_mandir}/man*/*homed* -%exclude %{_mandir}/man*/org.freedesktop.home1* -%exclude %{_mandir}/man*/pam_systemd_home* -%exclude %{_datadir}/bash-completion/completions/homectl -%endif -%endif - -%{_docdir}/systemd -%exclude %{_docdir}/systemd/html - -%{_udevrulesdir}/70-uaccess.rules -%{_udevrulesdir}/71-seat.rules -%{_udevrulesdir}/73-seat-late.rules -%{_udevrulesdir}/99-systemd.rules -%dir %{_localstatedir}/lib/systemd -%dir %{_localstatedir}/lib/systemd/catalog -%if %{with sysvcompat} -%dir %{_localstatedir}/lib/systemd/sysv-convert -%dir %{_localstatedir}/lib/systemd/migrated -%endif -%ghost %{_localstatedir}/lib/systemd/catalog/database -%ghost %{_localstatedir}/lib/systemd/backlight -%ghost %{_localstatedir}/lib/systemd/i18n-migrated -%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed - -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/* - -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/* -%{_datadir}/pkgconfig/systemd.pc - -%if ! 0%{?bootstrap} -%files doc -%defattr(-,root,root,-) -%dir %{_docdir}/systemd -%{_docdir}/systemd/html -%endif - -%files devel -%defattr(-,root,root,-) -%{_libdir}/libsystemd.so -%{_libdir}/pkgconfig/libsystemd.pc -%{_includedir}/systemd/ -%if ! 0%{?bootstrap} -%{_mandir}/man3/SD*.3* -%{_mandir}/man3/sd*.3* -%endif - -%files sysvinit -%defattr(-,root,root,-) -%if %{with split_usr} -/sbin/init -/sbin/reboot -/sbin/halt -/sbin/shutdown -/sbin/poweroff -%if %{with sysvcompat} -/sbin/telinit -/sbin/runlevel -%endif -%endif -%{_sbindir}/init -%{_sbindir}/reboot -%{_sbindir}/halt -%{_sbindir}/shutdown -%{_sbindir}/poweroff -%if %{with sysvcompat} -%{_sbindir}/telinit -%{_sbindir}/runlevel -%endif -%if ! 0%{?bootstrap} -%{_mandir}/man1/init.1* -%{_mandir}/man8/halt.8* -%{_mandir}/man8/reboot.8* -%{_mandir}/man8/shutdown.8* -%{_mandir}/man8/poweroff.8* -%{_mandir}/man8/telinit.8* -%{_mandir}/man8/runlevel.8* -%endif - -%files -n udev%{?mini} -%defattr(-,root,root) -%{_bindir}/udevadm -%{_bindir}/systemd-hwdb -%dir %{_prefix}/lib/udev/ -%{_prefix}/lib/udev/ata_id -%{_prefix}/lib/udev/cdrom_id -# dmi_memory_id is only relevant on arches with DMI -%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips -%{_prefix}/lib/udev/dmi_memory_id -%endif -%{_prefix}/lib/udev/fido_id -%{_prefix}/lib/udev/mtd_probe -%{_prefix}/lib/udev/path_id_compat -%{_prefix}/lib/udev/scsi_id -%{_prefix}/lib/udev/v4l_id -%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation -%dir %{_udevrulesdir}/ -%doc %{_udevrulesdir}/README -%exclude %{_udevrulesdir}/70-uaccess.rules -%exclude %{_udevrulesdir}/71-seat.rules -%exclude %{_udevrulesdir}/73-seat-late.rules -%exclude %{_udevrulesdir}/99-systemd.rules -%{_udevrulesdir}/*.rules -%{_udevhwdbdir}/ -%dir %{_sysconfdir}/udev/ -%dir %{_sysconfdir}/udev/rules.d/ -%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin -%config(noreplace) %{_sysconfdir}/udev/udev.conf -%if ! 0%{?bootstrap} -%{_mandir}/man5/udev* -%{_mandir}/man7/hwdb* -%{_mandir}/man7/udev* -%{_mandir}/man8/systemd-hwdb* -%{_mandir}/man8/systemd-udev* -%{_mandir}/man8/udev* -%endif -%dir %{_unitdir} -%{_prefix}/lib/systemd/systemd-udevd -%{_unitdir}/kmod-static-nodes.service -%{_unitdir}/systemd-udev*.service -%{_unitdir}/systemd-udevd*.socket -%{_unitdir}/systemd-hwdb*.* -%{_unitdir}/initrd-udevadm-cleanup-db.service -%dir %{_unitdir}/sysinit.target.wants -%{_unitdir}/sysinit.target.wants/systemd-udev*.service -%dir %{_unitdir}/sockets.target.wants -%{_unitdir}/sockets.target.wants/systemd-udev*.socket -%{_unitdir}/*.target.wants/systemd-hwdb*.* -%{_prefix}/lib/systemd/network/99-default.link -%{_datadir}/pkgconfig/udev.pc - -%files -n libsystemd0%{?mini} -%defattr(-,root,root) -%{_libdir}/libsystemd.so.* - -%files -n libudev%{?mini}1 -%defattr(-,root,root) -%{_libdir}/libudev.so.* - -%files -n libudev%{?mini}-devel -%defattr(-,root,root) -%{_includedir}/libudev.h -%{_libdir}/libudev.so -%{_libdir}/pkgconfig/libudev.pc -%if ! 0%{?bootstrap} -%{_mandir}/man3/*udev*.3* -%endif - -%if %{with coredump} -%files coredump -%defattr(-,root,root) -%{_bindir}/coredumpctl -%{_prefix}/lib/systemd/systemd-coredump -%{_unitdir}/systemd-coredump* -%{_unitdir}/sockets.target.wants/systemd-coredump.socket -%{_sysctldir}/50-coredump.conf -%config(noreplace) %{_sysconfdir}/systemd/coredump.conf -%dir %{_localstatedir}/lib/systemd/coredump -%if ! 0%{?bootstrap} -%{_mandir}/man1/coredumpctl* -%{_mandir}/man5/coredump.conf* -%{_mandir}/man8/systemd-coredump* -%endif -%endif - -%files container -%defattr(-,root,root) -%dir %{_sysconfdir}/systemd/nspawn -%{_bindir}/systemd-nspawn -%{_unitdir}/systemd-nspawn@.service -%if %{with machined} -%{_bindir}/machinectl -%{_prefix}/lib/systemd/systemd-machined -%{_unitdir}/systemd-machined.service -%{_unitdir}/dbus-org.freedesktop.machine1.service -%{_unitdir}/var-lib-machines.mount -%{_unitdir}/machine.slice -%{_unitdir}/machines.target.wants -%{_unitdir}/*.target.wants/var-lib-machines.mount -%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh -%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy -%{_tmpfilesdir}/systemd-nspawn.conf -%endif -%if %{with importd} -%{_prefix}/lib/systemd/systemd-import* -%{_prefix}/lib/systemd/systemd-pull -%{_prefix}/lib/systemd/import-pubring.gpg -%{_unitdir}/systemd-importd.service -%{_unitdir}/dbus-org.freedesktop.import1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif -%if ! 0%{?bootstrap} -%{_mandir}/man*/*nspawn* -%if %{with machined} -%{_mandir}/man*/machinectl* -%{_mandir}/man*/systemd-machined* -%endif -%if %{with importd} -%{_mandir}/man*/systemd-importd* -%endif -%endif - -%if ! 0%{?bootstrap} -%files lang -f systemd.lang - -%files -n nss-myhostname -%defattr(-, root, root) -%{_libdir}/*nss_myhostname* -%{_mandir}/man8/libnss_myhostname.* -%{_mandir}/man8/nss-myhostname.* - -%files -n nss-systemd -%defattr(-, root, root) -%{_libdir}/libnss_systemd.so* -%{_mandir}/man8/libnss_systemd.so.* -%{_mandir}/man8/nss-systemd.* -%endif - -%if %{with resolved} -%files -n nss-resolve -%defattr(-, root, root) -%{_libdir}/libnss_resolve.so.2 -%{_mandir}/man8/libnss_resolve.* -%{_mandir}/man8/nss-resolve.* -%endif - -%if %{with machined} -%files -n nss-mymachines -%defattr(-,root,root) -%{_libdir}/libnss_mymachines.so* -%{_mandir}/man8/libnss_mymachines.* -%{_mandir}/man8/nss-mymachines.* -%endif - -%if %{with journal_remote} -%files journal-remote -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/systemd/journal-remote.conf -%config(noreplace) %{_sysconfdir}/systemd/journal-upload.conf -%{_unitdir}/systemd-journal-gatewayd.* -%{_unitdir}/systemd-journal-remote.* -%{_unitdir}/systemd-journal-upload.* -%{_prefix}/lib/systemd/systemd-journal-gatewayd -%{_prefix}/lib/systemd/systemd-journal-remote -%{_prefix}/lib/systemd/systemd-journal-upload -%{_sysusersdir}/systemd-remote.conf -%{_mandir}/man5/journal-remote.conf* -%{_mandir}/man5/journal-upload.conf* -%{_mandir}/man8/systemd-journal-gatewayd.* -%{_mandir}/man8/systemd-journal-remote.* -%{_mandir}/man8/systemd-journal-upload.* -%{_datadir}/systemd/gatewayd -%ghost %dir %{_localstatedir}/log/journal/remote -%endif - -%if %{with networkd} || %{with resolved} -%files network -%defattr(-,root,root) -%if %{with networkd} -%config(noreplace) %{_sysconfdir}/systemd/networkd.conf -%{_bindir}/networkctl -%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service -%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy -%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%{_prefix}/lib/systemd/network/*.network -%{_prefix}/lib/systemd/network/*.network.example -%{_prefix}/lib/systemd/systemd-network-generator -%{_prefix}/lib/systemd/systemd-networkd -%{_prefix}/lib/systemd/systemd-networkd-wait-online -%{_unitdir}/systemd-network-generator.service -%{_unitdir}/systemd-networkd.service -%{_unitdir}/systemd-networkd.socket -%{_unitdir}/systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%{_bindir}/resolvectl -%{_bindir}/systemd-resolve -%config(noreplace) %{_sysconfdir}/systemd/resolved.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service -%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy -%{_prefix}/lib/systemd/resolv.conf -%{_prefix}/lib/systemd/systemd-resolved -%{_unitdir}/systemd-resolved.service -%endif -%endif - -%if %{with portabled} -%files portable -%defattr(-,root,root) -%{_bindir}/portablectl -%{_prefix}/lib/systemd/systemd-portabled -%{_prefix}/lib/systemd/portable -%{_unitdir}/systemd-portabled.service -%{_unitdir}/dbus-org.freedesktop.portable1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.portable1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.portable1.service -%{_datadir}/polkit-1/actions/org.freedesktop.portable1.policy -%{_tmpfilesdir}/portables.conf -%{_mandir}/man*/portablectl* -%{_mandir}/man*/systemd-portabled* -%endif - -%if %{with testsuite} -%files testsuite -%defattr(-,root,root) -%{_testsuitedir} -%doc %{_testsuitedir}/test/README.testsuite -%endif - -%if %{with experimental} -%files experimental -%defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/systemd/pstore.conf -%{_prefix}/lib/systemd/systemd-pstore -%{_unitdir}/systemd-pstore.service -%{_tmpfilesdir}/systemd-pstore.conf -%{_mandir}/man*/*pstore* -%{_bindir}/systemd-repart -%{_unitdir}/systemd-repart.service -%{_mandir}/man*/*repart* -%{_bindir}/userdbctl -%{_prefix}/lib/systemd/systemd-userwork -%{_prefix}/lib/systemd/systemd-userdbd -%{_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/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* -%endif - -%changelog diff --git a/systemd.changes b/systemd.changes index e24b4142..307f8f06 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,8 +1,39 @@ +------------------------------------------------------------------- +Tue Nov 2 10:26:58 UTC 2021 - Franck Bui + +- Add 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch + + Temporarly revert commit ed8fbbf1745c6a2dc0b8cd560ac8a3353f72e979 + until the regression it introduced [1] is addressed by upstream and + a fix is released via the stable tree. + + [1] https://github.com/systemd/systemd/issues/21025 + +------------------------------------------------------------------- +Tue Oct 19 14:41:37 UTC 2021 - Franck Bui + +- Disable nss-systemd and translations features for the mini flavour + +------------------------------------------------------------------- +Mon Oct 18 13:01:01 UTC 2021 - Franck Bui + +- Really enable libiptc for masquerading support (bsc#1191651) + + Currently used by systemd-nspawn and systemd-networkd. + +------------------------------------------------------------------- +Mon Oct 18 10:06:08 UTC 2021 - Franck Bui + +- Convert systemd package to multibuild + ------------------------------------------------------------------- Fri Oct 15 12:09:44 UTC 2021 - Franck Bui - Import commit 8521f8d22fd44400289fcea03493ebd7f8b1487d (merge of v249.5) + 8de173ff93 mount-util: fix fd_is_mount_point() when both the parent and directory are network fs (bsc#1190984) + [...] + For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/355e113ce193e5e2d195278c57d47f9a1b00ae46...8521f8d22fd44400289fcea03493ebd7f8b1487d diff --git a/systemd.spec b/systemd.spec index 17246d92..1be7837f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,8 +21,16 @@ # found at: https://github.com/openSUSE/systemd. # +%global flavor @BUILD_FLAVOR@%{nil} + +%if "%{flavor}" == "mini" +%define bootstrap 1 +%define mini -mini +%else %define bootstrap 0 %define mini %nil +%endif + %define min_kernel_version 4.5 %define suse_version +suse.47.g8521f8d22f %define _testsuitedir /usr/lib/systemd/tests @@ -59,7 +67,7 @@ # Kept to ease migrations toward SLE %bcond_with split_usr -Name: systemd +Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd Version: 249.5 Release: 0 @@ -80,6 +88,7 @@ BuildRequires: pkgconfig(audit) BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) @@ -163,7 +172,7 @@ Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Obsoletes: systemd-analyze < 201 Source0: systemd-v%{version}%{suse_version}.tar.xz -Source1: %{name}-rpmlintrc +Source1: systemd-rpmlintrc Source2: systemd-user %if %{with sysvcompat} Source3: systemd-sysv-convert @@ -200,6 +209,7 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. +Patch100: 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -643,7 +653,9 @@ Have fun with these services at your own risk. -Duserdb=false \ %endif %if 0%{?bootstrap} + -Dtranslations=false \ -Dnss-myhostname=false \ + -Dnss-systemd=false \ %else -Dtpm2=true \ -Dman=true \ @@ -698,11 +710,6 @@ Have fun with these services at your own risk. %install %meson_install -%if 0%{?bootstrap} -rm %{buildroot}%{_libdir}/libnss_systemd.so* -rm -r %{buildroot}%{_datadir}/locale -%endif - # Don't ship resolvconf symlink for now as it conflicts with the # binary shipped by openresolv and provides limited compatibility # only From e286d3719fa37cbe0b2679371e22643fbe98f2a578330b529cc9c0581b2f332f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 20 Nov 2021 21:47:46 +0000 Subject: [PATCH 082/124] Accepting request 931727 from Base:System - Import commit 61c79e68381801428c0bc00a56b9e2e9cfa68373 (merge of 249.6) bcdeee7b4c virt: Support detection for ARM64 Hyper-V guests (bsc#1186071) [...] For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8521f8d22fd44400289fcea03493ebd7f8b1487d...61c79e68381801428c0bc00a56b9e2e9cfa68373 - Drop 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch It's part of v249.6. OBS-URL: https://build.opensuse.org/request/show/931727 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=340 --- ...eck-unit-start-rate-limiting-earlier.patch | 486 ------------------ systemd-v249.5+suse.47.g8521f8d22f.tar.xz | 3 - systemd-v249.6+suse.50.g61c79e6838.tar.xz | 3 + systemd.changes | 15 + systemd.spec | 7 +- 5 files changed, 22 insertions(+), 492 deletions(-) delete mode 100644 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch delete mode 100644 systemd-v249.5+suse.47.g8521f8d22f.tar.xz create mode 100644 systemd-v249.6+suse.50.g61c79e6838.tar.xz diff --git a/0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch b/0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch deleted file mode 100644 index 379aaab3..00000000 --- a/0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch +++ /dev/null @@ -1,486 +0,0 @@ -From 4fa9d8f14523982482386d398d2b2669902f2098 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 18 Oct 2021 14:11:53 +0900 -Subject: [PATCH 1/1] Revert "core: Check unit start rate limiting earlier" - -This reverts commit ed8fbbf1745c6a2dc0b8cd560ac8a3353f72e979. - -This was causing problems during boot, see -https://bodhi.fedoraproject.org/updates/FEDORA-2021-a1a52487e6, -https://bugzilla.redhat.com/show_bug.cgi?id=2013386. -https://github.com/systemd/systemd/issues/21025 ---- - src/core/automount.c | 23 ++++++----------------- - src/core/mount.c | 23 ++++++----------------- - src/core/path.c | 23 ++++++----------------- - src/core/service.c | 25 +++++++------------------ - src/core/socket.c | 23 ++++++----------------- - src/core/swap.c | 23 ++++++----------------- - src/core/timer.c | 23 ++++++----------------- - src/core/unit.c | 7 ------- - src/core/unit.h | 4 ---- - test/TEST-63-ISSUE-17433/Makefile | 1 - - test/TEST-63-ISSUE-17433/test.sh | 9 --------- - test/meson.build | 2 -- - test/testsuite-10.units/test10.service | 3 --- - test/testsuite-63.units/test63.path | 2 -- - test/testsuite-63.units/test63.service | 5 ----- - test/units/testsuite-63.service | 16 ---------------- - 16 files changed, 43 insertions(+), 169 deletions(-) - delete mode 120000 test/TEST-63-ISSUE-17433/Makefile - delete mode 100755 test/TEST-63-ISSUE-17433/test.sh - delete mode 100644 test/testsuite-63.units/test63.path - delete mode 100644 test/testsuite-63.units/test63.service - delete mode 100644 test/units/testsuite-63.service - -diff --git a/src/core/automount.c b/src/core/automount.c -index 0722abef23..edc9588165 100644 ---- a/src/core/automount.c -+++ b/src/core/automount.c -@@ -814,6 +814,12 @@ static int automount_start(Unit *u) { - if (r < 0) - return r; - -+ r = unit_test_start_limit(u); -+ if (r < 0) { -+ automount_enter_dead(a, AUTOMOUNT_FAILURE_START_LIMIT_HIT); -+ return r; -+ } -+ - r = unit_acquire_invocation_id(u); - if (r < 0) - return r; -@@ -1059,21 +1065,6 @@ static bool automount_supported(void) { - return supported; - } - --static int automount_test_start_limit(Unit *u) { -- Automount *a = AUTOMOUNT(u); -- int r; -- -- assert(a); -- -- r = unit_test_start_limit(u); -- if (r < 0) { -- automount_enter_dead(a, AUTOMOUNT_FAILURE_START_LIMIT_HIT); -- return r; -- } -- -- return 0; --} -- - static const char* const automount_result_table[_AUTOMOUNT_RESULT_MAX] = { - [AUTOMOUNT_SUCCESS] = "success", - [AUTOMOUNT_FAILURE_RESOURCES] = "resources", -@@ -1136,6 +1127,4 @@ const UnitVTable automount_vtable = { - [JOB_FAILED] = "Failed to unset automount %s.", - }, - }, -- -- .test_start_limit = automount_test_start_limit, - }; -diff --git a/src/core/mount.c b/src/core/mount.c -index 9bec190cb6..af39db214b 100644 ---- a/src/core/mount.c -+++ b/src/core/mount.c -@@ -1168,6 +1168,12 @@ static int mount_start(Unit *u) { - - assert(IN_SET(m->state, MOUNT_DEAD, MOUNT_FAILED)); - -+ r = unit_test_start_limit(u); -+ if (r < 0) { -+ mount_enter_dead(m, MOUNT_FAILURE_START_LIMIT_HIT); -+ return r; -+ } -+ - r = unit_acquire_invocation_id(u); - if (r < 0) - return r; -@@ -2137,21 +2143,6 @@ static int mount_can_clean(Unit *u, ExecCleanMask *ret) { - return exec_context_get_clean_mask(&m->exec_context, ret); - } - --static int mount_test_start_limit(Unit *u) { -- Mount *m = MOUNT(u); -- int r; -- -- assert(m); -- -- r = unit_test_start_limit(u); -- if (r < 0) { -- mount_enter_dead(m, MOUNT_FAILURE_START_LIMIT_HIT); -- return r; -- } -- -- return 0; --} -- - static const char* const mount_exec_command_table[_MOUNT_EXEC_COMMAND_MAX] = { - [MOUNT_EXEC_MOUNT] = "ExecMount", - [MOUNT_EXEC_UNMOUNT] = "ExecUnmount", -@@ -2249,6 +2240,4 @@ const UnitVTable mount_vtable = { - [JOB_TIMEOUT] = "Timed out unmounting %s.", - }, - }, -- -- .test_start_limit = mount_test_start_limit, - }; -diff --git a/src/core/path.c b/src/core/path.c -index 2b659696a4..e098e83a31 100644 ---- a/src/core/path.c -+++ b/src/core/path.c -@@ -590,6 +590,12 @@ static int path_start(Unit *u) { - if (r < 0) - return r; - -+ r = unit_test_start_limit(u); -+ if (r < 0) { -+ path_enter_dead(p, PATH_FAILURE_START_LIMIT_HIT); -+ return r; -+ } -+ - r = unit_acquire_invocation_id(u); - if (r < 0) - return r; -@@ -805,21 +811,6 @@ static void path_reset_failed(Unit *u) { - p->result = PATH_SUCCESS; - } - --static int path_test_start_limit(Unit *u) { -- Path *p = PATH(u); -- int r; -- -- assert(p); -- -- r = unit_test_start_limit(u); -- if (r < 0) { -- path_enter_dead(p, PATH_FAILURE_START_LIMIT_HIT); -- return r; -- } -- -- return 0; --} -- - static const char* const path_type_table[_PATH_TYPE_MAX] = { - [PATH_EXISTS] = "PathExists", - [PATH_EXISTS_GLOB] = "PathExistsGlob", -@@ -874,6 +865,4 @@ const UnitVTable path_vtable = { - .reset_failed = path_reset_failed, - - .bus_set_property = bus_path_set_property, -- -- .test_start_limit = path_test_start_limit, - }; -diff --git a/src/core/service.c b/src/core/service.c -index 701c145565..7b90822f68 100644 ---- a/src/core/service.c -+++ b/src/core/service.c -@@ -2456,6 +2456,13 @@ static int service_start(Unit *u) { - - assert(IN_SET(s->state, SERVICE_DEAD, SERVICE_FAILED)); - -+ /* Make sure we don't enter a busy loop of some kind. */ -+ r = unit_test_start_limit(u); -+ if (r < 0) { -+ service_enter_dead(s, SERVICE_FAILURE_START_LIMIT_HIT, false); -+ return r; -+ } -+ - r = unit_acquire_invocation_id(u); - if (r < 0) - return r; -@@ -4451,22 +4458,6 @@ static const char *service_finished_job(Unit *u, JobType t, JobResult result) { - return NULL; - } - --static int service_test_start_limit(Unit *u) { -- Service *s = SERVICE(u); -- int r; -- -- assert(s); -- -- /* Make sure we don't enter a busy loop of some kind. */ -- r = unit_test_start_limit(u); -- if (r < 0) { -- service_enter_dead(s, SERVICE_FAILURE_START_LIMIT_HIT, false); -- return r; -- } -- -- return 0; --} -- - static const char* const service_restart_table[_SERVICE_RESTART_MAX] = { - [SERVICE_RESTART_NO] = "no", - [SERVICE_RESTART_ON_SUCCESS] = "on-success", -@@ -4629,6 +4620,4 @@ const UnitVTable service_vtable = { - }, - .finished_job = service_finished_job, - }, -- -- .test_start_limit = service_test_start_limit, - }; -diff --git a/src/core/socket.c b/src/core/socket.c -index 31d88b71ff..f362a5baa8 100644 ---- a/src/core/socket.c -+++ b/src/core/socket.c -@@ -2515,6 +2515,12 @@ static int socket_start(Unit *u) { - - assert(IN_SET(s->state, SOCKET_DEAD, SOCKET_FAILED)); - -+ r = unit_test_start_limit(u); -+ if (r < 0) { -+ socket_enter_dead(s, SOCKET_FAILURE_START_LIMIT_HIT); -+ return r; -+ } -+ - r = unit_acquire_invocation_id(u); - if (r < 0) - return r; -@@ -3423,21 +3429,6 @@ static int socket_can_clean(Unit *u, ExecCleanMask *ret) { - return exec_context_get_clean_mask(&s->exec_context, ret); - } - --static int socket_test_start_limit(Unit *u) { -- Socket *s = SOCKET(u); -- int r; -- -- assert(s); -- -- r = unit_test_start_limit(u); -- if (r < 0) { -- socket_enter_dead(s, SOCKET_FAILURE_START_LIMIT_HIT); -- return r; -- } -- -- return 0; --} -- - static const char* const socket_exec_command_table[_SOCKET_EXEC_COMMAND_MAX] = { - [SOCKET_EXEC_START_PRE] = "ExecStartPre", - [SOCKET_EXEC_START_CHOWN] = "ExecStartChown", -@@ -3564,6 +3555,4 @@ const UnitVTable socket_vtable = { - [JOB_TIMEOUT] = "Timed out stopping %s.", - }, - }, -- -- .test_start_limit = socket_test_start_limit, - }; -diff --git a/src/core/swap.c b/src/core/swap.c -index b25f68fb7d..3843b19500 100644 ---- a/src/core/swap.c -+++ b/src/core/swap.c -@@ -933,6 +933,12 @@ static int swap_start(Unit *u) { - if (UNIT(other)->job && UNIT(other)->job->state == JOB_RUNNING) - return -EAGAIN; - -+ r = unit_test_start_limit(u); -+ if (r < 0) { -+ swap_enter_dead(s, SWAP_FAILURE_START_LIMIT_HIT); -+ return r; -+ } -+ - r = unit_acquire_invocation_id(u); - if (r < 0) - return r; -@@ -1582,21 +1588,6 @@ static int swap_can_clean(Unit *u, ExecCleanMask *ret) { - return exec_context_get_clean_mask(&s->exec_context, ret); - } - --static int swap_test_start_limit(Unit *u) { -- Swap *s = SWAP(u); -- int r; -- -- assert(s); -- -- r = unit_test_start_limit(u); -- if (r < 0) { -- swap_enter_dead(s, SWAP_FAILURE_START_LIMIT_HIT); -- return r; -- } -- -- return 0; --} -- - static const char* const swap_exec_command_table[_SWAP_EXEC_COMMAND_MAX] = { - [SWAP_EXEC_ACTIVATE] = "ExecActivate", - [SWAP_EXEC_DEACTIVATE] = "ExecDeactivate", -@@ -1692,6 +1683,4 @@ const UnitVTable swap_vtable = { - [JOB_TIMEOUT] = "Timed out deactivating swap %s.", - }, - }, -- -- .test_start_limit = swap_test_start_limit, - }; -diff --git a/src/core/timer.c b/src/core/timer.c -index 5ecc9f35cf..e064ad9a2d 100644 ---- a/src/core/timer.c -+++ b/src/core/timer.c -@@ -635,6 +635,12 @@ static int timer_start(Unit *u) { - if (r < 0) - return r; - -+ r = unit_test_start_limit(u); -+ if (r < 0) { -+ timer_enter_dead(t, TIMER_FAILURE_START_LIMIT_HIT); -+ return r; -+ } -+ - r = unit_acquire_invocation_id(u); - if (r < 0) - return r; -@@ -895,21 +901,6 @@ static int timer_can_clean(Unit *u, ExecCleanMask *ret) { - return 0; - } - --static int timer_test_start_limit(Unit *u) { -- Timer *t = TIMER(u); -- int r; -- -- assert(t); -- -- r = unit_test_start_limit(u); -- if (r < 0) { -- timer_enter_dead(t, TIMER_FAILURE_START_LIMIT_HIT); -- return r; -- } -- -- return 0; --} -- - static const char* const timer_base_table[_TIMER_BASE_MAX] = { - [TIMER_ACTIVE] = "OnActiveSec", - [TIMER_BOOT] = "OnBootSec", -@@ -969,6 +960,4 @@ const UnitVTable timer_vtable = { - .timezone_change = timer_timezone_change, - - .bus_set_property = bus_timer_set_property, -- -- .test_start_limit = timer_test_start_limit, - }; -diff --git a/src/core/unit.c b/src/core/unit.c -index 69ed43578e..38d3eb703f 100644 ---- a/src/core/unit.c -+++ b/src/core/unit.c -@@ -1851,13 +1851,6 @@ int unit_start(Unit *u) { - - assert(u); - -- /* Check start rate limiting early so that failure conditions don't cause us to enter a busy loop. */ -- if (UNIT_VTABLE(u)->test_start_limit) { -- int r = UNIT_VTABLE(u)->test_start_limit(u); -- if (r < 0) -- return r; -- } -- - /* If this is already started, then this will succeed. Note that this will even succeed if this unit - * is not startable by the user. This is relied on to detect when we need to wait for units and when - * waiting is finished. */ -diff --git a/src/core/unit.h b/src/core/unit.h -index 9babd07188..759104ffa7 100644 ---- a/src/core/unit.h -+++ b/src/core/unit.h -@@ -649,10 +649,6 @@ typedef struct UnitVTable { - * of this type will immediately fail. */ - bool (*supported)(void); - -- /* If this function is set, it's invoked first as part of starting a unit to allow start rate -- * limiting checks to occur before we do anything else. */ -- int (*test_start_limit)(Unit *u); -- - /* The strings to print in status messages */ - UnitStatusMessageFormats status_message_formats; - -diff --git a/test/TEST-63-ISSUE-17433/Makefile b/test/TEST-63-ISSUE-17433/Makefile -deleted file mode 120000 -index e9f93b1104..0000000000 ---- a/test/TEST-63-ISSUE-17433/Makefile -+++ /dev/null -@@ -1 +0,0 @@ --../TEST-01-BASIC/Makefile -\ No newline at end of file -diff --git a/test/TEST-63-ISSUE-17433/test.sh b/test/TEST-63-ISSUE-17433/test.sh -deleted file mode 100755 -index c595a9f2de..0000000000 ---- a/test/TEST-63-ISSUE-17433/test.sh -+++ /dev/null -@@ -1,9 +0,0 @@ --#!/usr/bin/env bash --set -e -- --TEST_DESCRIPTION="https://github.com/systemd/systemd/issues/17433" -- --# shellcheck source=test/test-functions --. "${TEST_BASE_DIR:?}/test-functions" -- --do_test "$@" -diff --git a/test/meson.build b/test/meson.build -index 6f8f257c2d..47c7f4d49a 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -33,8 +33,6 @@ if install_tests - install_dir : testdata_dir) - install_subdir('testsuite-52.units', - install_dir : testdata_dir) -- install_subdir('testsuite-63.units', -- install_dir : testdata_dir) - - testsuite08_dir = testdata_dir + '/testsuite-08.units' - install_data('testsuite-08.units/-.mount', -diff --git a/test/testsuite-10.units/test10.service b/test/testsuite-10.units/test10.service -index 2fb476b986..d0be786b01 100644 ---- a/test/testsuite-10.units/test10.service -+++ b/test/testsuite-10.units/test10.service -@@ -1,9 +1,6 @@ - [Unit] - Requires=test10.socket - ConditionPathExistsGlob=/tmp/nonexistent --# Make sure we hit the socket trigger limit in the test and not the service start limit. --StartLimitInterval=1000 --StartLimitBurst=1000 - - [Service] - ExecStart=true -diff --git a/test/testsuite-63.units/test63.path b/test/testsuite-63.units/test63.path -deleted file mode 100644 -index a6573bda0a..0000000000 ---- a/test/testsuite-63.units/test63.path -+++ /dev/null -@@ -1,2 +0,0 @@ --[Path] --PathExists=/tmp/test63 -diff --git a/test/testsuite-63.units/test63.service b/test/testsuite-63.units/test63.service -deleted file mode 100644 -index c83801874d..0000000000 ---- a/test/testsuite-63.units/test63.service -+++ /dev/null -@@ -1,5 +0,0 @@ --[Unit] --ConditionPathExists=!/tmp/nonexistent -- --[Service] --ExecStart=true -diff --git a/test/units/testsuite-63.service b/test/units/testsuite-63.service -deleted file mode 100644 -index 04122723d4..0000000000 ---- a/test/units/testsuite-63.service -+++ /dev/null -@@ -1,16 +0,0 @@ --[Unit] --Description=TEST-63-ISSUE-17433 -- --[Service] --ExecStartPre=rm -f /failed /testok --Type=oneshot --ExecStart=rm -f /tmp/nonexistent --ExecStart=systemctl start test63.path --ExecStart=touch /tmp/test63 --# Make sure systemd has sufficient time to hit the start limit for test63.service. --ExecStart=sleep 2 --ExecStart=sh -x -c 'test "$(systemctl show test63.service -P ActiveState)" = failed' --ExecStart=sh -x -c 'test "$(systemctl show test63.service -P Result)" = start-limit-hit' --ExecStart=sh -x -c 'test "$(systemctl show test63.path -P ActiveState)" = failed' --ExecStart=sh -x -c 'test "$(systemctl show test63.path -P Result)" = unit-start-limit-hit' --ExecStart=sh -x -c 'echo OK >/testok' --- -2.31.1 - diff --git a/systemd-v249.5+suse.47.g8521f8d22f.tar.xz b/systemd-v249.5+suse.47.g8521f8d22f.tar.xz deleted file mode 100644 index 5c5dfb3d..00000000 --- a/systemd-v249.5+suse.47.g8521f8d22f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e8a0ffb611331f565bf6bc5b7ec30cf9725cf462b08dae3c2b7bd344d1c9ed7c -size 7268136 diff --git a/systemd-v249.6+suse.50.g61c79e6838.tar.xz b/systemd-v249.6+suse.50.g61c79e6838.tar.xz new file mode 100644 index 00000000..83096fae --- /dev/null +++ b/systemd-v249.6+suse.50.g61c79e6838.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:18f1ac7b13a20f603d4a3601d17afa2ba9f0856f0e3efa83455735121ecc394e +size 7269052 diff --git a/systemd.changes b/systemd.changes index 307f8f06..f8d24e23 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Mon Nov 15 09:35:08 UTC 2021 - Franck Bui + +- Import commit 61c79e68381801428c0bc00a56b9e2e9cfa68373 (merge of 249.6) + + bcdeee7b4c virt: Support detection for ARM64 Hyper-V guests (bsc#1186071) + [...] + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8521f8d22fd44400289fcea03493ebd7f8b1487d...61c79e68381801428c0bc00a56b9e2e9cfa68373 + +- Drop 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch + + It's part of v249.6. + ------------------------------------------------------------------- Tue Nov 2 10:26:58 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 1be7837f..d1a7e15f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.47.g8521f8d22f +%define suse_version +suse.50.g61c79e6838 %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -69,7 +69,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.5 +Version: 249.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -209,7 +209,6 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. -Patch100: 0001-Revert-core-Check-unit-start-rate-limiting-earlier.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -898,6 +897,8 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} cp -a test %{buildroot}%{_testsuitedir}/ +# kbd-model-map became a dangling symlink, drop it. +rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif From 300b159d93908a2e8ffd8b826081c8757dd9be45ccb6a7e57df0f2c6ecbfd69d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 24 Nov 2021 22:54:17 +0000 Subject: [PATCH 083/124] Accepting request 933100 from Base:System - Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of 249.7) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/c34c98712600bc206919ec6ed136195f75ac1967...523f32df573d459551760b072cb62906f4a2cf23 - Import commit c34c98712600bc206919ec6ed136195f75ac1967 f99aa40c6e TEST-12: make sure 'adm' group exist 6c7194ff99 TEST-08: don't force ext4 for / dd1814b8f9 test: use kbd-mode-map we ship in one more test case 94c5febf2a test: fix TEST-10-ISSUE-2467 - Update the dependencies of the systemd-testsuite sub-package. OBS-URL: https://build.opensuse.org/request/show/933100 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=341 --- systemd-v249.6+suse.50.g61c79e6838.tar.xz | 3 --- systemd-v249.7+suse.57.g523f32df57.tar.xz | 3 +++ systemd.changes | 20 ++++++++++++++++++++ systemd.spec | 12 ++++++++++-- 4 files changed, 33 insertions(+), 5 deletions(-) delete mode 100644 systemd-v249.6+suse.50.g61c79e6838.tar.xz create mode 100644 systemd-v249.7+suse.57.g523f32df57.tar.xz diff --git a/systemd-v249.6+suse.50.g61c79e6838.tar.xz b/systemd-v249.6+suse.50.g61c79e6838.tar.xz deleted file mode 100644 index 83096fae..00000000 --- a/systemd-v249.6+suse.50.g61c79e6838.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18f1ac7b13a20f603d4a3601d17afa2ba9f0856f0e3efa83455735121ecc394e -size 7269052 diff --git a/systemd-v249.7+suse.57.g523f32df57.tar.xz b/systemd-v249.7+suse.57.g523f32df57.tar.xz new file mode 100644 index 00000000..b19fc651 --- /dev/null +++ b/systemd-v249.7+suse.57.g523f32df57.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:688c3f4409788f5ecea74d1dd6c5d1b2fbeb789a6c24c79bd35ed5f62c4b119c +size 7275376 diff --git a/systemd.changes b/systemd.changes index f8d24e23..ea9ee3fc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Mon Nov 22 08:48:12 UTC 2021 - Franck Bui + +- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of 249.7) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/c34c98712600bc206919ec6ed136195f75ac1967...523f32df573d459551760b072cb62906f4a2cf23 + +- Import commit c34c98712600bc206919ec6ed136195f75ac1967 + + f99aa40c6e TEST-12: make sure 'adm' group exist + 6c7194ff99 TEST-08: don't force ext4 for / + dd1814b8f9 test: use kbd-mode-map we ship in one more test case + 94c5febf2a test: fix TEST-10-ISSUE-2467 + +------------------------------------------------------------------- +Mon Nov 22 08:43:25 UTC 2021 - Franck Bui + +- Update the dependencies of the systemd-testsuite sub-package. + ------------------------------------------------------------------- Mon Nov 15 09:35:08 UTC 2021 - Franck Bui diff --git a/systemd.spec b/systemd.spec index d1a7e15f..522090e0 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.50.g61c79e6838 +%define suse_version +suse.57.g523f32df57 %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -69,7 +69,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.6 +Version: 249.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -518,6 +518,7 @@ Requires: cryptsetup Requires: dosfstools Requires: libcap-progs Requires: lz4 +Requires: make Requires: netcat Requires: qemu-kvm Requires: quota @@ -537,6 +538,9 @@ Requires: systemd-experimental %if %{with journal_remote} Requires: systemd-journal-remote %endif +%if %{with networkd} +Requires: systemd-network +%endif %if %{with portabled} Requires: systemd-portable %endif @@ -897,6 +901,10 @@ rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} cp -a test %{buildroot}%{_testsuitedir}/ +# When the tests are installed, the effective testdata directory is in +# %{_testsuitedir}, the other one, which is actually a symlink, is +# only useful when the tests are run directly from the source. +rm %{buildroot}%{_testsuitedir}/test/testdata # kbd-model-map became a dangling symlink, drop it. rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; From 3e428f30bdf95ecc191dfeff0d379a8726ae926f758d5507bb24b9207682b582 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 7 Jan 2022 11:44:33 +0000 Subject: [PATCH 084/124] Accepting request 943712 from Base:System - Update systemd-user PAM service again Change the default implementation of pam_setcred() again, previously customized to run the full "auth" PAM stack and only call pam_deny.so which is basically the SUSE default behavior without pam_warn.so. This is considered safer, especially on SLE where a regression was spotted by QA. - move files related to static nodes to udev - Replace S:$n references with SOURCE$n. Makes vim * search work. OBS-URL: https://build.opensuse.org/request/show/943712 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=342 --- systemd-user | 21 +++++++++++---------- systemd.changes | 23 +++++++++++++++++++++++ systemd.spec | 20 ++++++++++++-------- 3 files changed, 46 insertions(+), 18 deletions(-) diff --git a/systemd-user b/systemd-user index 3907c885..066515cd 100644 --- a/systemd-user +++ b/systemd-user @@ -2,18 +2,19 @@ # # Used by systemd --user instances. -# This is not about authentication per se (user@.service is a system -# service anyway) but to give the possibility to user services -# (especially those like gnome-terminal, see [1]) to have theirs -# credentials extended similar to the ones received by a user when he -# logs in (and the full PAM authentication stack is run). See [2] and -# [3] for details. +# Override the default behavior of the "auth" PAM stack and don't throw a +# warning each time a user instance is started, which is the default behavior of +# the PAM stack when no auth is defined. Indeed PID1 calls pam_setcred() when +# the user instance is about to be started to allow some user services, such as +# gnome-terminal, to extend theirs credentials similar to the ones received by a +# user when he logs in (and the full PAM authentication stack is run). For some +# details, see: # -# [1] https://gitlab.gnome.org/GNOME/gdm/-/issues/393 -# [2] https://github.com/systemd/systemd/issues/11198 -# [3] https://bugzilla.suse.com/show_bug.cgi?id=1190515 +# https://gitlab.gnome.org/GNOME/gdm/-/issues/393 +# https://github.com/systemd/systemd/issues/11198 +# https://bugzilla.suse.com/show_bug.cgi?id=1190515 # -auth include common-auth +auth required pam_deny.so account include common-account diff --git a/systemd.changes b/systemd.changes index ea9ee3fc..1b31cf54 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Tue Jan 4 08:23:19 UTC 2022 - Franck Bui + +- Update systemd-user PAM service again + + Change the default implementation of pam_setcred() again, previously + customized to run the full "auth" PAM stack and only call pam_deny.so which is + basically the SUSE default behavior without pam_warn.so. + + This is considered safer, especially on SLE where a regression was spotted by + QA. + +------------------------------------------------------------------- +Tue Dec 7 12:05:55 UTC 2021 - Ludwig Nussel + +- move files related to static nodes to udev + +------------------------------------------------------------------- +Wed Nov 24 10:40:01 UTC 2021 - Ludwig Nussel + +- Replace S:$n references with SOURCE$n. Makes vim * search work. + ------------------------------------------------------------------- Mon Nov 22 08:48:12 UTC 2021 - Franck Bui @@ -281,6 +303,7 @@ Mon Aug 2 12:54:44 UTC 2021 - Franck Bui This includes the following bug fixes: - upstream commit 6fb61918ccdd0610b425d5b0e5417751f8f8f783 (bsc#1182870) + - upstream commit 6fe2a70b9160e35fdeed9d37bd31727c2d46a8b2 (jsc#SLE-17798) - Rebased 0002-rc-local-fix-ordering-startup-for-etc-init.d-boot.lo.patch 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch diff --git a/systemd.spec b/systemd.spec index 522090e0..616eb386 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2021 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -725,8 +725,8 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1* mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated -install -m0755 -D %{S:3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert -install -m0755 -D %{S:4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert +install -m0755 -D %{SOURCE4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install %endif mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network @@ -735,7 +735,7 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't # allow directory structure... -for s in %{S:100} %{S:101} %{S:102}; do +for s in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} done @@ -759,7 +759,7 @@ rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. -install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{S:2} +install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2} # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -824,7 +824,7 @@ mkdir -p %{buildroot}%{_systemd_system_env_generator_dir} mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} # ensure after.local wrapper is called -install -m 644 %{S:11} %{buildroot}%{_unitdir}/ +install -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/ ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/ # ghost directories with default permissions. @@ -867,7 +867,7 @@ echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset # still keep the remaining paths that still don't have a better home # in suse.conf. rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf -install -m 644 %{S:5} %{buildroot}%{_tmpfilesdir}/suse.conf +install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/suse.conf # The content of the files shipped by systemd doesn't match the # defaults used by SUSE. Don't ship those files but leave the decision @@ -891,7 +891,7 @@ fi # kbd-model-map.legacy is used to provide mapping for legacy keymaps, # which may still be used by yast. -cat %{S:14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map # Don't ship systemd-journald-audit.socket as there's no other way for # us to prevent journald from recording audit messages in the journal @@ -1304,6 +1304,8 @@ fi %exclude %{_unitdir}/*.target.wants/systemd-hwdb*.* %exclude %{_unitdir}/initrd-udevadm-cleanup-db.service %exclude %{_unitdir}/kmod-static-nodes.service +%exclude %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service +%exclude %{_tmpfilesdir}/static-nodes-permissions.conf %exclude %{_unitdir}/systemd-nspawn@.service %if %{with machined} %exclude %{_prefix}/lib/systemd/systemd-machined @@ -1651,6 +1653,8 @@ fi %dir %{_unitdir} %{_prefix}/lib/systemd/systemd-udevd %{_unitdir}/kmod-static-nodes.service +%{_unitdir}/sysinit.target.wants/kmod-static-nodes.service +%{_tmpfilesdir}/static-nodes-permissions.conf %{_unitdir}/systemd-udev*.service %{_unitdir}/systemd-udevd*.socket %{_unitdir}/systemd-hwdb*.* From 81bf92596fb103fa54b7de8b49263abfe2c026ac32638b1ebf098edb2fd57b11 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 11 Jan 2022 23:26:25 +0000 Subject: [PATCH 085/124] Accepting request 945520 from Base:System - Added patches to fix CVE-2021-3997 (bsc#1194178) 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch These patches will be dropped and cherry-picked from upstream once upstream will commit them in their main branch. - Import commit a54f80116ccf105dff11aef5d18dd110ebd3e8ee 30cbebc56f tmpfiles: 'st' may have been used uninitialized 5443654ec0 macro: add new helper RET_NERRNO() 8d90ecc435 rm-rf: optionally fsync() after removing directory tree 591344010d rm-rf: refactor rm_rf_children(), split out body of directory iteration loop 8c7762c4f1 Bump the max number of inodes for /dev to a million (bsc#1192858) dc9476c881 journal: don't remove the flushed flag when journald is stopped 29efc29efd TEST-10: don't attempt to write a byte to the socket 773fb785b6 Bump the max number of inodes for /dev to 128k (bsc#1192858) OBS-URL: https://build.opensuse.org/request/show/945520 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=343 --- ...actor-rm_rf_children_inner-to-shorte.patch | 66 +++++ ...refactor-rm_rf-to-shorten-code-a-bit.patch | 98 +++++++ ...p-over-nested-directories-instead-of.patch | 273 ++++++++++++++++++ systemd-v249.7+suse.57.g523f32df57.tar.xz | 3 - systemd-v249.7+suse.66.ga54f80116c.tar.xz | 3 + systemd.changes | 26 ++ systemd.spec | 8 +- 7 files changed, 473 insertions(+), 4 deletions(-) create mode 100644 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch create mode 100644 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch create mode 100644 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch delete mode 100644 systemd-v249.7+suse.57.g523f32df57.tar.xz create mode 100644 systemd-v249.7+suse.66.ga54f80116c.tar.xz diff --git a/5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch b/5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch new file mode 100644 index 00000000..bb00830b --- /dev/null +++ b/5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch @@ -0,0 +1,66 @@ +From 5bc4f2e271c4907af1d3208c5bb33ce795326abc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 23 Nov 2021 15:55:45 +0100 +Subject: [PATCH 5000/5002] shared/rm_rf: refactor rm_rf_children_inner() to + shorten code a bit + +--- + src/shared/rm-rf.c | 27 +++++++++------------------ + 1 file changed, 9 insertions(+), 18 deletions(-) + +diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c +index 19f37e0f19..7362954116 100644 +--- a/src/shared/rm-rf.c ++++ b/src/shared/rm-rf.c +@@ -124,7 +124,7 @@ static int rm_rf_children_inner( + const struct stat *root_dev) { + + struct stat st; +- int r; ++ int r, q = 0; + + assert(fd >= 0); + assert(fname); +@@ -142,7 +142,6 @@ static int rm_rf_children_inner( + + if (is_dir) { + _cleanup_close_ int subdir_fd = -1; +- int q; + + /* if root_dev is set, remove subdirectories only if device is same */ + if (root_dev && st.st_dev != root_dev->st_dev) +@@ -178,23 +177,15 @@ static int rm_rf_children_inner( + * again for each directory */ + q = rm_rf_children(TAKE_FD(subdir_fd), flags | REMOVE_PHYSICAL, root_dev); + +- r = unlinkat_harder(fd, fname, AT_REMOVEDIR, flags); +- if (r < 0) +- return r; +- if (q < 0) +- return q; +- +- return 1; +- +- } else if (!(flags & REMOVE_ONLY_DIRECTORIES)) { +- r = unlinkat_harder(fd, fname, 0, flags); +- if (r < 0) +- return r; +- +- return 1; +- } ++ } else if (flags & REMOVE_ONLY_DIRECTORIES) ++ return 0; + +- return 0; ++ r = unlinkat_harder(fd, fname, is_dir ? AT_REMOVEDIR : 0, flags); ++ if (r < 0) ++ return r; ++ if (q < 0) ++ return q; ++ return 1; + } + + int rm_rf_children( +-- +2.31.1 + diff --git a/5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch b/5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch new file mode 100644 index 00000000..347b5e55 --- /dev/null +++ b/5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch @@ -0,0 +1,98 @@ +From 8f608df0305355c9b2ddd7c75926a6bd6247e635 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 23 Nov 2021 16:56:42 +0100 +Subject: [PATCH 5001/5002] shared/rm_rf: refactor rm_rf() to shorten code a + bit + +--- + src/shared/rm-rf.c | 53 ++++++++++++++++++++-------------------------- + 1 file changed, 23 insertions(+), 30 deletions(-) + +diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c +index 7362954116..c7d3b8b7ad 100644 +--- a/src/shared/rm-rf.c ++++ b/src/shared/rm-rf.c +@@ -250,7 +250,7 @@ int rm_rf_children( + } + + int rm_rf(const char *path, RemoveFlags flags) { +- int fd, r; ++ int fd, r, q = 0; + + assert(path); + +@@ -282,49 +282,42 @@ int rm_rf(const char *path, RemoveFlags flags) { + } + + fd = open(path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); +- if (fd < 0) { ++ if (fd >= 0) { ++ /* We have a dir */ ++ r = rm_rf_children(fd, flags, NULL); ++ ++ if (FLAGS_SET(flags, REMOVE_ROOT)) ++ q = RET_NERRNO(rmdir(path)); ++ } else { + if (FLAGS_SET(flags, REMOVE_MISSING_OK) && errno == ENOENT) + return 0; + + if (!IN_SET(errno, ENOTDIR, ELOOP)) + return -errno; + +- if (FLAGS_SET(flags, REMOVE_ONLY_DIRECTORIES)) ++ if (FLAGS_SET(flags, REMOVE_ONLY_DIRECTORIES) || !FLAGS_SET(flags, REMOVE_ROOT)) + return 0; + +- if (FLAGS_SET(flags, REMOVE_ROOT)) { +- +- if (!FLAGS_SET(flags, REMOVE_PHYSICAL)) { +- struct statfs s; +- +- if (statfs(path, &s) < 0) +- return -errno; +- if (is_physical_fs(&s)) +- return log_error_errno(SYNTHETIC_ERRNO(EPERM), +- "Attempted to remove files from a disk file system under \"%s\", refusing.", +- path); +- } +- +- if (unlink(path) < 0) { +- if (FLAGS_SET(flags, REMOVE_MISSING_OK) && errno == ENOENT) +- return 0; ++ if (!FLAGS_SET(flags, REMOVE_PHYSICAL)) { ++ struct statfs s; + ++ if (statfs(path, &s) < 0) + return -errno; +- } ++ if (is_physical_fs(&s)) ++ return log_error_errno(SYNTHETIC_ERRNO(EPERM), ++ "Attempted to remove files from a disk file system under \"%s\", refusing.", ++ path); + } + +- return 0; ++ r = 0; ++ q = RET_NERRNO(unlink(path)); + } + +- r = rm_rf_children(fd, flags, NULL); +- +- if (FLAGS_SET(flags, REMOVE_ROOT) && +- rmdir(path) < 0 && +- r >= 0 && +- (!FLAGS_SET(flags, REMOVE_MISSING_OK) || errno != ENOENT)) +- r = -errno; +- +- return r; ++ if (r < 0) ++ return r; ++ if (q < 0 && (q != -ENOENT || !FLAGS_SET(flags, REMOVE_MISSING_OK))) ++ return q; ++ return 0; + } + + int rm_rf_child(int fd, const char *name, RemoveFlags flags) { +-- +2.31.1 + diff --git a/5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch b/5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch new file mode 100644 index 00000000..9c7eac68 --- /dev/null +++ b/5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch @@ -0,0 +1,273 @@ +From c561e2eab3b9b759b7592ea1b8168d4f36ede031 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Wed, 5 Jan 2022 15:08:07 +0100 +Subject: [PATCH 5002/5002] shared/rm-rf: loop over nested directories instead + of instead of recursing + +To remove directory structures, we need to remove the innermost items first, +and then recursively remove higher-level directories. We would recursively +descend into directories and invoke rm_rf_children and rm_rm_children_inner. +This is problematic when too many directories are nested. + +Instead, let's create a "TODO" queue. In the the queue, for each level we +hold the DIR* object we were working on, and the name of the directory. This +allows us to leave a partially-processed directory, and restart the removal +loop one level down. When done with the inner directory, we use the name to +unlinkat() it from the parent, and proceed with the removal of other items. + +Because the nesting is increased by one level, it is best to view this patch +with -b/--ignore-space-change. + +This fixes CVE-2021-3997, https://bugzilla.redhat.com/show_bug.cgi?id=2024639. +The issue was reported and patches reviewed by Qualys Team. +Mauro Matteo Cascella and Riccardo Schirone from Red Hat handled the disclosure. + +[fbui: adjust context] +[fbui: fixes CVE-2021-3997] +[fbui: fixes bsc#1194178] +--- + src/shared/rm-rf.c | 159 +++++++++++++++++++++++++++++++-------------- + 1 file changed, 112 insertions(+), 47 deletions(-) + +diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c +index c7d3b8b7ad..58da213e9f 100644 +--- a/src/shared/rm-rf.c ++++ b/src/shared/rm-rf.c +@@ -52,7 +52,6 @@ static int patch_dirfd_mode( + } + + int unlinkat_harder(int dfd, const char *filename, int unlink_flags, RemoveFlags remove_flags) { +- + mode_t old_mode; + int r; + +@@ -116,12 +115,13 @@ int fstatat_harder(int dfd, + return 0; + } + +-static int rm_rf_children_inner( ++static int rm_rf_inner_child( + int fd, + const char *fname, + int is_dir, + RemoveFlags flags, +- const struct stat *root_dev) { ++ const struct stat *root_dev, ++ bool allow_recursion) { + + struct stat st; + int r, q = 0; +@@ -141,9 +141,7 @@ static int rm_rf_children_inner( + } + + if (is_dir) { +- _cleanup_close_ int subdir_fd = -1; +- +- /* if root_dev is set, remove subdirectories only if device is same */ ++ /* If root_dev is set, remove subdirectories only if device is same */ + if (root_dev && st.st_dev != root_dev->st_dev) + return 0; + +@@ -155,7 +153,6 @@ static int rm_rf_children_inner( + return 0; + + if ((flags & REMOVE_SUBVOLUME) && btrfs_might_be_subvol(&st)) { +- + /* This could be a subvolume, try to remove it */ + + r = btrfs_subvol_remove_fd(fd, fname, BTRFS_REMOVE_RECURSIVE|BTRFS_REMOVE_QUOTA); +@@ -169,13 +166,16 @@ static int rm_rf_children_inner( + return 1; + } + +- subdir_fd = openat(fd, fname, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); ++ if (!allow_recursion) ++ return -EISDIR; ++ ++ int subdir_fd = openat(fd, fname, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); + if (subdir_fd < 0) + return -errno; + + /* We pass REMOVE_PHYSICAL here, to avoid doing the fstatfs() to check the file system type + * again for each directory */ +- q = rm_rf_children(TAKE_FD(subdir_fd), flags | REMOVE_PHYSICAL, root_dev); ++ q = rm_rf_children(subdir_fd, flags | REMOVE_PHYSICAL, root_dev); + + } else if (flags & REMOVE_ONLY_DIRECTORIES) + return 0; +@@ -188,63 +188,128 @@ static int rm_rf_children_inner( + return 1; + } + ++typedef struct TodoEntry { ++ DIR *dir; /* A directory that we were operating on. */ ++ char *dirname; /* The filename of that directory itself. */ ++} TodoEntry; ++ ++static void free_todo_entries(TodoEntry **todos) { ++ for (TodoEntry *x = *todos; x && x->dir; x++) { ++ closedir(x->dir); ++ free(x->dirname); ++ } ++ ++ freep(todos); ++} ++ + int rm_rf_children( + int fd, + RemoveFlags flags, + const struct stat *root_dev) { + +- _cleanup_closedir_ DIR *d = NULL; ++ _cleanup_(free_todo_entries) TodoEntry *todos = NULL; + struct dirent *de; ++ size_t n_todo = 0; ++ _cleanup_free_ char *dirname = NULL; /* Set when we are recursing and want to delete ourselves */ + int ret = 0, r; + +- assert(fd >= 0); ++ /* Return the first error we run into, but nevertheless try to go on. ++ * The passed fd is closed in all cases, including on failure. */ ++ ++ for (;;) { /* This loop corresponds to the directory nesting level. */ ++ _cleanup_closedir_ DIR *d = NULL; ++ ++ if (n_todo > 0) { ++ /* We know that we are in recursion here, because n_todo is set. ++ * We need to remove the inner directory we were operating on. */ ++ assert(dirname); ++ r = unlinkat_harder(dirfd(todos[n_todo-1].dir), dirname, AT_REMOVEDIR, flags); ++ if (r < 0 && r != -ENOENT && ret == 0) ++ ret = r; ++ dirname = mfree(dirname); ++ ++ /* And now let's back out one level up */ ++ n_todo --; ++ d = TAKE_PTR(todos[n_todo].dir); ++ dirname = TAKE_PTR(todos[n_todo].dirname); ++ ++ assert(d); ++ fd = dirfd(d); /* Retrieve the file descriptor from the DIR object */ ++ assert(fd >= 0); ++ } else { ++ next_fd: ++ assert(fd >= 0); ++ d = fdopendir(fd); ++ if (!d) { ++ safe_close(fd); ++ return -errno; ++ } ++ fd = dirfd(d); /* We donated the fd to fdopendir(). Let's make sure we sure we have ++ * the right descriptor even if it were to internally invalidate the ++ * one we passed. */ ++ ++ if (!(flags & REMOVE_PHYSICAL)) { ++ struct statfs sfs; ++ ++ if (fstatfs(fd, &sfs) < 0) ++ return -errno; ++ ++ if (is_physical_fs(&sfs)) { ++ /* We refuse to clean physical file systems with this call, unless ++ * explicitly requested. This is extra paranoia just to be sure we ++ * never ever remove non-state data. */ ++ ++ _cleanup_free_ char *path = NULL; ++ ++ (void) fd_get_path(fd, &path); ++ return log_error_errno(SYNTHETIC_ERRNO(EPERM), ++ "Attempted to remove disk file system under \"%s\", and we can't allow that.", ++ strna(path)); ++ } ++ } ++ } + +- /* This returns the first error we run into, but nevertheless tries to go on. This closes the passed +- * fd, in all cases, including on failure. */ ++ FOREACH_DIRENT_ALL(de, d, return -errno) { ++ int is_dir; + +- d = fdopendir(fd); +- if (!d) { +- safe_close(fd); +- return -errno; +- } ++ if (dot_or_dot_dot(de->d_name)) ++ continue; + +- if (!(flags & REMOVE_PHYSICAL)) { +- struct statfs sfs; ++ is_dir = de->d_type == DT_UNKNOWN ? -1 : de->d_type == DT_DIR; + +- if (fstatfs(dirfd(d), &sfs) < 0) +- return -errno; ++ r = rm_rf_inner_child(fd, de->d_name, is_dir, flags, root_dev, false); ++ if (r == -EISDIR) { ++ /* Push the current working state onto the todo list */ + +- if (is_physical_fs(&sfs)) { +- /* We refuse to clean physical file systems with this call, unless explicitly +- * requested. This is extra paranoia just to be sure we never ever remove non-state +- * data. */ ++ if (!GREEDY_REALLOC0(todos, n_todo + 2)) ++ return log_oom(); + +- _cleanup_free_ char *path = NULL; ++ _cleanup_free_ char *newdirname = strdup(de->d_name); ++ if (!newdirname) ++ return log_oom(); + +- (void) fd_get_path(fd, &path); +- return log_error_errno(SYNTHETIC_ERRNO(EPERM), +- "Attempted to remove disk file system under \"%s\", and we can't allow that.", +- strna(path)); +- } +- } ++ int newfd = openat(fd, de->d_name, ++ O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); ++ if (newfd >= 0) { ++ todos[n_todo++] = (TodoEntry) { TAKE_PTR(d), TAKE_PTR(dirname) }; ++ fd = newfd; ++ dirname = TAKE_PTR(newdirname); + +- FOREACH_DIRENT_ALL(de, d, return -errno) { +- int is_dir; ++ goto next_fd; + +- if (dot_or_dot_dot(de->d_name)) +- continue; ++ } else if (errno != -ENOENT && ret == 0) ++ ret = -errno; + +- is_dir = +- de->d_type == DT_UNKNOWN ? -1 : +- de->d_type == DT_DIR; ++ } else if (r < 0 && r != -ENOENT && ret == 0) ++ ret = r; ++ } + +- r = rm_rf_children_inner(dirfd(d), de->d_name, is_dir, flags, root_dev); +- if (r < 0 && r != -ENOENT && ret == 0) +- ret = r; +- } ++ if (FLAGS_SET(flags, REMOVE_SYNCFS) && syncfs(fd) < 0 && ret >= 0) ++ ret = -errno; + +- if (FLAGS_SET(flags, REMOVE_SYNCFS) && syncfs(dirfd(d)) < 0 && ret >= 0) +- ret = -errno; ++ if (n_todo == 0) ++ break; ++ } + + return ret; + } +@@ -336,5 +401,5 @@ int rm_rf_child(int fd, const char *name, RemoveFlags flags) { + if (FLAGS_SET(flags, REMOVE_ONLY_DIRECTORIES|REMOVE_SUBVOLUME)) + return -EINVAL; + +- return rm_rf_children_inner(fd, name, -1, flags, NULL); ++ return rm_rf_inner_child(fd, name, -1, flags, NULL, true); + } +-- +2.31.1 + diff --git a/systemd-v249.7+suse.57.g523f32df57.tar.xz b/systemd-v249.7+suse.57.g523f32df57.tar.xz deleted file mode 100644 index b19fc651..00000000 --- a/systemd-v249.7+suse.57.g523f32df57.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:688c3f4409788f5ecea74d1dd6c5d1b2fbeb789a6c24c79bd35ed5f62c4b119c -size 7275376 diff --git a/systemd-v249.7+suse.66.ga54f80116c.tar.xz b/systemd-v249.7+suse.66.ga54f80116c.tar.xz new file mode 100644 index 00000000..e1babceb --- /dev/null +++ b/systemd-v249.7+suse.66.ga54f80116c.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:91b2f8c8492b03612c3148615a39d7553632798941456e7702306837f0118dd8 +size 7276848 diff --git a/systemd.changes b/systemd.changes index 1b31cf54..b3e7e524 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,29 @@ +------------------------------------------------------------------- +Tue Jan 11 08:06:11 UTC 2022 - Franck Bui + +- Added patches to fix CVE-2021-3997 (bsc#1194178) + + 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch + 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch + 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch + + These patches will be dropped and cherry-picked from upstream once upstream + will commit them in their main branch. + +------------------------------------------------------------------- +Thu Jan 6 14:31:21 UTC 2022 - Franck Bui + +- Import commit a54f80116ccf105dff11aef5d18dd110ebd3e8ee + + 30cbebc56f tmpfiles: 'st' may have been used uninitialized + 5443654ec0 macro: add new helper RET_NERRNO() + 8d90ecc435 rm-rf: optionally fsync() after removing directory tree + 591344010d rm-rf: refactor rm_rf_children(), split out body of directory iteration loop + 8c7762c4f1 Bump the max number of inodes for /dev to a million (bsc#1192858) + dc9476c881 journal: don't remove the flushed flag when journald is stopped + 29efc29efd TEST-10: don't attempt to write a byte to the socket + 773fb785b6 Bump the max number of inodes for /dev to 128k (bsc#1192858) + ------------------------------------------------------------------- Tue Jan 4 08:23:19 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 616eb386..2219cded 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.57.g523f32df57 +%define suse_version +suse.66.ga54f80116c %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -210,6 +210,12 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # temporary and should be removed as soon as a fix is merged by # upstream. +# The following patches address CVE-2021-3997. They will be moved to the git +# repo once the issue will become public and upstream will release them. +Patch5000: 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch +Patch5001: 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch +Patch5002: 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch + %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization From 49e3c4604e6a7a41bf0bce0a3a11f090b60c0deb89e493c2f7eb299a31d05260 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 21 Jan 2022 00:25:13 +0000 Subject: [PATCH 086/124] Accepting request 947453 from Base:System - Move the systemd-network-generator stuff in udev package This generator can generate .link files and is mainly used in initrd where udev is mandatory. - Restore /sbin/udevadm and /bin/systemctl (obsolete) paths when split_usr is true (bsc#1194519) - Import commit 3743acbce3bd44208af453fc6dc384a1236dc83c (merge of v249.9) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/e2ca79dd775d1f7d39861d57f23c43f6cd85a872...3743acbce3bd44208af453fc6dc384a1236dc83c - Extract bits from 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch which are not specific to the handling of 'Required-Start:' and move them into a new patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch - Import commit e2ca79dd775d1f7d39861d57f23c43f6cd85a872 (merge of v249.8) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/458220239c69b8e5fe7be480929348daeccb70d1...e2ca79dd775d1f7d39861d57f23c43f6cd85a872 - Import commit 458220239c69b8e5fe7be480929348daeccb70d1 e95df40b09 shared/rm-rf: loop over nested directories instead of instead of recursing (CVE-2021-3997 bsc#1194178) 078e04305d shared/rm_rf: refactor rm_rf() to shorten code a bit 6d560d0aca shared/rm_rf: refactor rm_rf_children_inner() to shorten code a bit 6666ff056c localectl: don't omit keymaps files that are symlinks (bsc#1191826) - Drop the following patches as they have been merged into SUSE/v249 branch: 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch - Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of v249.7) OBS-URL: https://build.opensuse.org/request/show/947453 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=344 --- ...ranslate-Required-Start-into-a-Wants.patch | 65 ++--- ...ole-specificities-weirdness-for-s390.patch | 2 +- ...pport-for-all-virtual-facility-and-f.patch | 43 +++ ...actor-rm_rf_children_inner-to-shorte.patch | 66 ----- ...refactor-rm_rf-to-shorten-code-a-bit.patch | 98 ------- ...p-over-nested-directories-instead-of.patch | 273 ------------------ systemd-sysv-install | 16 +- systemd-v249.7+suse.66.ga54f80116c.tar.xz | 3 - systemd-v249.9+suse.75.g3743acbce3.tar.xz | 3 + systemd.changes | 57 +++- systemd.spec | 63 ++-- 11 files changed, 160 insertions(+), 529 deletions(-) create mode 100644 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch delete mode 100644 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch delete mode 100644 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch delete mode 100644 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch delete mode 100644 systemd-v249.7+suse.66.ga54f80116c.tar.xz create mode 100644 systemd-v249.9+suse.75.g3743acbce3.tar.xz diff --git a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch index 55b44930..001c0a6c 100644 --- a/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +++ b/0008-sysv-generator-translate-Required-Start-into-a-Wants.patch @@ -1,59 +1,28 @@ -From 7f59f7b1b506c1394712ad3d6bab81318052a14c Mon Sep 17 00:00:00 2001 +From 9e6a1f4b085b29abaf90ecd05859537b837b39fe Mon Sep 17 00:00:00 2001 From: Thomas Blume Date: Wed, 4 May 2016 17:40:04 +0200 -Subject: [PATCH 08/11] sysv-generator: translate "Required-Start" into a - "Wants" dependency +Subject: [PATCH 8/8] sysv-generator: translate "Required-Start" into a "Wants" + dependency + +'Required-Start:' used to be supported by insserv but this functionality was +dropped when insserv was rewritten into a compat perl wrapper (insserv-compat), +which happened when systemd was introduced in SUSE, I guess. + +It's been decided to add back the support in systemd instead of insserv-compat, +see the comments in bsc#857204. [tblume: Port of SLES12SP1 patch 0018-Make-LSB-Skripts-know-about-Required-and-Should.patch] -[fbui: this is needed probably because insserv's behavior has been - sadly changed since SLE11: it now doesn't failed if a - dependency listed by Required-Start is missing.] - -[fbui: according to Werner "This should fix bnc#858864 and - bnc#857204." (see Base:System changelog)] +[wfink: fixes bsc#857204] --- - src/sysv-generator/sysv-generator.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) + src/sysv-generator/sysv-generator.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index fa5355c964..62755f3652 100644 +index bf23c48662..c6e1953839 100644 --- a/src/sysv-generator/sysv-generator.c +++ b/src/sysv-generator/sysv-generator.c -@@ -257,6 +257,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - "remote_fs", SPECIAL_REMOTE_FS_TARGET, - "syslog", NULL, - "time", SPECIAL_TIME_SYNC_TARGET, -+ "all", SPECIAL_DEFAULT_TARGET, - }; - - const char *filename; -@@ -271,6 +272,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - - filename = basename(s->path); - -+ n = *name == '+' ? ++name : name; - n = *name == '$' ? name + 1 : name; - - for (i = 0; i < ELEMENTSOF(table); i += 2) { -@@ -407,7 +409,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text - - for (;;) { - _cleanup_free_ char *word = NULL, *m = NULL; -- bool is_before; -+ bool is_before, is_wanted; - - r = extract_first_word(&text, &word, NULL, EXTRACT_UNQUOTE|EXTRACT_RELAX); - if (r < 0) -@@ -420,6 +422,7 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text - continue; - - is_before = startswith_no_case(full_text, "X-Start-Before:"); -+ is_wanted = startswith_no_case(full_text, "Required-Start:"); - - if (streq(m, SPECIAL_NETWORK_ONLINE_TARGET) && !is_before) { - /* the network-online target is special, as it needs to be actively pulled in */ -@@ -428,8 +431,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text +@@ -409,8 +409,13 @@ static int handle_dependencies(SysvStub *s, unsigned line, const char *full_text return log_oom(); r = strv_extend(&s->wants, m); @@ -61,7 +30,7 @@ index fa5355c964..62755f3652 100644 + } else { r = strv_extend(is_before ? &s->before : &s->after, m); + -+ if (is_wanted) ++ if (startswith_no_case(full_text, "Required-Start:")) + r = strv_extend(&s->wants, m); + } + @@ -69,5 +38,5 @@ index fa5355c964..62755f3652 100644 return log_oom(); } -- -2.26.2 +2.31.1 diff --git a/0009-pid1-handle-console-specificities-weirdness-for-s390.patch b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch index 6124095d..14354b18 100644 --- a/0009-pid1-handle-console-specificities-weirdness-for-s390.patch +++ b/0009-pid1-handle-console-specificities-weirdness-for-s390.patch @@ -24,7 +24,7 @@ command line option: systemd.log_color=off. See also a short discussion which happened on @systemd-maintainers whose $subject is "[PATCH] support conmode setting on command line". -[ fbui: fixes bsc#860937 ] +[fbui: fixes bsc#860937] --- src/basic/terminal-util.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch b/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch new file mode 100644 index 00000000..91cc4e55 --- /dev/null +++ b/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch @@ -0,0 +1,43 @@ +From 6f4d9d9688ad65bb46d09ac09f570c6ee4bc3671 Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Fri, 14 Jan 2022 08:17:38 +0100 +Subject: [PATCH 1010/1010] sysv: add back support for '$all' virtual facility + and '+' facitity name prefix + +'$all' was probably a Debian thing and has probably never been supported by RH, +which explains why systemd upstream never supported it too. At least I couldn't +find any reference of this facility name in +http://refspecs.linux-foundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic.html#FACILNAME. OTOH +'$all' is described in https://wiki.debian.org/LSBInitScripts + +Regarding the '+' prefix, I couldn't find any mention of it +anywhere. Apparently it was equivalent to '$' in facility names. + +[wfink: bsc#858864] +--- + src/sysv-generator/sysv-generator.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c +index c6e1953839..0aadb397ed 100644 +--- a/src/sysv-generator/sysv-generator.c ++++ b/src/sysv-generator/sysv-generator.c +@@ -243,6 +243,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, + "remote_fs", SPECIAL_REMOTE_FS_TARGET, + "syslog", NULL, + "time", SPECIAL_TIME_SYNC_TARGET, ++ "all", SPECIAL_DEFAULT_TARGET, + }; + + const char *filename; +@@ -257,6 +258,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, + + filename = basename(s->path); + ++ n = *name == '+' ? ++name : name; + n = *name == '$' ? name + 1 : name; + + for (i = 0; i < ELEMENTSOF(table); i += 2) { +-- +2.31.1 + diff --git a/5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch b/5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch deleted file mode 100644 index bb00830b..00000000 --- a/5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 5bc4f2e271c4907af1d3208c5bb33ce795326abc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 23 Nov 2021 15:55:45 +0100 -Subject: [PATCH 5000/5002] shared/rm_rf: refactor rm_rf_children_inner() to - shorten code a bit - ---- - src/shared/rm-rf.c | 27 +++++++++------------------ - 1 file changed, 9 insertions(+), 18 deletions(-) - -diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c -index 19f37e0f19..7362954116 100644 ---- a/src/shared/rm-rf.c -+++ b/src/shared/rm-rf.c -@@ -124,7 +124,7 @@ static int rm_rf_children_inner( - const struct stat *root_dev) { - - struct stat st; -- int r; -+ int r, q = 0; - - assert(fd >= 0); - assert(fname); -@@ -142,7 +142,6 @@ static int rm_rf_children_inner( - - if (is_dir) { - _cleanup_close_ int subdir_fd = -1; -- int q; - - /* if root_dev is set, remove subdirectories only if device is same */ - if (root_dev && st.st_dev != root_dev->st_dev) -@@ -178,23 +177,15 @@ static int rm_rf_children_inner( - * again for each directory */ - q = rm_rf_children(TAKE_FD(subdir_fd), flags | REMOVE_PHYSICAL, root_dev); - -- r = unlinkat_harder(fd, fname, AT_REMOVEDIR, flags); -- if (r < 0) -- return r; -- if (q < 0) -- return q; -- -- return 1; -- -- } else if (!(flags & REMOVE_ONLY_DIRECTORIES)) { -- r = unlinkat_harder(fd, fname, 0, flags); -- if (r < 0) -- return r; -- -- return 1; -- } -+ } else if (flags & REMOVE_ONLY_DIRECTORIES) -+ return 0; - -- return 0; -+ r = unlinkat_harder(fd, fname, is_dir ? AT_REMOVEDIR : 0, flags); -+ if (r < 0) -+ return r; -+ if (q < 0) -+ return q; -+ return 1; - } - - int rm_rf_children( --- -2.31.1 - diff --git a/5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch b/5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch deleted file mode 100644 index 347b5e55..00000000 --- a/5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 8f608df0305355c9b2ddd7c75926a6bd6247e635 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 23 Nov 2021 16:56:42 +0100 -Subject: [PATCH 5001/5002] shared/rm_rf: refactor rm_rf() to shorten code a - bit - ---- - src/shared/rm-rf.c | 53 ++++++++++++++++++++-------------------------- - 1 file changed, 23 insertions(+), 30 deletions(-) - -diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c -index 7362954116..c7d3b8b7ad 100644 ---- a/src/shared/rm-rf.c -+++ b/src/shared/rm-rf.c -@@ -250,7 +250,7 @@ int rm_rf_children( - } - - int rm_rf(const char *path, RemoveFlags flags) { -- int fd, r; -+ int fd, r, q = 0; - - assert(path); - -@@ -282,49 +282,42 @@ int rm_rf(const char *path, RemoveFlags flags) { - } - - fd = open(path, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); -- if (fd < 0) { -+ if (fd >= 0) { -+ /* We have a dir */ -+ r = rm_rf_children(fd, flags, NULL); -+ -+ if (FLAGS_SET(flags, REMOVE_ROOT)) -+ q = RET_NERRNO(rmdir(path)); -+ } else { - if (FLAGS_SET(flags, REMOVE_MISSING_OK) && errno == ENOENT) - return 0; - - if (!IN_SET(errno, ENOTDIR, ELOOP)) - return -errno; - -- if (FLAGS_SET(flags, REMOVE_ONLY_DIRECTORIES)) -+ if (FLAGS_SET(flags, REMOVE_ONLY_DIRECTORIES) || !FLAGS_SET(flags, REMOVE_ROOT)) - return 0; - -- if (FLAGS_SET(flags, REMOVE_ROOT)) { -- -- if (!FLAGS_SET(flags, REMOVE_PHYSICAL)) { -- struct statfs s; -- -- if (statfs(path, &s) < 0) -- return -errno; -- if (is_physical_fs(&s)) -- return log_error_errno(SYNTHETIC_ERRNO(EPERM), -- "Attempted to remove files from a disk file system under \"%s\", refusing.", -- path); -- } -- -- if (unlink(path) < 0) { -- if (FLAGS_SET(flags, REMOVE_MISSING_OK) && errno == ENOENT) -- return 0; -+ if (!FLAGS_SET(flags, REMOVE_PHYSICAL)) { -+ struct statfs s; - -+ if (statfs(path, &s) < 0) - return -errno; -- } -+ if (is_physical_fs(&s)) -+ return log_error_errno(SYNTHETIC_ERRNO(EPERM), -+ "Attempted to remove files from a disk file system under \"%s\", refusing.", -+ path); - } - -- return 0; -+ r = 0; -+ q = RET_NERRNO(unlink(path)); - } - -- r = rm_rf_children(fd, flags, NULL); -- -- if (FLAGS_SET(flags, REMOVE_ROOT) && -- rmdir(path) < 0 && -- r >= 0 && -- (!FLAGS_SET(flags, REMOVE_MISSING_OK) || errno != ENOENT)) -- r = -errno; -- -- return r; -+ if (r < 0) -+ return r; -+ if (q < 0 && (q != -ENOENT || !FLAGS_SET(flags, REMOVE_MISSING_OK))) -+ return q; -+ return 0; - } - - int rm_rf_child(int fd, const char *name, RemoveFlags flags) { --- -2.31.1 - diff --git a/5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch b/5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch deleted file mode 100644 index 9c7eac68..00000000 --- a/5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch +++ /dev/null @@ -1,273 +0,0 @@ -From c561e2eab3b9b759b7592ea1b8168d4f36ede031 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Wed, 5 Jan 2022 15:08:07 +0100 -Subject: [PATCH 5002/5002] shared/rm-rf: loop over nested directories instead - of instead of recursing - -To remove directory structures, we need to remove the innermost items first, -and then recursively remove higher-level directories. We would recursively -descend into directories and invoke rm_rf_children and rm_rm_children_inner. -This is problematic when too many directories are nested. - -Instead, let's create a "TODO" queue. In the the queue, for each level we -hold the DIR* object we were working on, and the name of the directory. This -allows us to leave a partially-processed directory, and restart the removal -loop one level down. When done with the inner directory, we use the name to -unlinkat() it from the parent, and proceed with the removal of other items. - -Because the nesting is increased by one level, it is best to view this patch -with -b/--ignore-space-change. - -This fixes CVE-2021-3997, https://bugzilla.redhat.com/show_bug.cgi?id=2024639. -The issue was reported and patches reviewed by Qualys Team. -Mauro Matteo Cascella and Riccardo Schirone from Red Hat handled the disclosure. - -[fbui: adjust context] -[fbui: fixes CVE-2021-3997] -[fbui: fixes bsc#1194178] ---- - src/shared/rm-rf.c | 159 +++++++++++++++++++++++++++++++-------------- - 1 file changed, 112 insertions(+), 47 deletions(-) - -diff --git a/src/shared/rm-rf.c b/src/shared/rm-rf.c -index c7d3b8b7ad..58da213e9f 100644 ---- a/src/shared/rm-rf.c -+++ b/src/shared/rm-rf.c -@@ -52,7 +52,6 @@ static int patch_dirfd_mode( - } - - int unlinkat_harder(int dfd, const char *filename, int unlink_flags, RemoveFlags remove_flags) { -- - mode_t old_mode; - int r; - -@@ -116,12 +115,13 @@ int fstatat_harder(int dfd, - return 0; - } - --static int rm_rf_children_inner( -+static int rm_rf_inner_child( - int fd, - const char *fname, - int is_dir, - RemoveFlags flags, -- const struct stat *root_dev) { -+ const struct stat *root_dev, -+ bool allow_recursion) { - - struct stat st; - int r, q = 0; -@@ -141,9 +141,7 @@ static int rm_rf_children_inner( - } - - if (is_dir) { -- _cleanup_close_ int subdir_fd = -1; -- -- /* if root_dev is set, remove subdirectories only if device is same */ -+ /* If root_dev is set, remove subdirectories only if device is same */ - if (root_dev && st.st_dev != root_dev->st_dev) - return 0; - -@@ -155,7 +153,6 @@ static int rm_rf_children_inner( - return 0; - - if ((flags & REMOVE_SUBVOLUME) && btrfs_might_be_subvol(&st)) { -- - /* This could be a subvolume, try to remove it */ - - r = btrfs_subvol_remove_fd(fd, fname, BTRFS_REMOVE_RECURSIVE|BTRFS_REMOVE_QUOTA); -@@ -169,13 +166,16 @@ static int rm_rf_children_inner( - return 1; - } - -- subdir_fd = openat(fd, fname, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); -+ if (!allow_recursion) -+ return -EISDIR; -+ -+ int subdir_fd = openat(fd, fname, O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); - if (subdir_fd < 0) - return -errno; - - /* We pass REMOVE_PHYSICAL here, to avoid doing the fstatfs() to check the file system type - * again for each directory */ -- q = rm_rf_children(TAKE_FD(subdir_fd), flags | REMOVE_PHYSICAL, root_dev); -+ q = rm_rf_children(subdir_fd, flags | REMOVE_PHYSICAL, root_dev); - - } else if (flags & REMOVE_ONLY_DIRECTORIES) - return 0; -@@ -188,63 +188,128 @@ static int rm_rf_children_inner( - return 1; - } - -+typedef struct TodoEntry { -+ DIR *dir; /* A directory that we were operating on. */ -+ char *dirname; /* The filename of that directory itself. */ -+} TodoEntry; -+ -+static void free_todo_entries(TodoEntry **todos) { -+ for (TodoEntry *x = *todos; x && x->dir; x++) { -+ closedir(x->dir); -+ free(x->dirname); -+ } -+ -+ freep(todos); -+} -+ - int rm_rf_children( - int fd, - RemoveFlags flags, - const struct stat *root_dev) { - -- _cleanup_closedir_ DIR *d = NULL; -+ _cleanup_(free_todo_entries) TodoEntry *todos = NULL; - struct dirent *de; -+ size_t n_todo = 0; -+ _cleanup_free_ char *dirname = NULL; /* Set when we are recursing and want to delete ourselves */ - int ret = 0, r; - -- assert(fd >= 0); -+ /* Return the first error we run into, but nevertheless try to go on. -+ * The passed fd is closed in all cases, including on failure. */ -+ -+ for (;;) { /* This loop corresponds to the directory nesting level. */ -+ _cleanup_closedir_ DIR *d = NULL; -+ -+ if (n_todo > 0) { -+ /* We know that we are in recursion here, because n_todo is set. -+ * We need to remove the inner directory we were operating on. */ -+ assert(dirname); -+ r = unlinkat_harder(dirfd(todos[n_todo-1].dir), dirname, AT_REMOVEDIR, flags); -+ if (r < 0 && r != -ENOENT && ret == 0) -+ ret = r; -+ dirname = mfree(dirname); -+ -+ /* And now let's back out one level up */ -+ n_todo --; -+ d = TAKE_PTR(todos[n_todo].dir); -+ dirname = TAKE_PTR(todos[n_todo].dirname); -+ -+ assert(d); -+ fd = dirfd(d); /* Retrieve the file descriptor from the DIR object */ -+ assert(fd >= 0); -+ } else { -+ next_fd: -+ assert(fd >= 0); -+ d = fdopendir(fd); -+ if (!d) { -+ safe_close(fd); -+ return -errno; -+ } -+ fd = dirfd(d); /* We donated the fd to fdopendir(). Let's make sure we sure we have -+ * the right descriptor even if it were to internally invalidate the -+ * one we passed. */ -+ -+ if (!(flags & REMOVE_PHYSICAL)) { -+ struct statfs sfs; -+ -+ if (fstatfs(fd, &sfs) < 0) -+ return -errno; -+ -+ if (is_physical_fs(&sfs)) { -+ /* We refuse to clean physical file systems with this call, unless -+ * explicitly requested. This is extra paranoia just to be sure we -+ * never ever remove non-state data. */ -+ -+ _cleanup_free_ char *path = NULL; -+ -+ (void) fd_get_path(fd, &path); -+ return log_error_errno(SYNTHETIC_ERRNO(EPERM), -+ "Attempted to remove disk file system under \"%s\", and we can't allow that.", -+ strna(path)); -+ } -+ } -+ } - -- /* This returns the first error we run into, but nevertheless tries to go on. This closes the passed -- * fd, in all cases, including on failure. */ -+ FOREACH_DIRENT_ALL(de, d, return -errno) { -+ int is_dir; - -- d = fdopendir(fd); -- if (!d) { -- safe_close(fd); -- return -errno; -- } -+ if (dot_or_dot_dot(de->d_name)) -+ continue; - -- if (!(flags & REMOVE_PHYSICAL)) { -- struct statfs sfs; -+ is_dir = de->d_type == DT_UNKNOWN ? -1 : de->d_type == DT_DIR; - -- if (fstatfs(dirfd(d), &sfs) < 0) -- return -errno; -+ r = rm_rf_inner_child(fd, de->d_name, is_dir, flags, root_dev, false); -+ if (r == -EISDIR) { -+ /* Push the current working state onto the todo list */ - -- if (is_physical_fs(&sfs)) { -- /* We refuse to clean physical file systems with this call, unless explicitly -- * requested. This is extra paranoia just to be sure we never ever remove non-state -- * data. */ -+ if (!GREEDY_REALLOC0(todos, n_todo + 2)) -+ return log_oom(); - -- _cleanup_free_ char *path = NULL; -+ _cleanup_free_ char *newdirname = strdup(de->d_name); -+ if (!newdirname) -+ return log_oom(); - -- (void) fd_get_path(fd, &path); -- return log_error_errno(SYNTHETIC_ERRNO(EPERM), -- "Attempted to remove disk file system under \"%s\", and we can't allow that.", -- strna(path)); -- } -- } -+ int newfd = openat(fd, de->d_name, -+ O_RDONLY|O_NONBLOCK|O_DIRECTORY|O_CLOEXEC|O_NOFOLLOW|O_NOATIME); -+ if (newfd >= 0) { -+ todos[n_todo++] = (TodoEntry) { TAKE_PTR(d), TAKE_PTR(dirname) }; -+ fd = newfd; -+ dirname = TAKE_PTR(newdirname); - -- FOREACH_DIRENT_ALL(de, d, return -errno) { -- int is_dir; -+ goto next_fd; - -- if (dot_or_dot_dot(de->d_name)) -- continue; -+ } else if (errno != -ENOENT && ret == 0) -+ ret = -errno; - -- is_dir = -- de->d_type == DT_UNKNOWN ? -1 : -- de->d_type == DT_DIR; -+ } else if (r < 0 && r != -ENOENT && ret == 0) -+ ret = r; -+ } - -- r = rm_rf_children_inner(dirfd(d), de->d_name, is_dir, flags, root_dev); -- if (r < 0 && r != -ENOENT && ret == 0) -- ret = r; -- } -+ if (FLAGS_SET(flags, REMOVE_SYNCFS) && syncfs(fd) < 0 && ret >= 0) -+ ret = -errno; - -- if (FLAGS_SET(flags, REMOVE_SYNCFS) && syncfs(dirfd(d)) < 0 && ret >= 0) -- ret = -errno; -+ if (n_todo == 0) -+ break; -+ } - - return ret; - } -@@ -336,5 +401,5 @@ int rm_rf_child(int fd, const char *name, RemoveFlags flags) { - if (FLAGS_SET(flags, REMOVE_ONLY_DIRECTORIES|REMOVE_SUBVOLUME)) - return -EINVAL; - -- return rm_rf_children_inner(fd, name, -1, flags, NULL); -+ return rm_rf_inner_child(fd, name, -1, flags, NULL, true); - } --- -2.31.1 - diff --git a/systemd-sysv-install b/systemd-sysv-install index 403fc632..cffe4c8f 100644 --- a/systemd-sysv-install +++ b/systemd-sysv-install @@ -2,15 +2,15 @@ # This script is called by "systemctl enable/disable" when the given unit is a # SysV init.d script. It needs to call the distribution's mechanism for -# enabling/disabling those, such as chkconfig, update-rc.d, or similar. This -# can optionally take a --root argument for enabling a SysV init script -# in a chroot or similar. +# enabling/disabling those, such as chkconfig, update-rc.d, or similar. This can +# optionally take a --root argument for enabling a SysV init script in a chroot +# or similar. # -# chkconfig(8) and insserv(8) are no more available hence let's do the -# bare minimum and create/remote the symlinks for the well known -# runlevels and nothing more. Note that we don't take care of -# enabling/disabling the service dependencies as the sysv-generator -# will take care of them for us (openSUSE specific). +# chkconfig(8) and insserv(8) are no more available hence let's do the bare +# minimum and create/remove the symlinks for the well known runlevels and +# nothing more. Note that we don't take care of enabling/disabling the service +# dependencies as the sysv-generator will take care of them for us (openSUSE +# specific). # set -e diff --git a/systemd-v249.7+suse.66.ga54f80116c.tar.xz b/systemd-v249.7+suse.66.ga54f80116c.tar.xz deleted file mode 100644 index e1babceb..00000000 --- a/systemd-v249.7+suse.66.ga54f80116c.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:91b2f8c8492b03612c3148615a39d7553632798941456e7702306837f0118dd8 -size 7276848 diff --git a/systemd-v249.9+suse.75.g3743acbce3.tar.xz b/systemd-v249.9+suse.75.g3743acbce3.tar.xz new file mode 100644 index 00000000..0adfea70 --- /dev/null +++ b/systemd-v249.9+suse.75.g3743acbce3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:64320468ebe2502773e1365b50c369de2520ec4b614c623a4ca1339e26968ec2 +size 7278924 diff --git a/systemd.changes b/systemd.changes index b3e7e524..65d3231c 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,56 @@ +------------------------------------------------------------------- +Wed Jan 19 14:25:46 UTC 2022 - Franck Bui + +- Move the systemd-network-generator stuff in udev package + + This generator can generate .link files and is mainly used in initrd where + udev is mandatory. + +------------------------------------------------------------------- +Tue Jan 18 17:57:43 UTC 2022 - Franck Bui + +- Restore /sbin/udevadm and /bin/systemctl (obsolete) paths when split_usr is + true (bsc#1194519) + +------------------------------------------------------------------- +Mon Jan 17 09:16:13 UTC 2022 - Franck Bui + +- Import commit 3743acbce3bd44208af453fc6dc384a1236dc83c (merge of v249.9) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/e2ca79dd775d1f7d39861d57f23c43f6cd85a872...3743acbce3bd44208af453fc6dc384a1236dc83c + +------------------------------------------------------------------- +Fri Jan 14 14:55:56 UTC 2022 - Franck Bui + +- Extract bits from 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch + which are not specific to the handling of 'Required-Start:' and move them into a + new patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch + +------------------------------------------------------------------- +Thu Jan 13 21:54:06 UTC 2022 - Franck Bui + +- Import commit e2ca79dd775d1f7d39861d57f23c43f6cd85a872 (merge of v249.8) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/458220239c69b8e5fe7be480929348daeccb70d1...e2ca79dd775d1f7d39861d57f23c43f6cd85a872 + +------------------------------------------------------------------- +Thu Jan 13 20:03:51 UTC 2022 - Franck Bui + +- Import commit 458220239c69b8e5fe7be480929348daeccb70d1 + + e95df40b09 shared/rm-rf: loop over nested directories instead of instead of recursing (CVE-2021-3997 bsc#1194178) + 078e04305d shared/rm_rf: refactor rm_rf() to shorten code a bit + 6d560d0aca shared/rm_rf: refactor rm_rf_children_inner() to shorten code a bit + 6666ff056c localectl: don't omit keymaps files that are symlinks (bsc#1191826) + +- Drop the following patches as they have been merged into SUSE/v249 branch: + + 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch + 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch + 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch + ------------------------------------------------------------------- Tue Jan 11 08:06:11 UTC 2022 - Franck Bui @@ -49,7 +102,7 @@ Wed Nov 24 10:40:01 UTC 2021 - Ludwig Nussel ------------------------------------------------------------------- Mon Nov 22 08:48:12 UTC 2021 - Franck Bui -- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of 249.7) +- Import commit 523f32df573d459551760b072cb62906f4a2cf23 (merge of v249.7) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/c34c98712600bc206919ec6ed136195f75ac1967...523f32df573d459551760b072cb62906f4a2cf23 @@ -69,7 +122,7 @@ Mon Nov 22 08:43:25 UTC 2021 - Franck Bui ------------------------------------------------------------------- Mon Nov 15 09:35:08 UTC 2021 - Franck Bui -- Import commit 61c79e68381801428c0bc00a56b9e2e9cfa68373 (merge of 249.6) +- Import commit 61c79e68381801428c0bc00a56b9e2e9cfa68373 (merge of v249.6) bcdeee7b4c virt: Support detection for ARM64 Hyper-V guests (bsc#1186071) [...] diff --git a/systemd.spec b/systemd.spec index 2219cded..1dbeb761 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.66.ga54f80116c +%define suse_version +suse.75.g3743acbce3 %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -69,7 +69,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.7 +Version: 249.9 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -198,10 +198,11 @@ Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch -Patch9: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch9: 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +Patch13: 0009-pid1-handle-console-specificities-weirdness-for-s390.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 @@ -210,12 +211,6 @@ Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch # temporary and should be removed as soon as a fix is merged by # upstream. -# The following patches address CVE-2021-3997. They will be moved to the git -# repo once the issue will become public and upstream will release them. -Patch5000: 5000-shared-rm_rf-refactor-rm_rf_children_inner-to-shorte.patch -Patch5001: 5001-shared-rm_rf-refactor-rm_rf-to-shorten-code-a-bit.patch -Patch5002: 5002-shared-rm-rf-loop-over-nested-directories-instead-of.patch - %description Systemd is a system and service manager, compatible with SysV and LSB init scripts for Linux. systemd provides aggressive parallelization @@ -746,8 +741,11 @@ for s in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do done %if %{with split_usr} +mkdir -p %{buildroot}/{bin,sbin} +# Legacy paths +ln -s ../usr/bin/udevadm %{buildroot}/sbin/ +ln -s ../usr/bin/systemctl %{buildroot}/bin/ # Legacy sysvinit tools -mkdir -p %{buildroot}/sbin ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt @@ -787,8 +785,8 @@ mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ # /usr/lib/sysctl.d/99-sysctl.conf. ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf -# The definition of the basic users/groups are defined by system-user -# on SUSE (bsc#1006978). +# The definitions of the basic users/groups are given by system-user package on +# SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf # Remove README file in init.d as (SUSE) rpm requires executable files @@ -1281,6 +1279,9 @@ fi %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-cat +%if %{with split_usr} +/bin/systemctl +%endif %dir %{_prefix}/lib/kernel %dir %{_prefix}/lib/kernel/install.d %{_prefix}/lib/kernel/install.d/00-entry-directory.install @@ -1290,6 +1291,8 @@ fi %dir %{_prefix}/lib/systemd/network %dir %{_unitdir} %{_userunitdir} +%exclude %{_prefix}/lib/systemd/systemd-network-generator +%exclude %{_unitdir}/systemd-network-generator.service %if %{with coredump} %exclude %{_prefix}/lib/systemd/systemd-coredump %exclude %{_unitdir}/systemd-coredump* @@ -1302,6 +1305,7 @@ fi %exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd %exclude %{_prefix}/lib/systemd/systemd-journal-remote %exclude %{_prefix}/lib/systemd/systemd-journal-upload +%exclude %{_datadir}/systemd/gatewayd %endif %exclude %{_prefix}/lib/systemd/systemd-udevd %exclude %{_unitdir}/systemd-udev*.* @@ -1330,10 +1334,8 @@ fi %exclude %{_unitdir}/dbus-org.freedesktop.import1.service %endif %if %{with networkd} -%exclude %{_prefix}/lib/systemd/systemd-network-generator %exclude %{_prefix}/lib/systemd/systemd-networkd %exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online -%exclude %{_unitdir}/systemd-network-generator.service %exclude %{_unitdir}/systemd-networkd.service %exclude %{_unitdir}/systemd-networkd.socket %exclude %{_unitdir}/systemd-networkd-wait-online.service @@ -1475,10 +1477,6 @@ fi %{_datadir}/systemd %{_datadir}/factory -%if %{with journal_remote} -%exclude %{_datadir}/systemd/gatewayd -%endif - %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service %{_datadir}/dbus-1/system-services/org.freedesktop.login1.service @@ -1503,12 +1501,13 @@ fi %{_mandir}/man7/[bdfks]* %{_mandir}/man8/kern* %{_mandir}/man8/pam_* -%{_mandir}/man8//rc-local.* +%{_mandir}/man8/rc-local.* %{_mandir}/man8/systemd-[a-gik-tvx]* %{_mandir}/man8/systemd-h[aioy]* %{_mandir}/man8/systemd-journald* %{_mandir}/man8/systemd-u[ps]* %{_mandir}/man8/30-systemd-environment-d-generator.* +%exclude %{_mandir}/man8/systemd-network-generator.* %if %{with coredump} %exclude %{_mandir}/man1/coredumpctl* %exclude %{_mandir}/man5/coredump.conf* @@ -1623,6 +1622,9 @@ fi %defattr(-,root,root) %{_bindir}/udevadm %{_bindir}/systemd-hwdb +%if %{with split_usr} +/sbin/udevadm +%endif %dir %{_prefix}/lib/udev/ %{_prefix}/lib/udev/ata_id %{_prefix}/lib/udev/cdrom_id @@ -1636,6 +1638,8 @@ fi %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation +%{_prefix}/lib/systemd/systemd-udevd +%{_prefix}/lib/systemd/systemd-network-generator %dir %{_udevrulesdir}/ %doc %{_udevrulesdir}/README %exclude %{_udevrulesdir}/70-uaccess.rules @@ -1648,16 +1652,7 @@ fi %dir %{_sysconfdir}/udev/rules.d/ %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %config(noreplace) %{_sysconfdir}/udev/udev.conf -%if ! 0%{?bootstrap} -%{_mandir}/man5/udev* -%{_mandir}/man7/hwdb* -%{_mandir}/man7/udev* -%{_mandir}/man8/systemd-hwdb* -%{_mandir}/man8/systemd-udev* -%{_mandir}/man8/udev* -%endif %dir %{_unitdir} -%{_prefix}/lib/systemd/systemd-udevd %{_unitdir}/kmod-static-nodes.service %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service %{_tmpfilesdir}/static-nodes-permissions.conf @@ -1665,6 +1660,7 @@ fi %{_unitdir}/systemd-udevd*.socket %{_unitdir}/systemd-hwdb*.* %{_unitdir}/initrd-udevadm-cleanup-db.service +%{_unitdir}/systemd-network-generator.service %dir %{_unitdir}/sysinit.target.wants %{_unitdir}/sysinit.target.wants/systemd-udev*.service %dir %{_unitdir}/sockets.target.wants @@ -1672,6 +1668,15 @@ fi %{_unitdir}/*.target.wants/systemd-hwdb*.* %{_prefix}/lib/systemd/network/99-default.link %{_datadir}/pkgconfig/udev.pc +%if ! 0%{?bootstrap} +%{_mandir}/man5/udev* +%{_mandir}/man7/hwdb* +%{_mandir}/man7/udev* +%{_mandir}/man8/systemd-hwdb* +%{_mandir}/man8/systemd-udev* +%{_mandir}/man8/udev* +%{_mandir}/man8/systemd-network-generator.* +%endif %files -n libsystemd0%{?mini} %defattr(-,root,root) @@ -1813,10 +1818,8 @@ fi %{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %{_prefix}/lib/systemd/network/*.network %{_prefix}/lib/systemd/network/*.network.example -%{_prefix}/lib/systemd/systemd-network-generator %{_prefix}/lib/systemd/systemd-networkd %{_prefix}/lib/systemd/systemd-networkd-wait-online -%{_unitdir}/systemd-network-generator.service %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %{_unitdir}/systemd-networkd-wait-online.service From 8fa3c36b47b9adecc713fc277d1933bbddd735c5c96eadfdd38836010d145089 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sun, 6 Feb 2022 22:54:01 +0000 Subject: [PATCH 087/124] Accepting request 951595 from Base:System - Always create systemd-network system user, even if systemd-networkd is not installed (bsc#1195559) - Make more use of %{_unitdir} in files.{systemd,container} - Installation of libnss_mymachines.so depended on %{bootstrap} but it is actually installed when %{with machined} is true. - Call ldconfig when container subpackage is installed since it ships nss-mymachines NSS plug-in module. - Import commit 117bd7f14aa7834d85a4306cd380d292bec04108 1395c74be7 udevadm: cleanup-db: don't delete information for kept db entries (bsc#1194912) bbafc8092a udevadm: cleanup_dir: use dot_or_dot_dot() - Drop 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Given the fact that Factory no more ship SysV init scripts since several months, only scripts coming from 3rd party applications should remain which are unlikely to rely on the SUSE specifities implemented by these patches. This change was announced on the Factory mailing list: https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/3ERUP5ZZJ6PPA36L3HVN46BH6U6JL74O/ - Import commit 885e0b9126bd2cf1e3f6b147c45ec58a5550c75c 41334be59e meson: minor cleanup 3db0c28462 sysusers: split up systemd.conf - Drop 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (bsc#1195153) Since v241, the patch isn't useful anymore because resolved is no more able to create /etc/resolv.conf symlink by itself,it runs as 'systemd-resolve' user. The symlink is now handled by a tmpfiles config file which is only installed when systemd-resolved is. The tmpfiles config file has currently a OBS-URL: https://build.opensuse.org/request/show/951595 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=345 --- ...dd-back-support-for-SysV-scripts-for.patch | 123 --- ...pport-for-all-virtual-facility-and-f.patch | 43 - ...e-etc-resolv.conf-symlink-at-runtime.patch | 53 -- baselibs.conf | 2 - files.container | 57 ++ files.devel | 729 +++++++++++++++ files.network | 61 ++ files.systemd | 852 ++++++++++++++++++ files.udev | 126 +++ systemd-v249.9+suse.75.g3743acbce3.tar.xz | 3 - systemd-v249.9+suse.82.g117bd7f14a.tar.xz | 3 + systemd.changes | 131 +++ systemd.spec | 767 +++------------- 13 files changed, 2108 insertions(+), 842 deletions(-) delete mode 100644 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch delete mode 100644 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch delete mode 100644 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch create mode 100644 files.container create mode 100644 files.devel create mode 100644 files.network create mode 100644 files.systemd create mode 100644 files.udev delete mode 100644 systemd-v249.9+suse.75.g3743acbce3.tar.xz create mode 100644 systemd-v249.9+suse.82.g117bd7f14a.tar.xz diff --git a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch b/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch deleted file mode 100644 index 11737094..00000000 --- a/0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 1bd48f23ea7750b354bfb94482f9f035bf8b7841 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 26 May 2016 08:59:41 +0200 -Subject: [PATCH 06/11] sysv-generator: add (back) support for SysV scripts for - the early boot - -For the record, the upstream support was removed by commit -3cdebc217c42c8529086f2965319b6a48eaaeabe. - -The sysv-generator has some weirdos: for example a service at the rc0 -runlevel won't be started during shutdown since it will get both -"WantedBy=poweroff.target" and "Conflicts=shutdown.target". - -Anyways what's the current patch implements the following: - - - a symlink /etc/init.d/boot.d/S??boot.foo will add - "WantedBy/Before=sysinit.target" constraints and make sure that the - default dependencies added by systemd are turned off. - - - a symlink /etc/init.d/boot.d/K??boot.foo will add - "Conflicts/Before=shutdown.target" so "foo" service will be stopped - like any other regular services. If this symlink is not installed - however, "foo" will be stopped lately during the systemd killing - spree. - -This is a forward-port of commit 29db8537e1ca10796797d9854d1 in SP1. - -[Since v232] - -Support for S* symlinks in runlevel 0 or 6 has been completely and silently -removed by 788d2b088b13a2444b9eb2ea82c0cc57d9f0980f. Since it was already -broken as pointed out above, this probably wasn't really used and therefore -no one will really care. So let's drop it too. - -However this has the side effect to make the support of early sysv scripts more -difficult. To make things easy, the support of K* symlinks in boot.d/ has been -removed too: this is probably not used (anymore) (at least intentionally). - -The consequence is that early sysv services are stopped during shutdown at -the same time as 'normal' services. ---- - src/sysv-generator/sysv-generator.c | 23 +++++++++++++++++++++++ - 1 file changed, 23 insertions(+) - -diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index bf23c48662..fa5355c964 100644 ---- a/src/sysv-generator/sysv-generator.c -+++ b/src/sysv-generator/sysv-generator.c -@@ -31,6 +31,9 @@ static const struct { - const char *path; - const char *target; - } rcnd_table[] = { -+ /* SUSE style boot.d */ -+ { "boot.d", SPECIAL_SYSINIT_TARGET }, -+ - /* Standard SysV runlevels for start-up */ - { "rc1.d", SPECIAL_RESCUE_TARGET }, - { "rc2.d", SPECIAL_MULTI_USER_TARGET }, -@@ -57,6 +60,7 @@ typedef struct SysvStub { - bool has_lsb; - bool reload; - bool loaded; -+ bool early; - } SysvStub; - - static SysvStub* free_sysvstub(SysvStub *s) { -@@ -146,6 +150,12 @@ static int generate_unit_file(SysvStub *s) { - fprintf(f, "Description=%s\n", t); - } - -+ if (s->early) { -+ fprintf(f, "DefaultDependencies=no\n"); -+ fprintf(f, "Conflicts=%s\n", SPECIAL_SHUTDOWN_TARGET); -+ fprintf(f, "Before=%s\n", SPECIAL_SHUTDOWN_TARGET); -+ } -+ - STRV_FOREACH(p, s->before) - fprintf(f, "Before=%s\n", *p); - STRV_FOREACH(p, s->after) -@@ -212,6 +222,10 @@ static char *sysv_translate_name(const char *name) { - _cleanup_free_ char *c = NULL; - char *res; - -+ if (startswith(name, "boot.")) -+ /* Drop SuSE-style boot. prefix */ -+ name += 5; -+ - c = strdup(name); - if (!c) - return NULL; -@@ -288,6 +302,11 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - return 1; - } - -+ /* Strip "boot." prefix from file name for comparison (Suse specific) */ -+ e = startswith(filename, "boot."); -+ if (e) -+ filename += 5; -+ - /* Strip ".sh" suffix from file name for comparison */ - filename_no_sh = strdupa(filename); - e = endswith(filename_no_sh, ".sh"); -@@ -651,6 +670,9 @@ static int fix_order(SysvStub *s, Hashmap *all_services) { - if (other->sysv_start_priority < 0) - continue; - -+ if (s->early != other->early) -+ continue; -+ - /* If both units have modern headers we don't care - * about the priorities */ - if (s->has_lsb && other->has_lsb) -@@ -775,6 +797,7 @@ static int enumerate_sysv(const LookupPaths *lp, Hashmap *all_services) { - .sysv_start_priority = -1, - .name = TAKE_PTR(name), - .path = TAKE_PTR(fpath), -+ .early = !!startswith(de->d_name, "boot."), - }; - - r = hashmap_put(all_services, service->name, service); --- -2.26.2 - diff --git a/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch b/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch deleted file mode 100644 index 91cc4e55..00000000 --- a/0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 6f4d9d9688ad65bb46d09ac09f570c6ee4bc3671 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Fri, 14 Jan 2022 08:17:38 +0100 -Subject: [PATCH 1010/1010] sysv: add back support for '$all' virtual facility - and '+' facitity name prefix - -'$all' was probably a Debian thing and has probably never been supported by RH, -which explains why systemd upstream never supported it too. At least I couldn't -find any reference of this facility name in -http://refspecs.linux-foundation.org/LSB_4.0.0/LSB-Core-generic/LSB-Core-generic.html#FACILNAME. OTOH -'$all' is described in https://wiki.debian.org/LSBInitScripts - -Regarding the '+' prefix, I couldn't find any mention of it -anywhere. Apparently it was equivalent to '$' in facility names. - -[wfink: bsc#858864] ---- - src/sysv-generator/sysv-generator.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/sysv-generator/sysv-generator.c b/src/sysv-generator/sysv-generator.c -index c6e1953839..0aadb397ed 100644 ---- a/src/sysv-generator/sysv-generator.c -+++ b/src/sysv-generator/sysv-generator.c -@@ -243,6 +243,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - "remote_fs", SPECIAL_REMOTE_FS_TARGET, - "syslog", NULL, - "time", SPECIAL_TIME_SYNC_TARGET, -+ "all", SPECIAL_DEFAULT_TARGET, - }; - - const char *filename; -@@ -257,6 +258,7 @@ static int sysv_translate_facility(SysvStub *s, unsigned line, const char *name, - - filename = basename(s->path); - -+ n = *name == '+' ? ++name : name; - n = *name == '$' ? name + 1 : name; - - for (i = 0; i < ELEMENTSOF(table); i += 2) { --- -2.31.1 - diff --git a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch b/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch deleted file mode 100644 index 510c4732..00000000 --- a/0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 1aa6cfc7ff05929f013262c86ab7557e5394fb4c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Fri, 11 Mar 2016 17:06:17 -0500 -Subject: [PATCH 11/11] resolved: create /etc/resolv.conf symlink at runtime - -If the symlink doesn't exists, and we are being started, let's -create it to provie name resolution. - -If it exists, do nothing. In particular, if it is a broken symlink, -we cannot really know if the administator configured it to point to -a location used by some service that hasn't started yet, so we -don't touch it in that case either. - -https://bugzilla.redhat.com/show_bug.cgi?id=1313085 ---- - src/resolve/resolved.c | 6 ++++++ - tmpfiles.d/etc.conf.in | 3 --- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c -index aabaa266e9..39277ea487 100644 ---- a/src/resolve/resolved.c -+++ b/src/resolve/resolved.c -@@ -53,6 +53,12 @@ static int run(int argc, char *argv[]) { - if (r < 0) - return log_error_errno(r, "Cannot resolve user name %s: %m", user); - -+ /* As we're root, we can create /etc/resolv.conf symlink if it doesn't exist already */ -+ r = symlink("../run/systemd/resolve/resolv.conf", "/etc/resolv.conf"); -+ if (r < 0 && errno != EEXIST) -+ log_warning_errno(errno, -+ "Could not create /etc/resolv.conf symlink: %m"); -+ - /* As we're root, we can create the directory where resolv.conf will live */ - r = mkdir_safe_label("/run/systemd/resolve", 0755, uid, gid, MKDIR_WARN_MODE); - if (r < 0) -diff --git a/tmpfiles.d/etc.conf.in b/tmpfiles.d/etc.conf.in -index 2323fd8cd8..ebdc699c26 100644 ---- a/tmpfiles.d/etc.conf.in -+++ b/tmpfiles.d/etc.conf.in -@@ -12,9 +12,6 @@ L+ /etc/mtab - - - - ../proc/self/mounts - {% if HAVE_SMACK_RUN_LABEL %} - t /etc/mtab - - - - security.SMACK64=_ - {% endif %} --{% if ENABLE_RESOLVE %} --L! /etc/resolv.conf - - - - ../run/systemd/resolve/stub-resolv.conf --{% endif %} - C! /etc/nsswitch.conf - - - - - {% if HAVE_PAM %} - C! /etc/pam.d - - - - --- -2.26.2 - diff --git a/baselibs.conf b/baselibs.conf index 073ad0e1..4e056067 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -8,6 +8,4 @@ systemd post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 -libudev-devel nss-myhostname -nss-mymachines diff --git a/files.container b/files.container new file mode 100644 index 00000000..faac2676 --- /dev/null +++ b/files.container @@ -0,0 +1,57 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%dir %{_sysconfdir}/systemd/nspawn +%{_bindir}/systemd-nspawn +%if ! 0%{?bootstrap} +%{_datadir}/bash-completion/completions/systemd-nspawn +%{_datadir}/zsh/site-functions/_systemd-nspawn +%{_mandir}/man1/systemd-nspawn.1.gz +%{_mandir}/man5/systemd.nspawn.5.gz +%{_mandir}/man8/libnss_mymachines.so.2.8.gz +%{_mandir}/man8/nss-mymachines.8.gz +%endif +%{_unitdir}/systemd-nspawn@.service + +%if %{with machined} +%dir %{_unitdir}/machines.target.wants +%{_bindir}/machinectl +%{_datadir}/bash-completion/completions/machinectl +%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy +%{_datadir}/zsh/site-functions/_machinectl +%{_datadir}/zsh/site-functions/_sd_machines +%{_libdir}/libnss_mymachines.so.2 +%{_mandir}/man1/machinectl.1.gz +%{_mandir}/man5/org.freedesktop.machine1.5.gz +%{_mandir}/man8/systemd-machined.8.gz +%{_mandir}/man8/systemd-machined.service.8.gz +%{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh +%{_systemd_util_dir}/systemd-machined +%{_tmpfilesdir}/systemd-nspawn.conf +%{_unitdir}/dbus-org.freedesktop.machine1.service +%{_unitdir}/machine.slice +%{_unitdir}/machines.target +%{_unitdir}/machines.target.wants/var-lib-machines.mount +%{_unitdir}/remote-fs.target.wants/var-lib-machines.mount +%{_unitdir}/systemd-machined.service +%{_unitdir}/var-lib-machines.mount +%endif + +%if %{with importd} +%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy +%{_mandir}/man5/org.freedesktop.import1.5.gz +%{_mandir}/man8/systemd-importd.8.gz +%{_mandir}/man8/systemd-importd.service.8.gz +%{_systemd_util_dir}/import-pubring.gpg +%{_systemd_util_dir}/systemd-export +%{_systemd_util_dir}/systemd-import +%{_systemd_util_dir}/systemd-import-fs +%{_systemd_util_dir}/systemd-importd +%{_systemd_util_dir}/systemd-pull +%{_unitdir}/dbus-org.freedesktop.import1.service +%{_unitdir}/systemd-importd.service +%endif diff --git a/files.devel b/files.devel new file mode 100644 index 00000000..e551dc7f --- /dev/null +++ b/files.devel @@ -0,0 +1,729 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%{_includedir}/libudev.h +%{_includedir}/systemd/ +%{_libdir}/libsystemd.so +%{_libdir}/libudev.so +%{_libdir}/pkgconfig/libsystemd.pc +%{_libdir}/pkgconfig/libudev.pc +%if ! 0%{?bootstrap} +%{_mandir}/man3/SD_ALERT.3.gz +%{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_AUTH_FAILED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_BAD_ADDRESS.3.gz +%{_mandir}/man3/SD_BUS_ERROR_DISCONNECTED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_END.3.gz +%{_mandir}/man3/SD_BUS_ERROR_FAILED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_FILE_EXISTS.3.gz +%{_mandir}/man3/SD_BUS_ERROR_FILE_NOT_FOUND.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INCONSISTENT_MESSAGE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INTERACTIVE_AUTHORIZATION_REQUIRED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INVALID_ARGS.3.gz +%{_mandir}/man3/SD_BUS_ERROR_INVALID_SIGNATURE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_IO_ERROR.3.gz +%{_mandir}/man3/SD_BUS_ERROR_LIMITS_EXCEEDED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MAKE_CONST.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MAP.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MATCH_RULE_INVALID.3.gz +%{_mandir}/man3/SD_BUS_ERROR_MATCH_RULE_NOT_FOUND.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NAME_HAS_NO_OWNER.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NOT_SUPPORTED.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_MEMORY.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_NETWORK.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_REPLY.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NO_SERVER.3.gz +%{_mandir}/man3/SD_BUS_ERROR_NULL.3.gz +%{_mandir}/man3/SD_BUS_ERROR_PROPERTY_READ_ONLY.3.gz +%{_mandir}/man3/SD_BUS_ERROR_SERVICE_UNKNOWN.3.gz +%{_mandir}/man3/SD_BUS_ERROR_TIMEOUT.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNIX_PROCESS_ID_UNKNOWN.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_INTERFACE.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_METHOD.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_OBJECT.3.gz +%{_mandir}/man3/SD_BUS_ERROR_UNKNOWN_PROPERTY.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_METHOD_CALL.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_METHOD_ERROR.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_METHOD_RETURN.3.gz +%{_mandir}/man3/SD_BUS_MESSAGE_SIGNAL.3.gz +%{_mandir}/man3/SD_BUS_METHOD.3.gz +%{_mandir}/man3/SD_BUS_METHOD_WITH_NAMES.3.gz +%{_mandir}/man3/SD_BUS_METHOD_WITH_NAMES_OFFSET.3.gz +%{_mandir}/man3/SD_BUS_METHOD_WITH_OFFSET.3.gz +%{_mandir}/man3/SD_BUS_PARAM.3.gz +%{_mandir}/man3/SD_BUS_PROPERTY.3.gz +%{_mandir}/man3/SD_BUS_SIGNAL.3.gz +%{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.3.gz +%{_mandir}/man3/SD_BUS_VTABLE_END.3.gz +%{_mandir}/man3/SD_BUS_VTABLE_START.3.gz +%{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz +%{_mandir}/man3/SD_CRIT.3.gz +%{_mandir}/man3/SD_DEBUG.3.gz +%{_mandir}/man3/SD_EMERG.3.gz +%{_mandir}/man3/SD_ERR.3.gz +%{_mandir}/man3/SD_EVENT_ARMED.3.gz +%{_mandir}/man3/SD_EVENT_EXITING.3.gz +%{_mandir}/man3/SD_EVENT_FINISHED.3.gz +%{_mandir}/man3/SD_EVENT_INITIAL.3.gz +%{_mandir}/man3/SD_EVENT_OFF.3.gz +%{_mandir}/man3/SD_EVENT_ON.3.gz +%{_mandir}/man3/SD_EVENT_ONESHOT.3.gz +%{_mandir}/man3/SD_EVENT_PENDING.3.gz +%{_mandir}/man3/SD_EVENT_PREPARING.3.gz +%{_mandir}/man3/SD_EVENT_PRIORITY_IDLE.3.gz +%{_mandir}/man3/SD_EVENT_PRIORITY_IMPORTANT.3.gz +%{_mandir}/man3/SD_EVENT_PRIORITY_NORMAL.3.gz +%{_mandir}/man3/SD_EVENT_RUNNING.3.gz +%{_mandir}/man3/SD_HWDB_FOREACH_PROPERTY.3.gz +%{_mandir}/man3/SD_ID128_ALLF.3.gz +%{_mandir}/man3/SD_ID128_CONST_STR.3.gz +%{_mandir}/man3/SD_ID128_FORMAT_STR.3.gz +%{_mandir}/man3/SD_ID128_FORMAT_VAL.3.gz +%{_mandir}/man3/SD_ID128_MAKE.3.gz +%{_mandir}/man3/SD_ID128_MAKE_STR.3.gz +%{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz +%{_mandir}/man3/SD_ID128_NULL.3.gz +%{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz +%{_mandir}/man3/SD_INFO.3.gz +%{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz +%{_mandir}/man3/SD_JOURNAL_APPEND.3.gz +%{_mandir}/man3/SD_JOURNAL_CURRENT_USER.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_BACKWARDS.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_DATA.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_FIELD.3.gz +%{_mandir}/man3/SD_JOURNAL_FOREACH_UNIQUE.3.gz +%{_mandir}/man3/SD_JOURNAL_INCLUDE_DEFAULT_NAMESPACE.3.gz +%{_mandir}/man3/SD_JOURNAL_INVALIDATE.3.gz +%{_mandir}/man3/SD_JOURNAL_LOCAL_ONLY.3.gz +%{_mandir}/man3/SD_JOURNAL_NOP.3.gz +%{_mandir}/man3/SD_JOURNAL_OS_ROOT.3.gz +%{_mandir}/man3/SD_JOURNAL_RUNTIME_ONLY.3.gz +%{_mandir}/man3/SD_JOURNAL_SUPPRESS_LOCATION.3.gz +%{_mandir}/man3/SD_JOURNAL_SYSTEM.3.gz +%{_mandir}/man3/SD_LISTEN_FDS_START.3.gz +%{_mandir}/man3/SD_NOTICE.3.gz +%{_mandir}/man3/SD_WARNING.3.gz +%{_mandir}/man3/libudev.3.gz +%{_mandir}/man3/sd-bus-errors.3.gz +%{_mandir}/man3/sd-bus.3.gz +%{_mandir}/man3/sd-daemon.3.gz +%{_mandir}/man3/sd-event.3.gz +%{_mandir}/man3/sd-hwdb.3.gz +%{_mandir}/man3/sd-id128.3.gz +%{_mandir}/man3/sd-journal.3.gz +%{_mandir}/man3/sd-login.3.gz +%{_mandir}/man3/sd_booted.3.gz +%{_mandir}/man3/sd_bus_add_fallback.3.gz +%{_mandir}/man3/sd_bus_add_fallback_vtable.3.gz +%{_mandir}/man3/sd_bus_add_filter.3.gz +%{_mandir}/man3/sd_bus_add_match.3.gz +%{_mandir}/man3/sd_bus_add_match_async.3.gz +%{_mandir}/man3/sd_bus_add_node_enumerator.3.gz +%{_mandir}/man3/sd_bus_add_object.3.gz +%{_mandir}/man3/sd_bus_add_object_manager.3.gz +%{_mandir}/man3/sd_bus_add_object_vtable.3.gz +%{_mandir}/man3/sd_bus_attach_event.3.gz +%{_mandir}/man3/sd_bus_call.3.gz +%{_mandir}/man3/sd_bus_call_async.3.gz +%{_mandir}/man3/sd_bus_call_method.3.gz +%{_mandir}/man3/sd_bus_call_method_async.3.gz +%{_mandir}/man3/sd_bus_call_method_asyncv.3.gz +%{_mandir}/man3/sd_bus_call_methodv.3.gz +%{_mandir}/man3/sd_bus_can_send.3.gz +%{_mandir}/man3/sd_bus_close.3.gz +%{_mandir}/man3/sd_bus_close_unref.3.gz +%{_mandir}/man3/sd_bus_close_unrefp.3.gz +%{_mandir}/man3/sd_bus_creds_get_audit_login_uid.3.gz +%{_mandir}/man3/sd_bus_creds_get_audit_session_id.3.gz +%{_mandir}/man3/sd_bus_creds_get_augmented_mask.3.gz +%{_mandir}/man3/sd_bus_creds_get_cgroup.3.gz +%{_mandir}/man3/sd_bus_creds_get_cmdline.3.gz +%{_mandir}/man3/sd_bus_creds_get_comm.3.gz +%{_mandir}/man3/sd_bus_creds_get_description.3.gz +%{_mandir}/man3/sd_bus_creds_get_egid.3.gz +%{_mandir}/man3/sd_bus_creds_get_euid.3.gz +%{_mandir}/man3/sd_bus_creds_get_exe.3.gz +%{_mandir}/man3/sd_bus_creds_get_fsgid.3.gz +%{_mandir}/man3/sd_bus_creds_get_fsuid.3.gz +%{_mandir}/man3/sd_bus_creds_get_gid.3.gz +%{_mandir}/man3/sd_bus_creds_get_mask.3.gz +%{_mandir}/man3/sd_bus_creds_get_owner_uid.3.gz +%{_mandir}/man3/sd_bus_creds_get_pid.3.gz +%{_mandir}/man3/sd_bus_creds_get_ppid.3.gz +%{_mandir}/man3/sd_bus_creds_get_selinux_context.3.gz +%{_mandir}/man3/sd_bus_creds_get_session.3.gz +%{_mandir}/man3/sd_bus_creds_get_sgid.3.gz +%{_mandir}/man3/sd_bus_creds_get_slice.3.gz +%{_mandir}/man3/sd_bus_creds_get_suid.3.gz +%{_mandir}/man3/sd_bus_creds_get_supplementary_gids.3.gz +%{_mandir}/man3/sd_bus_creds_get_tid.3.gz +%{_mandir}/man3/sd_bus_creds_get_tid_comm.3.gz +%{_mandir}/man3/sd_bus_creds_get_tty.3.gz +%{_mandir}/man3/sd_bus_creds_get_uid.3.gz +%{_mandir}/man3/sd_bus_creds_get_unique_name.3.gz +%{_mandir}/man3/sd_bus_creds_get_unit.3.gz +%{_mandir}/man3/sd_bus_creds_get_user_slice.3.gz +%{_mandir}/man3/sd_bus_creds_get_user_unit.3.gz +%{_mandir}/man3/sd_bus_creds_get_well_known_names.3.gz +%{_mandir}/man3/sd_bus_creds_has_bounding_cap.3.gz +%{_mandir}/man3/sd_bus_creds_has_effective_cap.3.gz +%{_mandir}/man3/sd_bus_creds_has_inheritable_cap.3.gz +%{_mandir}/man3/sd_bus_creds_has_permitted_cap.3.gz +%{_mandir}/man3/sd_bus_creds_new_from_pid.3.gz +%{_mandir}/man3/sd_bus_creds_ref.3.gz +%{_mandir}/man3/sd_bus_creds_unref.3.gz +%{_mandir}/man3/sd_bus_creds_unrefp.3.gz +%{_mandir}/man3/sd_bus_default.3.gz +%{_mandir}/man3/sd_bus_default_flush_close.3.gz +%{_mandir}/man3/sd_bus_default_system.3.gz +%{_mandir}/man3/sd_bus_default_user.3.gz +%{_mandir}/man3/sd_bus_destroy_t.3.gz +%{_mandir}/man3/sd_bus_detach_event.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_added.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_added_strv.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_removed.3.gz +%{_mandir}/man3/sd_bus_emit_interfaces_removed_strv.3.gz +%{_mandir}/man3/sd_bus_emit_object_added.3.gz +%{_mandir}/man3/sd_bus_emit_object_removed.3.gz +%{_mandir}/man3/sd_bus_emit_properties_changed.3.gz +%{_mandir}/man3/sd_bus_emit_properties_changed_strv.3.gz +%{_mandir}/man3/sd_bus_emit_signal.3.gz +%{_mandir}/man3/sd_bus_emit_signalv.3.gz +%{_mandir}/man3/sd_bus_enqueue_for_read.3.gz +%{_mandir}/man3/sd_bus_error.3.gz +%{_mandir}/man3/sd_bus_error_add_map.3.gz +%{_mandir}/man3/sd_bus_error_copy.3.gz +%{_mandir}/man3/sd_bus_error_free.3.gz +%{_mandir}/man3/sd_bus_error_get_errno.3.gz +%{_mandir}/man3/sd_bus_error_has_name.3.gz +%{_mandir}/man3/sd_bus_error_has_names.3.gz +%{_mandir}/man3/sd_bus_error_has_names_sentinel.3.gz +%{_mandir}/man3/sd_bus_error_is_set.3.gz +%{_mandir}/man3/sd_bus_error_map.3.gz +%{_mandir}/man3/sd_bus_error_move.3.gz +%{_mandir}/man3/sd_bus_error_set.3.gz +%{_mandir}/man3/sd_bus_error_set_const.3.gz +%{_mandir}/man3/sd_bus_error_set_errno.3.gz +%{_mandir}/man3/sd_bus_error_set_errnof.3.gz +%{_mandir}/man3/sd_bus_error_set_errnofv.3.gz +%{_mandir}/man3/sd_bus_error_setf.3.gz +%{_mandir}/man3/sd_bus_flush.3.gz +%{_mandir}/man3/sd_bus_flush_close_unref.3.gz +%{_mandir}/man3/sd_bus_flush_close_unrefp.3.gz +%{_mandir}/man3/sd_bus_get_address.3.gz +%{_mandir}/man3/sd_bus_get_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_get_bus_id.3.gz +%{_mandir}/man3/sd_bus_get_close_on_exit.3.gz +%{_mandir}/man3/sd_bus_get_connected_signal.3.gz +%{_mandir}/man3/sd_bus_get_creds_mask.3.gz +%{_mandir}/man3/sd_bus_get_current_handler.3.gz +%{_mandir}/man3/sd_bus_get_current_message.3.gz +%{_mandir}/man3/sd_bus_get_current_slot.3.gz +%{_mandir}/man3/sd_bus_get_current_userdata.3.gz +%{_mandir}/man3/sd_bus_get_description.3.gz +%{_mandir}/man3/sd_bus_get_event.3.gz +%{_mandir}/man3/sd_bus_get_events.3.gz +%{_mandir}/man3/sd_bus_get_exit_on_disconnect.3.gz +%{_mandir}/man3/sd_bus_get_fd.3.gz +%{_mandir}/man3/sd_bus_get_method_call_timeout.3.gz +%{_mandir}/man3/sd_bus_get_n_queued_read.3.gz +%{_mandir}/man3/sd_bus_get_n_queued_write.3.gz +%{_mandir}/man3/sd_bus_get_name_creds.3.gz +%{_mandir}/man3/sd_bus_get_name_machine_id.3.gz +%{_mandir}/man3/sd_bus_get_owner_creds.3.gz +%{_mandir}/man3/sd_bus_get_property.3.gz +%{_mandir}/man3/sd_bus_get_property_string.3.gz +%{_mandir}/man3/sd_bus_get_property_strv.3.gz +%{_mandir}/man3/sd_bus_get_property_trivial.3.gz +%{_mandir}/man3/sd_bus_get_scope.3.gz +%{_mandir}/man3/sd_bus_get_sender.3.gz +%{_mandir}/man3/sd_bus_get_tid.3.gz +%{_mandir}/man3/sd_bus_get_timeout.3.gz +%{_mandir}/man3/sd_bus_get_unique_name.3.gz +%{_mandir}/man3/sd_bus_get_watch_bind.3.gz +%{_mandir}/man3/sd_bus_interface_name_is_valid.3.gz +%{_mandir}/man3/sd_bus_is_anonymous.3.gz +%{_mandir}/man3/sd_bus_is_bus_client.3.gz +%{_mandir}/man3/sd_bus_is_monitor.3.gz +%{_mandir}/man3/sd_bus_is_open.3.gz +%{_mandir}/man3/sd_bus_is_ready.3.gz +%{_mandir}/man3/sd_bus_is_server.3.gz +%{_mandir}/man3/sd_bus_is_trusted.3.gz +%{_mandir}/man3/sd_bus_list_names.3.gz +%{_mandir}/man3/sd_bus_match_signal.3.gz +%{_mandir}/man3/sd_bus_match_signal_async.3.gz +%{_mandir}/man3/sd_bus_member_name_is_valid.3.gz +%{_mandir}/man3/sd_bus_message_append.3.gz +%{_mandir}/man3/sd_bus_message_append_array.3.gz +%{_mandir}/man3/sd_bus_message_append_array_iovec.3.gz +%{_mandir}/man3/sd_bus_message_append_array_memfd.3.gz +%{_mandir}/man3/sd_bus_message_append_array_space.3.gz +%{_mandir}/man3/sd_bus_message_append_basic.3.gz +%{_mandir}/man3/sd_bus_message_append_string_iovec.3.gz +%{_mandir}/man3/sd_bus_message_append_string_memfd.3.gz +%{_mandir}/man3/sd_bus_message_append_string_space.3.gz +%{_mandir}/man3/sd_bus_message_append_strv.3.gz +%{_mandir}/man3/sd_bus_message_appendv.3.gz +%{_mandir}/man3/sd_bus_message_at_end.3.gz +%{_mandir}/man3/sd_bus_message_close_container.3.gz +%{_mandir}/man3/sd_bus_message_copy.3.gz +%{_mandir}/man3/sd_bus_message_dump.3.gz +%{_mandir}/man3/sd_bus_message_enter_container.3.gz +%{_mandir}/man3/sd_bus_message_exit_container.3.gz +%{_mandir}/man3/sd_bus_message_get_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_message_get_auto_start.3.gz +%{_mandir}/man3/sd_bus_message_get_bus.3.gz +%{_mandir}/man3/sd_bus_message_get_cookie.3.gz +%{_mandir}/man3/sd_bus_message_get_creds.3.gz +%{_mandir}/man3/sd_bus_message_get_destination.3.gz +%{_mandir}/man3/sd_bus_message_get_errno.3.gz +%{_mandir}/man3/sd_bus_message_get_error.3.gz +%{_mandir}/man3/sd_bus_message_get_expect_reply.3.gz +%{_mandir}/man3/sd_bus_message_get_interface.3.gz +%{_mandir}/man3/sd_bus_message_get_member.3.gz +%{_mandir}/man3/sd_bus_message_get_monotonic_usec.3.gz +%{_mandir}/man3/sd_bus_message_get_path.3.gz +%{_mandir}/man3/sd_bus_message_get_realtime_usec.3.gz +%{_mandir}/man3/sd_bus_message_get_reply_cookie.3.gz +%{_mandir}/man3/sd_bus_message_get_sender.3.gz +%{_mandir}/man3/sd_bus_message_get_seqnum.3.gz +%{_mandir}/man3/sd_bus_message_get_signature.3.gz +%{_mandir}/man3/sd_bus_message_get_type.3.gz +%{_mandir}/man3/sd_bus_message_has_signature.3.gz +%{_mandir}/man3/sd_bus_message_is_empty.3.gz +%{_mandir}/man3/sd_bus_message_is_method_call.3.gz +%{_mandir}/man3/sd_bus_message_is_method_error.3.gz +%{_mandir}/man3/sd_bus_message_is_signal.3.gz +%{_mandir}/man3/sd_bus_message_new.3.gz +%{_mandir}/man3/sd_bus_message_new_method_call.3.gz +%{_mandir}/man3/sd_bus_message_new_method_errno.3.gz +%{_mandir}/man3/sd_bus_message_new_method_errnof.3.gz +%{_mandir}/man3/sd_bus_message_new_method_error.3.gz +%{_mandir}/man3/sd_bus_message_new_method_errorf.3.gz +%{_mandir}/man3/sd_bus_message_new_method_return.3.gz +%{_mandir}/man3/sd_bus_message_new_signal.3.gz +%{_mandir}/man3/sd_bus_message_open_container.3.gz +%{_mandir}/man3/sd_bus_message_peek_type.3.gz +%{_mandir}/man3/sd_bus_message_read.3.gz +%{_mandir}/man3/sd_bus_message_read_array.3.gz +%{_mandir}/man3/sd_bus_message_read_basic.3.gz +%{_mandir}/man3/sd_bus_message_read_strv.3.gz +%{_mandir}/man3/sd_bus_message_readv.3.gz +%{_mandir}/man3/sd_bus_message_ref.3.gz +%{_mandir}/man3/sd_bus_message_rewind.3.gz +%{_mandir}/man3/sd_bus_message_seal.3.gz +%{_mandir}/man3/sd_bus_message_send.3.gz +%{_mandir}/man3/sd_bus_message_sensitive.3.gz +%{_mandir}/man3/sd_bus_message_set_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_message_set_auto_start.3.gz +%{_mandir}/man3/sd_bus_message_set_destination.3.gz +%{_mandir}/man3/sd_bus_message_set_expect_reply.3.gz +%{_mandir}/man3/sd_bus_message_set_sender.3.gz +%{_mandir}/man3/sd_bus_message_skip.3.gz +%{_mandir}/man3/sd_bus_message_unref.3.gz +%{_mandir}/man3/sd_bus_message_unrefp.3.gz +%{_mandir}/man3/sd_bus_message_verify_type.3.gz +%{_mandir}/man3/sd_bus_negotiate_creds.3.gz +%{_mandir}/man3/sd_bus_negotiate_fds.3.gz +%{_mandir}/man3/sd_bus_negotiate_timestamp.3.gz +%{_mandir}/man3/sd_bus_new.3.gz +%{_mandir}/man3/sd_bus_object_path_is_valid.3.gz +%{_mandir}/man3/sd_bus_open.3.gz +%{_mandir}/man3/sd_bus_open_system.3.gz +%{_mandir}/man3/sd_bus_open_system_machine.3.gz +%{_mandir}/man3/sd_bus_open_system_remote.3.gz +%{_mandir}/man3/sd_bus_open_system_with_description.3.gz +%{_mandir}/man3/sd_bus_open_user.3.gz +%{_mandir}/man3/sd_bus_open_user_machine.3.gz +%{_mandir}/man3/sd_bus_open_user_with_description.3.gz +%{_mandir}/man3/sd_bus_open_with_description.3.gz +%{_mandir}/man3/sd_bus_path_decode.3.gz +%{_mandir}/man3/sd_bus_path_decode_many.3.gz +%{_mandir}/man3/sd_bus_path_encode.3.gz +%{_mandir}/man3/sd_bus_path_encode_many.3.gz +%{_mandir}/man3/sd_bus_process.3.gz +%{_mandir}/man3/sd_bus_query_sender_creds.3.gz +%{_mandir}/man3/sd_bus_query_sender_privilege.3.gz +%{_mandir}/man3/sd_bus_ref.3.gz +%{_mandir}/man3/sd_bus_release_name.3.gz +%{_mandir}/man3/sd_bus_release_name_async.3.gz +%{_mandir}/man3/sd_bus_reply_method_errno.3.gz +%{_mandir}/man3/sd_bus_reply_method_errnof.3.gz +%{_mandir}/man3/sd_bus_reply_method_errnofv.3.gz +%{_mandir}/man3/sd_bus_reply_method_error.3.gz +%{_mandir}/man3/sd_bus_reply_method_errorf.3.gz +%{_mandir}/man3/sd_bus_reply_method_errorfv.3.gz +%{_mandir}/man3/sd_bus_reply_method_return.3.gz +%{_mandir}/man3/sd_bus_reply_method_returnv.3.gz +%{_mandir}/man3/sd_bus_request_name.3.gz +%{_mandir}/man3/sd_bus_request_name_async.3.gz +%{_mandir}/man3/sd_bus_send.3.gz +%{_mandir}/man3/sd_bus_send_to.3.gz +%{_mandir}/man3/sd_bus_service_name_is_valid.3.gz +%{_mandir}/man3/sd_bus_set_address.3.gz +%{_mandir}/man3/sd_bus_set_allow_interactive_authorization.3.gz +%{_mandir}/man3/sd_bus_set_anonymous.3.gz +%{_mandir}/man3/sd_bus_set_bus_client.3.gz +%{_mandir}/man3/sd_bus_set_close_on_exit.3.gz +%{_mandir}/man3/sd_bus_set_connected_signal.3.gz +%{_mandir}/man3/sd_bus_set_description.3.gz +%{_mandir}/man3/sd_bus_set_exec.3.gz +%{_mandir}/man3/sd_bus_set_exit_on_disconnect.3.gz +%{_mandir}/man3/sd_bus_set_fd.3.gz +%{_mandir}/man3/sd_bus_set_method_call_timeout.3.gz +%{_mandir}/man3/sd_bus_set_monitor.3.gz +%{_mandir}/man3/sd_bus_set_property.3.gz +%{_mandir}/man3/sd_bus_set_propertyv.3.gz +%{_mandir}/man3/sd_bus_set_sender.3.gz +%{_mandir}/man3/sd_bus_set_server.3.gz +%{_mandir}/man3/sd_bus_set_trusted.3.gz +%{_mandir}/man3/sd_bus_set_watch_bind.3.gz +%{_mandir}/man3/sd_bus_slot_get_bus.3.gz +%{_mandir}/man3/sd_bus_slot_get_current_handler.3.gz +%{_mandir}/man3/sd_bus_slot_get_current_message.3.gz +%{_mandir}/man3/sd_bus_slot_get_current_userdata.3.gz +%{_mandir}/man3/sd_bus_slot_get_description.3.gz +%{_mandir}/man3/sd_bus_slot_get_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_slot_get_floating.3.gz +%{_mandir}/man3/sd_bus_slot_get_userdata.3.gz +%{_mandir}/man3/sd_bus_slot_ref.3.gz +%{_mandir}/man3/sd_bus_slot_set_description.3.gz +%{_mandir}/man3/sd_bus_slot_set_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_slot_set_floating.3.gz +%{_mandir}/man3/sd_bus_slot_set_userdata.3.gz +%{_mandir}/man3/sd_bus_slot_unref.3.gz +%{_mandir}/man3/sd_bus_slot_unrefp.3.gz +%{_mandir}/man3/sd_bus_start.3.gz +%{_mandir}/man3/sd_bus_track_add_name.3.gz +%{_mandir}/man3/sd_bus_track_add_sender.3.gz +%{_mandir}/man3/sd_bus_track_contains.3.gz +%{_mandir}/man3/sd_bus_track_count.3.gz +%{_mandir}/man3/sd_bus_track_count_name.3.gz +%{_mandir}/man3/sd_bus_track_count_sender.3.gz +%{_mandir}/man3/sd_bus_track_first.3.gz +%{_mandir}/man3/sd_bus_track_get_bus.3.gz +%{_mandir}/man3/sd_bus_track_get_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_track_get_recursive.3.gz +%{_mandir}/man3/sd_bus_track_get_userdata.3.gz +%{_mandir}/man3/sd_bus_track_new.3.gz +%{_mandir}/man3/sd_bus_track_next.3.gz +%{_mandir}/man3/sd_bus_track_ref.3.gz +%{_mandir}/man3/sd_bus_track_remove_name.3.gz +%{_mandir}/man3/sd_bus_track_remove_sender.3.gz +%{_mandir}/man3/sd_bus_track_set_destroy_callback.3.gz +%{_mandir}/man3/sd_bus_track_set_recursive.3.gz +%{_mandir}/man3/sd_bus_track_set_userdata.3.gz +%{_mandir}/man3/sd_bus_track_unref.3.gz +%{_mandir}/man3/sd_bus_track_unrefp.3.gz +%{_mandir}/man3/sd_bus_unref.3.gz +%{_mandir}/man3/sd_bus_unrefp.3.gz +%{_mandir}/man3/sd_bus_wait.3.gz +%{_mandir}/man3/sd_event.3.gz +%{_mandir}/man3/sd_event_add_child.3.gz +%{_mandir}/man3/sd_event_add_child_pidfd.3.gz +%{_mandir}/man3/sd_event_add_defer.3.gz +%{_mandir}/man3/sd_event_add_exit.3.gz +%{_mandir}/man3/sd_event_add_inotify.3.gz +%{_mandir}/man3/sd_event_add_io.3.gz +%{_mandir}/man3/sd_event_add_post.3.gz +%{_mandir}/man3/sd_event_add_signal.3.gz +%{_mandir}/man3/sd_event_add_time.3.gz +%{_mandir}/man3/sd_event_add_time_relative.3.gz +%{_mandir}/man3/sd_event_child_handler_t.3.gz +%{_mandir}/man3/sd_event_default.3.gz +%{_mandir}/man3/sd_event_destroy_t.3.gz +%{_mandir}/man3/sd_event_dispatch.3.gz +%{_mandir}/man3/sd_event_exit.3.gz +%{_mandir}/man3/sd_event_get_exit_code.3.gz +%{_mandir}/man3/sd_event_get_fd.3.gz +%{_mandir}/man3/sd_event_get_iteration.3.gz +%{_mandir}/man3/sd_event_get_state.3.gz +%{_mandir}/man3/sd_event_get_tid.3.gz +%{_mandir}/man3/sd_event_get_watchdog.3.gz +%{_mandir}/man3/sd_event_handler_t.3.gz +%{_mandir}/man3/sd_event_inotify_handler_t.3.gz +%{_mandir}/man3/sd_event_io_handler_t.3.gz +%{_mandir}/man3/sd_event_loop.3.gz +%{_mandir}/man3/sd_event_new.3.gz +%{_mandir}/man3/sd_event_now.3.gz +%{_mandir}/man3/sd_event_prepare.3.gz +%{_mandir}/man3/sd_event_ref.3.gz +%{_mandir}/man3/sd_event_run.3.gz +%{_mandir}/man3/sd_event_set_watchdog.3.gz +%{_mandir}/man3/sd_event_signal_handler_t.3.gz +%{_mandir}/man3/sd_event_source.3.gz +%{_mandir}/man3/sd_event_source_disable_unref.3.gz +%{_mandir}/man3/sd_event_source_disable_unrefp.3.gz +%{_mandir}/man3/sd_event_source_get_child_pid.3.gz +%{_mandir}/man3/sd_event_source_get_child_pidfd.3.gz +%{_mandir}/man3/sd_event_source_get_child_pidfd_own.3.gz +%{_mandir}/man3/sd_event_source_get_child_process_own.3.gz +%{_mandir}/man3/sd_event_source_get_description.3.gz +%{_mandir}/man3/sd_event_source_get_destroy_callback.3.gz +%{_mandir}/man3/sd_event_source_get_enabled.3.gz +%{_mandir}/man3/sd_event_source_get_event.3.gz +%{_mandir}/man3/sd_event_source_get_exit_on_failure.3.gz +%{_mandir}/man3/sd_event_source_get_floating.3.gz +%{_mandir}/man3/sd_event_source_get_inotify_mask.3.gz +%{_mandir}/man3/sd_event_source_get_io_events.3.gz +%{_mandir}/man3/sd_event_source_get_io_fd.3.gz +%{_mandir}/man3/sd_event_source_get_io_fd_own.3.gz +%{_mandir}/man3/sd_event_source_get_io_revents.3.gz +%{_mandir}/man3/sd_event_source_get_pending.3.gz +%{_mandir}/man3/sd_event_source_get_priority.3.gz +%{_mandir}/man3/sd_event_source_get_ratelimit.3.gz +%{_mandir}/man3/sd_event_source_get_signal.3.gz +%{_mandir}/man3/sd_event_source_get_time.3.gz +%{_mandir}/man3/sd_event_source_get_time_accuracy.3.gz +%{_mandir}/man3/sd_event_source_get_time_clock.3.gz +%{_mandir}/man3/sd_event_source_get_userdata.3.gz +%{_mandir}/man3/sd_event_source_is_ratelimited.3.gz +%{_mandir}/man3/sd_event_source_ref.3.gz +%{_mandir}/man3/sd_event_source_send_child_signal.3.gz +%{_mandir}/man3/sd_event_source_set_child_pidfd_own.3.gz +%{_mandir}/man3/sd_event_source_set_child_process_own.3.gz +%{_mandir}/man3/sd_event_source_set_description.3.gz +%{_mandir}/man3/sd_event_source_set_destroy_callback.3.gz +%{_mandir}/man3/sd_event_source_set_enabled.3.gz +%{_mandir}/man3/sd_event_source_set_exit_on_failure.3.gz +%{_mandir}/man3/sd_event_source_set_floating.3.gz +%{_mandir}/man3/sd_event_source_set_io_events.3.gz +%{_mandir}/man3/sd_event_source_set_io_fd.3.gz +%{_mandir}/man3/sd_event_source_set_io_fd_own.3.gz +%{_mandir}/man3/sd_event_source_set_prepare.3.gz +%{_mandir}/man3/sd_event_source_set_priority.3.gz +%{_mandir}/man3/sd_event_source_set_ratelimit.3.gz +%{_mandir}/man3/sd_event_source_set_time.3.gz +%{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz +%{_mandir}/man3/sd_event_source_set_time_relative.3.gz +%{_mandir}/man3/sd_event_source_set_userdata.3.gz +%{_mandir}/man3/sd_event_source_unref.3.gz +%{_mandir}/man3/sd_event_source_unrefp.3.gz +%{_mandir}/man3/sd_event_time_handler_t.3.gz +%{_mandir}/man3/sd_event_unref.3.gz +%{_mandir}/man3/sd_event_unrefp.3.gz +%{_mandir}/man3/sd_event_wait.3.gz +%{_mandir}/man3/sd_get_machine_names.3.gz +%{_mandir}/man3/sd_get_seats.3.gz +%{_mandir}/man3/sd_get_sessions.3.gz +%{_mandir}/man3/sd_get_uids.3.gz +%{_mandir}/man3/sd_hwdb_enumerate.3.gz +%{_mandir}/man3/sd_hwdb_get.3.gz +%{_mandir}/man3/sd_hwdb_new.3.gz +%{_mandir}/man3/sd_hwdb_ref.3.gz +%{_mandir}/man3/sd_hwdb_seek.3.gz +%{_mandir}/man3/sd_hwdb_unref.3.gz +%{_mandir}/man3/sd_id128_equal.3.gz +%{_mandir}/man3/sd_id128_from_string.3.gz +%{_mandir}/man3/sd_id128_get_boot.3.gz +%{_mandir}/man3/sd_id128_get_boot_app_specific.3.gz +%{_mandir}/man3/sd_id128_get_invocation.3.gz +%{_mandir}/man3/sd_id128_get_machine.3.gz +%{_mandir}/man3/sd_id128_get_machine_app_specific.3.gz +%{_mandir}/man3/sd_id128_in_set.3.gz +%{_mandir}/man3/sd_id128_in_set_sentinel.3.gz +%{_mandir}/man3/sd_id128_in_setv.3.gz +%{_mandir}/man3/sd_id128_is_allf.3.gz +%{_mandir}/man3/sd_id128_is_null.3.gz +%{_mandir}/man3/sd_id128_randomize.3.gz +%{_mandir}/man3/sd_id128_t.3.gz +%{_mandir}/man3/sd_id128_to_string.3.gz +%{_mandir}/man3/sd_is_fifo.3.gz +%{_mandir}/man3/sd_is_mq.3.gz +%{_mandir}/man3/sd_is_socket.3.gz +%{_mandir}/man3/sd_is_socket_inet.3.gz +%{_mandir}/man3/sd_is_socket_sockaddr.3.gz +%{_mandir}/man3/sd_is_socket_unix.3.gz +%{_mandir}/man3/sd_is_special.3.gz +%{_mandir}/man3/sd_journal.3.gz +%{_mandir}/man3/sd_journal_add_conjunction.3.gz +%{_mandir}/man3/sd_journal_add_disjunction.3.gz +%{_mandir}/man3/sd_journal_add_match.3.gz +%{_mandir}/man3/sd_journal_close.3.gz +%{_mandir}/man3/sd_journal_enumerate_available_data.3.gz +%{_mandir}/man3/sd_journal_enumerate_available_unique.3.gz +%{_mandir}/man3/sd_journal_enumerate_data.3.gz +%{_mandir}/man3/sd_journal_enumerate_fields.3.gz +%{_mandir}/man3/sd_journal_enumerate_unique.3.gz +%{_mandir}/man3/sd_journal_flush_matches.3.gz +%{_mandir}/man3/sd_journal_get_catalog.3.gz +%{_mandir}/man3/sd_journal_get_catalog_for_message_id.3.gz +%{_mandir}/man3/sd_journal_get_cursor.3.gz +%{_mandir}/man3/sd_journal_get_cutoff_monotonic_usec.3.gz +%{_mandir}/man3/sd_journal_get_cutoff_realtime_usec.3.gz +%{_mandir}/man3/sd_journal_get_data.3.gz +%{_mandir}/man3/sd_journal_get_data_threshold.3.gz +%{_mandir}/man3/sd_journal_get_events.3.gz +%{_mandir}/man3/sd_journal_get_fd.3.gz +%{_mandir}/man3/sd_journal_get_monotonic_usec.3.gz +%{_mandir}/man3/sd_journal_get_realtime_usec.3.gz +%{_mandir}/man3/sd_journal_get_timeout.3.gz +%{_mandir}/man3/sd_journal_get_usage.3.gz +%{_mandir}/man3/sd_journal_has_persistent_files.3.gz +%{_mandir}/man3/sd_journal_has_runtime_files.3.gz +%{_mandir}/man3/sd_journal_next.3.gz +%{_mandir}/man3/sd_journal_next_skip.3.gz +%{_mandir}/man3/sd_journal_open.3.gz +%{_mandir}/man3/sd_journal_open_directory.3.gz +%{_mandir}/man3/sd_journal_open_directory_fd.3.gz +%{_mandir}/man3/sd_journal_open_files.3.gz +%{_mandir}/man3/sd_journal_open_files_fd.3.gz +%{_mandir}/man3/sd_journal_open_namespace.3.gz +%{_mandir}/man3/sd_journal_perror.3.gz +%{_mandir}/man3/sd_journal_perror_with_location.3.gz +%{_mandir}/man3/sd_journal_previous.3.gz +%{_mandir}/man3/sd_journal_previous_skip.3.gz +%{_mandir}/man3/sd_journal_print.3.gz +%{_mandir}/man3/sd_journal_print_with_location.3.gz +%{_mandir}/man3/sd_journal_printv.3.gz +%{_mandir}/man3/sd_journal_printv_with_location.3.gz +%{_mandir}/man3/sd_journal_process.3.gz +%{_mandir}/man3/sd_journal_query_unique.3.gz +%{_mandir}/man3/sd_journal_reliable_fd.3.gz +%{_mandir}/man3/sd_journal_restart_data.3.gz +%{_mandir}/man3/sd_journal_restart_fields.3.gz +%{_mandir}/man3/sd_journal_restart_unique.3.gz +%{_mandir}/man3/sd_journal_seek_cursor.3.gz +%{_mandir}/man3/sd_journal_seek_head.3.gz +%{_mandir}/man3/sd_journal_seek_monotonic_usec.3.gz +%{_mandir}/man3/sd_journal_seek_realtime_usec.3.gz +%{_mandir}/man3/sd_journal_seek_tail.3.gz +%{_mandir}/man3/sd_journal_send.3.gz +%{_mandir}/man3/sd_journal_send_with_location.3.gz +%{_mandir}/man3/sd_journal_sendv.3.gz +%{_mandir}/man3/sd_journal_sendv_with_location.3.gz +%{_mandir}/man3/sd_journal_set_data_threshold.3.gz +%{_mandir}/man3/sd_journal_stream_fd.3.gz +%{_mandir}/man3/sd_journal_test_cursor.3.gz +%{_mandir}/man3/sd_journal_wait.3.gz +%{_mandir}/man3/sd_listen_fds.3.gz +%{_mandir}/man3/sd_listen_fds_with_names.3.gz +%{_mandir}/man3/sd_login_monitor.3.gz +%{_mandir}/man3/sd_login_monitor_flush.3.gz +%{_mandir}/man3/sd_login_monitor_get_events.3.gz +%{_mandir}/man3/sd_login_monitor_get_fd.3.gz +%{_mandir}/man3/sd_login_monitor_get_timeout.3.gz +%{_mandir}/man3/sd_login_monitor_new.3.gz +%{_mandir}/man3/sd_login_monitor_unref.3.gz +%{_mandir}/man3/sd_login_monitor_unrefp.3.gz +%{_mandir}/man3/sd_machine_get_class.3.gz +%{_mandir}/man3/sd_machine_get_ifindices.3.gz +%{_mandir}/man3/sd_notify.3.gz +%{_mandir}/man3/sd_notify_barrier.3.gz +%{_mandir}/man3/sd_notifyf.3.gz +%{_mandir}/man3/sd_path_lookup.3.gz +%{_mandir}/man3/sd_path_lookup_strv.3.gz +%{_mandir}/man3/sd_peer_get_cgroup.3.gz +%{_mandir}/man3/sd_peer_get_machine_name.3.gz +%{_mandir}/man3/sd_peer_get_owner_uid.3.gz +%{_mandir}/man3/sd_peer_get_session.3.gz +%{_mandir}/man3/sd_peer_get_slice.3.gz +%{_mandir}/man3/sd_peer_get_unit.3.gz +%{_mandir}/man3/sd_peer_get_user_slice.3.gz +%{_mandir}/man3/sd_peer_get_user_unit.3.gz +%{_mandir}/man3/sd_pid_get_cgroup.3.gz +%{_mandir}/man3/sd_pid_get_machine_name.3.gz +%{_mandir}/man3/sd_pid_get_owner_uid.3.gz +%{_mandir}/man3/sd_pid_get_session.3.gz +%{_mandir}/man3/sd_pid_get_slice.3.gz +%{_mandir}/man3/sd_pid_get_unit.3.gz +%{_mandir}/man3/sd_pid_get_user_slice.3.gz +%{_mandir}/man3/sd_pid_get_user_unit.3.gz +%{_mandir}/man3/sd_pid_notify.3.gz +%{_mandir}/man3/sd_pid_notify_with_fds.3.gz +%{_mandir}/man3/sd_pid_notifyf.3.gz +%{_mandir}/man3/sd_seat_can_graphical.3.gz +%{_mandir}/man3/sd_seat_can_tty.3.gz +%{_mandir}/man3/sd_seat_get_active.3.gz +%{_mandir}/man3/sd_seat_get_sessions.3.gz +%{_mandir}/man3/sd_session_get_class.3.gz +%{_mandir}/man3/sd_session_get_desktop.3.gz +%{_mandir}/man3/sd_session_get_display.3.gz +%{_mandir}/man3/sd_session_get_remote_host.3.gz +%{_mandir}/man3/sd_session_get_remote_user.3.gz +%{_mandir}/man3/sd_session_get_seat.3.gz +%{_mandir}/man3/sd_session_get_service.3.gz +%{_mandir}/man3/sd_session_get_state.3.gz +%{_mandir}/man3/sd_session_get_tty.3.gz +%{_mandir}/man3/sd_session_get_type.3.gz +%{_mandir}/man3/sd_session_get_uid.3.gz +%{_mandir}/man3/sd_session_get_vt.3.gz +%{_mandir}/man3/sd_session_is_active.3.gz +%{_mandir}/man3/sd_session_is_remote.3.gz +%{_mandir}/man3/sd_uid_get_display.3.gz +%{_mandir}/man3/sd_uid_get_seats.3.gz +%{_mandir}/man3/sd_uid_get_sessions.3.gz +%{_mandir}/man3/sd_uid_get_state.3.gz +%{_mandir}/man3/sd_uid_is_on_seat.3.gz +%{_mandir}/man3/sd_watchdog_enabled.3.gz +%{_mandir}/man3/udev_device_get_action.3.gz +%{_mandir}/man3/udev_device_get_current_tags_list_entry.3.gz +%{_mandir}/man3/udev_device_get_devlinks_list_entry.3.gz +%{_mandir}/man3/udev_device_get_devnode.3.gz +%{_mandir}/man3/udev_device_get_devnum.3.gz +%{_mandir}/man3/udev_device_get_devpath.3.gz +%{_mandir}/man3/udev_device_get_devtype.3.gz +%{_mandir}/man3/udev_device_get_driver.3.gz +%{_mandir}/man3/udev_device_get_is_initialized.3.gz +%{_mandir}/man3/udev_device_get_parent.3.gz +%{_mandir}/man3/udev_device_get_parent_with_subsystem_devtype.3.gz +%{_mandir}/man3/udev_device_get_properties_list_entry.3.gz +%{_mandir}/man3/udev_device_get_property_value.3.gz +%{_mandir}/man3/udev_device_get_subsystem.3.gz +%{_mandir}/man3/udev_device_get_sysattr_list_entry.3.gz +%{_mandir}/man3/udev_device_get_sysattr_value.3.gz +%{_mandir}/man3/udev_device_get_sysname.3.gz +%{_mandir}/man3/udev_device_get_sysnum.3.gz +%{_mandir}/man3/udev_device_get_syspath.3.gz +%{_mandir}/man3/udev_device_get_tags_list_entry.3.gz +%{_mandir}/man3/udev_device_get_udev.3.gz +%{_mandir}/man3/udev_device_has_current_tag.3.gz +%{_mandir}/man3/udev_device_has_tag.3.gz +%{_mandir}/man3/udev_device_new_from_device_id.3.gz +%{_mandir}/man3/udev_device_new_from_devnum.3.gz +%{_mandir}/man3/udev_device_new_from_environment.3.gz +%{_mandir}/man3/udev_device_new_from_subsystem_sysname.3.gz +%{_mandir}/man3/udev_device_new_from_syspath.3.gz +%{_mandir}/man3/udev_device_ref.3.gz +%{_mandir}/man3/udev_device_set_sysattr_value.3.gz +%{_mandir}/man3/udev_device_unref.3.gz +%{_mandir}/man3/udev_enumerate_add_match_is_initialized.3.gz +%{_mandir}/man3/udev_enumerate_add_match_parent.3.gz +%{_mandir}/man3/udev_enumerate_add_match_property.3.gz +%{_mandir}/man3/udev_enumerate_add_match_subsystem.3.gz +%{_mandir}/man3/udev_enumerate_add_match_sysattr.3.gz +%{_mandir}/man3/udev_enumerate_add_match_sysname.3.gz +%{_mandir}/man3/udev_enumerate_add_match_tag.3.gz +%{_mandir}/man3/udev_enumerate_add_nomatch_subsystem.3.gz +%{_mandir}/man3/udev_enumerate_add_nomatch_sysattr.3.gz +%{_mandir}/man3/udev_enumerate_add_syspath.3.gz +%{_mandir}/man3/udev_enumerate_get_list_entry.3.gz +%{_mandir}/man3/udev_enumerate_get_udev.3.gz +%{_mandir}/man3/udev_enumerate_new.3.gz +%{_mandir}/man3/udev_enumerate_ref.3.gz +%{_mandir}/man3/udev_enumerate_scan_devices.3.gz +%{_mandir}/man3/udev_enumerate_scan_subsystems.3.gz +%{_mandir}/man3/udev_enumerate_unref.3.gz +%{_mandir}/man3/udev_list_entry.3.gz +%{_mandir}/man3/udev_list_entry_get_by_name.3.gz +%{_mandir}/man3/udev_list_entry_get_name.3.gz +%{_mandir}/man3/udev_list_entry_get_next.3.gz +%{_mandir}/man3/udev_list_entry_get_value.3.gz +%{_mandir}/man3/udev_monitor_enable_receiving.3.gz +%{_mandir}/man3/udev_monitor_filter_add_match_subsystem_devtype.3.gz +%{_mandir}/man3/udev_monitor_filter_add_match_tag.3.gz +%{_mandir}/man3/udev_monitor_filter_remove.3.gz +%{_mandir}/man3/udev_monitor_filter_update.3.gz +%{_mandir}/man3/udev_monitor_get_fd.3.gz +%{_mandir}/man3/udev_monitor_get_udev.3.gz +%{_mandir}/man3/udev_monitor_new_from_netlink.3.gz +%{_mandir}/man3/udev_monitor_receive_device.3.gz +%{_mandir}/man3/udev_monitor_ref.3.gz +%{_mandir}/man3/udev_monitor_set_receive_buffer_size.3.gz +%{_mandir}/man3/udev_monitor_unref.3.gz +%{_mandir}/man3/udev_new.3.gz +%{_mandir}/man3/udev_ref.3.gz +%{_mandir}/man3/udev_unref.3.gz +%endif diff --git a/files.network b/files.network new file mode 100644 index 00000000..4118d63d --- /dev/null +++ b/files.network @@ -0,0 +1,61 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%if %{with networkd} +%config(noreplace) %{_sysconfdir}/systemd/networkd.conf +%dir %{_sysconfdir}/systemd/network +%dir %{_systemd_util_dir}/network +%{_bindir}/networkctl +%{_datadir}/bash-completion/completions/networkctl +%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy +%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules +%{_datadir}/zsh/site-functions/_networkctl +%{_mandir}/man1/networkctl.1.gz +%{_mandir}/man5/networkd.conf.5.gz +%{_mandir}/man5/networkd.conf.d.5.gz +%{_mandir}/man5/systemd.network.5.gz +%{_mandir}/man8/systemd-networkd-wait-online.8.gz +%{_mandir}/man8/systemd-networkd-wait-online.service.8.gz +%{_mandir}/man8/systemd-networkd.8.gz +%{_mandir}/man8/systemd-networkd.service.8.gz +%{_systemd_util_dir}/network/80-container-host0.network +%{_systemd_util_dir}/network/80-container-ve.network +%{_systemd_util_dir}/network/80-container-vz.network +%{_systemd_util_dir}/network/80-vm-vt.network +%{_systemd_util_dir}/network/80-wifi-adhoc.network +%{_systemd_util_dir}/network/80-wifi-ap.network.example +%{_systemd_util_dir}/network/80-wifi-station.network.example +%{_systemd_util_dir}/systemd-networkd +%{_systemd_util_dir}/systemd-networkd-wait-online +%{_unitdir}/systemd-networkd-wait-online.service +%{_unitdir}/systemd-networkd.service +%{_unitdir}/systemd-networkd.socket +%endif + +%if %{with resolved} +%config(noreplace) %{_sysconfdir}/systemd/resolved.conf +%{_bindir}/resolvectl +%{_bindir}/systemd-resolve +%{_datadir}/bash-completion/completions/resolvectl +%{_datadir}/bash-completion/completions/systemd-resolve +%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf +%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy +%{_datadir}/zsh/site-functions/_resolvectl +%{_libdir}/libnss_resolve.so.2 +%{_mandir}/man1/resolvectl.1.gz +%{_mandir}/man5/org.freedesktop.resolve1.5.gz +%{_mandir}/man5/resolved.conf.5.gz +%{_mandir}/man5/resolved.conf.d.5.gz +%{_mandir}/man8/libnss_resolve.so.2.8.gz +%{_mandir}/man8/nss-resolve.8.gz +%{_mandir}/man8/systemd-resolved.8.gz +%{_mandir}/man8/systemd-resolved.service.8.gz +%{_systemd_util_dir}/resolv.conf +%{_systemd_util_dir}/systemd-resolved +%{_sysusersdir}/systemd-resolve.conf +%{_tmpfilesdir}/systemd-resolve.conf +%{_unitdir}/systemd-resolved.service +%endif diff --git a/files.systemd b/files.systemd new file mode 100644 index 00000000..1a2d79a8 --- /dev/null +++ b/files.systemd @@ -0,0 +1,852 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%config(noreplace) %{_sysconfdir}/systemd/journald.conf +%config(noreplace) %{_sysconfdir}/systemd/logind.conf +%config(noreplace) %{_sysconfdir}/systemd/sleep.conf +%config(noreplace) %{_sysconfdir}/systemd/system.conf +%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf +%config(noreplace) %{_sysconfdir}/systemd/user.conf +%dir %{_binfmtdir} +%if ! 0%{?bootstrap} +%dir %{_datadir}/bash-completion +%dir %{_datadir}/bash-completion/completions +%endif +%dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/services +%dir %{_datadir}/dbus-1/system-services +%dir %{_datadir}/dbus-1/system.d +%dir %{_datadir}/factory +%dir %{_datadir}/polkit-1 +%dir %{_datadir}/polkit-1/actions +%dir %{_datadir}/systemd +%if ! 0%{?bootstrap} +%dir %{_datadir}/zsh +%dir %{_datadir}/zsh/site-functions +%endif +%dir %{_distconfdir}/X11/xinit +%dir %{_distconfdir}/X11/xinit/xinitrc.d +%dir %{_environmentdir} +%dir %{_journalcatalogdir} +%dir %{_localstatedir}/lib/systemd +%dir %{_localstatedir}/lib/systemd/catalog +%if %{with sysvcompat} +%dir %{_localstatedir}/lib/systemd/migrated +%dir %{_localstatedir}/lib/systemd/sysv-convert +%endif +%dir %{_modprobedir} +%dir %{_modulesloaddir} +%dir %{_prefix}/lib/kernel +%dir %{_prefix}/lib/kernel/install.d +%dir %{_sysconfdir}/X11/xorg.conf.d +%dir %{_sysconfdir}/binfmt.d +%dir %{_sysconfdir}/modules-load.d +%dir %{_sysconfdir}/sysctl.d +%dir %{_sysconfdir}/systemd +%dir %{_sysconfdir}/systemd/system +%dir %{_sysconfdir}/systemd/user +%dir %{_sysconfdir}/tmpfiles.d +%dir %{_sysconfdir}/xdg/systemd +%dir %{_sysctldir} +%dir %{_systemd_system_env_generator_dir} +%dir %{_systemd_user_env_generator_dir} +%dir %{_systemd_util_dir} +%if %{with sd_boot} +%dir %{_systemd_util_dir}/boot +%dir %{_systemd_util_dir}/boot/efi +%endif +%dir %{_systemd_util_dir}/ntp-units.d +%dir %{_systemd_util_dir}/scripts +%dir %{_systemd_util_dir}/system-preset +%dir %{_systemd_util_dir}/system-shutdown +%dir %{_systemd_util_dir}/system-sleep +%dir %{_systemd_util_dir}/user +%dir %{_systemd_util_dir}/user-generators +%dir %{_systemd_util_dir}/user-preset +%dir %{_systemdgeneratordir} +%dir %{_systemdusergeneratordir} +%dir %{_sysusersdir} +%dir %{_tmpfilesdir} +%dir %{_unitdir} +%dir %{_unitdir}/basic.target.wants +%dir %{_unitdir}/dbus.target.wants +%dir %{_unitdir}/default.target.wants +%dir %{_unitdir}/graphical.target.wants +%dir %{_unitdir}/halt.target.wants +%dir %{_unitdir}/initrd-root-device.target.wants +%dir %{_unitdir}/initrd-root-fs.target.wants +%dir %{_unitdir}/kexec.target.wants +%dir %{_unitdir}/local-fs.target.wants +%dir %{_unitdir}/multi-user.target.wants +%dir %{_unitdir}/poweroff.target.wants +%dir %{_unitdir}/reboot.target.wants +%dir %{_unitdir}/remote-fs.target.wants +%dir %{_unitdir}/rescue.target.wants +%if %{with sysvcompat} +%dir %{_unitdir}/runlevel1.target.wants +%dir %{_unitdir}/runlevel2.target.wants +%dir %{_unitdir}/runlevel3.target.wants +%dir %{_unitdir}/runlevel4.target.wants +%dir %{_unitdir}/runlevel5.target.wants +%endif +%dir %{_unitdir}/shutdown.target.wants +%dir %{_unitdir}/sockets.target.wants +%dir %{_unitdir}/sysinit.target.wants +%dir %{_unitdir}/timers.target.wants +%doc %{_modprobedir}/README +%doc %{_sysctldir}/README +%doc %{_sysusersdir}/README +%doc %{_tmpfilesdir}/README +%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id +%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed +%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf +%ghost %config(noreplace) %{_sysconfdir}/locale.conf +%ghost %config(noreplace) %{_sysconfdir}/machine-info +%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf +%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal +%ghost %{_localstatedir}/lib/systemd/backlight +%ghost %{_localstatedir}/lib/systemd/catalog/database +%ghost %{_localstatedir}/lib/systemd/i18n-migrated +%license LICENSE.GPL2 +%license LICENSE.LGPL2.1 +%if %{with sd_boot} +%{_bindir}/bootctl +%endif +%{_bindir}/busctl +%{_bindir}/hostnamectl +%{_bindir}/journalctl +%{_bindir}/kernel-install +%{_bindir}/localectl +%{_bindir}/loginctl +%{_bindir}/systemctl +%{_bindir}/systemd-analyze +%{_bindir}/systemd-ask-password +%{_bindir}/systemd-cat +%{_bindir}/systemd-cgls +%{_bindir}/systemd-cgtop +%if ! 0%{?bootstrap} +%{_bindir}/systemd-cryptenroll +%endif +%{_bindir}/systemd-delta +%{_bindir}/systemd-detect-virt +%{_bindir}/systemd-dissect +%{_bindir}/systemd-escape +%{_bindir}/systemd-firstboot +%{_bindir}/systemd-id128 +%{_bindir}/systemd-inhibit +%{_bindir}/systemd-machine-id-setup +%{_bindir}/systemd-mount +%{_bindir}/systemd-notify +%{_bindir}/systemd-path +%{_bindir}/systemd-run +%{_bindir}/systemd-socket-activate +%{_bindir}/systemd-stdio-bridge +%{_bindir}/systemd-sysext +%{_bindir}/systemd-sysusers +%{_bindir}/systemd-tmpfiles +%{_bindir}/systemd-tty-ask-password-agent +%{_bindir}/systemd-umount +%{_bindir}/timedatectl +%if ! 0%{?bootstrap} +%if %{with sd_boot} +%{_datadir}/bash-completion/completions/bootctl +%endif +%{_datadir}/bash-completion/completions/busctl +%{_datadir}/bash-completion/completions/coredumpctl +%{_datadir}/bash-completion/completions/hostnamectl +%{_datadir}/bash-completion/completions/journalctl +%{_datadir}/bash-completion/completions/kernel-install +%{_datadir}/bash-completion/completions/localectl +%{_datadir}/bash-completion/completions/loginctl +%{_datadir}/bash-completion/completions/portablectl +%{_datadir}/bash-completion/completions/systemctl +%{_datadir}/bash-completion/completions/systemd-analyze +%{_datadir}/bash-completion/completions/systemd-cat +%{_datadir}/bash-completion/completions/systemd-cgls +%{_datadir}/bash-completion/completions/systemd-cgtop +%{_datadir}/bash-completion/completions/systemd-delta +%{_datadir}/bash-completion/completions/systemd-detect-virt +%{_datadir}/bash-completion/completions/systemd-id128 +%{_datadir}/bash-completion/completions/systemd-path +%{_datadir}/bash-completion/completions/systemd-run +%{_datadir}/bash-completion/completions/timedatectl +%endif +%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service +%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service +%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf +%{_datadir}/pkgconfig/systemd.pc +%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy +%{_datadir}/systemd/kbd-model-map +%{_datadir}/systemd/language-fallback-map +%if ! 0%{?bootstrap} +%if %{with sd_boot} +%{_datadir}/zsh/site-functions/_bootctl +%endif +%{_datadir}/zsh/site-functions/_busctl +%{_datadir}/zsh/site-functions/_coredumpctl +%{_datadir}/zsh/site-functions/_hostnamectl +%{_datadir}/zsh/site-functions/_journalctl +%{_datadir}/zsh/site-functions/_kernel-install +%{_datadir}/zsh/site-functions/_localectl +%{_datadir}/zsh/site-functions/_loginctl +%{_datadir}/zsh/site-functions/_sd_hosts_or_user_at_host +%{_datadir}/zsh/site-functions/_sd_outputmodes +%{_datadir}/zsh/site-functions/_sd_unit_files +%{_datadir}/zsh/site-functions/_systemctl +%{_datadir}/zsh/site-functions/_systemd +%{_datadir}/zsh/site-functions/_systemd-analyze +%{_datadir}/zsh/site-functions/_systemd-delta +%{_datadir}/zsh/site-functions/_systemd-inhibit +%{_datadir}/zsh/site-functions/_systemd-path +%{_datadir}/zsh/site-functions/_systemd-run +%{_datadir}/zsh/site-functions/_systemd-tmpfiles +%{_datadir}/zsh/site-functions/_timedatectl +%endif +%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh +%{_environmentdir}/99-environment.conf +%{_journalcatalogdir}/systemd.be.catalog +%{_journalcatalogdir}/systemd.be@latin.catalog +%{_journalcatalogdir}/systemd.bg.catalog +%{_journalcatalogdir}/systemd.catalog +%{_journalcatalogdir}/systemd.de.catalog +%{_journalcatalogdir}/systemd.fr.catalog +%{_journalcatalogdir}/systemd.it.catalog +%{_journalcatalogdir}/systemd.pl.catalog +%{_journalcatalogdir}/systemd.pt_BR.catalog +%{_journalcatalogdir}/systemd.ru.catalog +%{_journalcatalogdir}/systemd.zh_CN.catalog +%{_journalcatalogdir}/systemd.zh_TW.catalog +%if ! 0%{bootstrap} +%if %{with sd_boot} +%{_mandir}/man1/bootctl.1.gz +%endif +%{_mandir}/man1/busctl.1.gz +%{_mandir}/man1/hostnamectl.1.gz +%{_mandir}/man1/journalctl.1.gz +%{_mandir}/man1/localectl.1.gz +%{_mandir}/man1/loginctl.1.gz +%{_mandir}/man1/systemctl.1.gz +%{_mandir}/man1/systemd-analyze.1.gz +%{_mandir}/man1/systemd-ask-password.1.gz +%{_mandir}/man1/systemd-cat.1.gz +%{_mandir}/man1/systemd-cgls.1.gz +%{_mandir}/man1/systemd-cgtop.1.gz +%{_mandir}/man1/systemd-cryptenroll.1.gz +%{_mandir}/man1/systemd-delta.1.gz +%{_mandir}/man1/systemd-detect-virt.1.gz +%{_mandir}/man1/systemd-dissect.1.gz +%{_mandir}/man1/systemd-escape.1.gz +%{_mandir}/man1/systemd-firstboot.1.gz +%{_mandir}/man1/systemd-firstboot.service.1.gz +%{_mandir}/man1/systemd-id128.1.gz +%{_mandir}/man1/systemd-inhibit.1.gz +%{_mandir}/man1/systemd-machine-id-setup.1.gz +%{_mandir}/man1/systemd-mount.1.gz +%{_mandir}/man1/systemd-notify.1.gz +%{_mandir}/man1/systemd-path.1.gz +%{_mandir}/man1/systemd-run.1.gz +%{_mandir}/man1/systemd-socket-activate.1.gz +%{_mandir}/man1/systemd-tty-ask-password-agent.1.gz +%{_mandir}/man1/systemd-umount.1.gz +%{_mandir}/man1/systemd.1.gz +%{_mandir}/man1/timedatectl.1.gz +%{_mandir}/man5/binfmt.d.5.gz +%{_mandir}/man5/crypttab.5.gz +%{_mandir}/man5/dnssec-trust-anchors.d.5.gz +%{_mandir}/man5/environment.d.5.gz +%{_mandir}/man5/hostname.5.gz +%{_mandir}/man5/initrd-release.5.gz +%{_mandir}/man5/journald.conf.5.gz +%{_mandir}/man5/journald.conf.d.5.gz +%{_mandir}/man5/journald@.conf.5.gz +%if %{with sd_boot} +%{_mandir}/man5/loader.conf.5.gz +%endif +%{_mandir}/man5/locale.conf.5.gz +%{_mandir}/man5/localtime.5.gz +%{_mandir}/man5/logind.conf.5.gz +%{_mandir}/man5/logind.conf.d.5.gz +%{_mandir}/man5/machine-id.5.gz +%{_mandir}/man5/machine-info.5.gz +%{_mandir}/man5/modules-load.d.5.gz +%{_mandir}/man5/org.freedesktop.LogControl1.5.gz +%{_mandir}/man5/org.freedesktop.hostname1.5.gz +%{_mandir}/man5/org.freedesktop.locale1.5.gz +%{_mandir}/man5/org.freedesktop.login1.5.gz +%{_mandir}/man5/org.freedesktop.portable1.5.gz +%{_mandir}/man5/org.freedesktop.systemd1.5.gz +%{_mandir}/man5/org.freedesktop.timedate1.5.gz +%{_mandir}/man5/os-release.5.gz +%{_mandir}/man5/sleep.conf.d.5.gz +%{_mandir}/man5/sysctl.d.5.gz +%{_mandir}/man5/system.conf.d.5.gz +%{_mandir}/man5/systemd-sleep.conf.5.gz +%{_mandir}/man5/systemd-system.conf.5.gz +%{_mandir}/man5/systemd-user-runtime-dir.5.gz +%{_mandir}/man5/systemd-user.conf.5.gz +%{_mandir}/man5/systemd.automount.5.gz +%{_mandir}/man5/systemd.device.5.gz +%{_mandir}/man5/systemd.dnssd.5.gz +%{_mandir}/man5/systemd.exec.5.gz +%{_mandir}/man5/systemd.kill.5.gz +%{_mandir}/man5/systemd.link.5.gz +%{_mandir}/man5/systemd.mount.5.gz +%{_mandir}/man5/systemd.negative.5.gz +%{_mandir}/man5/systemd.netdev.5.gz +%{_mandir}/man5/systemd.path.5.gz +%{_mandir}/man5/systemd.positive.5.gz +%{_mandir}/man5/systemd.preset.5.gz +%{_mandir}/man5/systemd.resource-control.5.gz +%{_mandir}/man5/systemd.scope.5.gz +%{_mandir}/man5/systemd.service.5.gz +%{_mandir}/man5/systemd.slice.5.gz +%{_mandir}/man5/systemd.socket.5.gz +%{_mandir}/man5/systemd.swap.5.gz +%{_mandir}/man5/systemd.target.5.gz +%{_mandir}/man5/systemd.timer.5.gz +%{_mandir}/man5/systemd.unit.5.gz +%{_mandir}/man5/sysusers.d.5.gz +%{_mandir}/man5/timesyncd.conf.5.gz +%{_mandir}/man5/timesyncd.conf.d.5.gz +%{_mandir}/man5/tmpfiles.d.5.gz +%{_mandir}/man5/user-runtime-dir@.service.5.gz +%{_mandir}/man5/user.conf.d.5.gz +%{_mandir}/man5/user@.service.5.gz +%{_mandir}/man5/vconsole.conf.5.gz +%{_mandir}/man5/veritytab.5.gz +%{_mandir}/man7/bootup.7.gz +%{_mandir}/man7/daemon.7.gz +%{_mandir}/man7/file-hierarchy.7.gz +%{_mandir}/man7/kernel-command-line.7.gz +%if %{with sd_boot} +%{_mandir}/man7/sd-boot.7.gz +%{_mandir}/man7/systemd-boot.7.gz +%endif +%{_mandir}/man7/systemd.directives.7.gz +%{_mandir}/man7/systemd.environment-generator.7.gz +%{_mandir}/man7/systemd.generator.7.gz +%{_mandir}/man7/systemd.index.7.gz +%{_mandir}/man7/systemd.journal-fields.7.gz +%{_mandir}/man7/systemd.net-naming-scheme.7.gz +%{_mandir}/man7/systemd.offline-updates.7.gz +%{_mandir}/man7/systemd.special.7.gz +%{_mandir}/man7/systemd.syntax.7.gz +%{_mandir}/man7/systemd.time.7.gz +%{_mandir}/man8/30-systemd-environment-d-generator.8.gz +%{_mandir}/man8/kernel-install.8.gz +%{_mandir}/man8/pam_systemd.8.gz +%{_mandir}/man8/rc-local.service.8.gz +%{_mandir}/man8/systemd-ask-password-console.path.8.gz +%{_mandir}/man8/systemd-ask-password-console.service.8.gz +%{_mandir}/man8/systemd-ask-password-wall.path.8.gz +%{_mandir}/man8/systemd-ask-password-wall.service.8.gz +%{_mandir}/man8/systemd-backlight.8.gz +%{_mandir}/man8/systemd-backlight@.service.8.gz +%{_mandir}/man8/systemd-binfmt.8.gz +%{_mandir}/man8/systemd-binfmt.service.8.gz +%if %{with sd_boot} +%{_mandir}/man8/systemd-bless-boot-generator.8.gz +%{_mandir}/man8/systemd-bless-boot.8.gz +%{_mandir}/man8/systemd-bless-boot.service.8.gz +%endif +%{_mandir}/man8/systemd-boot-check-no-failures.8.gz +%{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz +%if %{with sd_boot} +%{_mandir}/man8/systemd-boot-system-token.service.8.gz +%endif +%{_mandir}/man8/systemd-cryptsetup-generator.8.gz +%{_mandir}/man8/systemd-cryptsetup.8.gz +%{_mandir}/man8/systemd-cryptsetup@.service.8.gz +%{_mandir}/man8/systemd-debug-generator.8.gz +%{_mandir}/man8/systemd-environment-d-generator.8.gz +%{_mandir}/man8/systemd-fsck-root.service.8.gz +%{_mandir}/man8/systemd-fsck.8.gz +%{_mandir}/man8/systemd-fsck@.service.8.gz +%{_mandir}/man8/systemd-fstab-generator.8.gz +%{_mandir}/man8/systemd-getty-generator.8.gz +%{_mandir}/man8/systemd-gpt-auto-generator.8.gz +%{_mandir}/man8/systemd-growfs.8.gz +%{_mandir}/man8/systemd-growfs@.service.8.gz +%{_mandir}/man8/systemd-halt.service.8.gz +%{_mandir}/man8/systemd-hibernate-resume-generator.8.gz +%{_mandir}/man8/systemd-hibernate-resume.8.gz +%{_mandir}/man8/systemd-hibernate-resume@.service.8.gz +%{_mandir}/man8/systemd-hibernate.service.8.gz +%{_mandir}/man8/systemd-hostnamed.8.gz +%{_mandir}/man8/systemd-hostnamed.service.8.gz +%{_mandir}/man8/systemd-hybrid-sleep.service.8.gz +%{_mandir}/man8/systemd-initctl.8.gz +%{_mandir}/man8/systemd-initctl.service.8.gz +%{_mandir}/man8/systemd-initctl.socket.8.gz +%{_mandir}/man8/systemd-journald-audit.socket.8.gz +%{_mandir}/man8/systemd-journald-dev-log.socket.8.gz +%{_mandir}/man8/systemd-journald-varlink@.socket.8.gz +%{_mandir}/man8/systemd-journald.8.gz +%{_mandir}/man8/systemd-journald.service.8.gz +%{_mandir}/man8/systemd-journald.socket.8.gz +%{_mandir}/man8/systemd-journald@.service.8.gz +%{_mandir}/man8/systemd-journald@.socket.8.gz +%{_mandir}/man8/systemd-kexec.service.8.gz +%{_mandir}/man8/systemd-localed.8.gz +%{_mandir}/man8/systemd-localed.service.8.gz +%{_mandir}/man8/systemd-logind.8.gz +%{_mandir}/man8/systemd-logind.service.8.gz +%{_mandir}/man8/systemd-machine-id-commit.service.8.gz +%{_mandir}/man8/systemd-makefs.8.gz +%{_mandir}/man8/systemd-makefs@.service.8.gz +%{_mandir}/man8/systemd-mkswap@.service.8.gz +%{_mandir}/man8/systemd-modules-load.8.gz +%{_mandir}/man8/systemd-modules-load.service.8.gz +%{_mandir}/man8/systemd-poweroff.service.8.gz +%{_mandir}/man8/systemd-quotacheck.8.gz +%{_mandir}/man8/systemd-quotacheck.service.8.gz +%{_mandir}/man8/systemd-random-seed.8.gz +%{_mandir}/man8/systemd-random-seed.service.8.gz +%{_mandir}/man8/systemd-rc-local-generator.8.gz +%{_mandir}/man8/systemd-reboot.service.8.gz +%{_mandir}/man8/systemd-remount-fs.8.gz +%{_mandir}/man8/systemd-remount-fs.service.8.gz +%{_mandir}/man8/systemd-rfkill.8.gz +%{_mandir}/man8/systemd-rfkill.service.8.gz +%{_mandir}/man8/systemd-rfkill.socket.8.gz +%{_mandir}/man8/systemd-run-generator.8.gz +%{_mandir}/man8/systemd-shutdown.8.gz +%{_mandir}/man8/systemd-sleep.8.gz +%{_mandir}/man8/systemd-socket-proxyd.8.gz +%{_mandir}/man8/systemd-suspend-then-hibernate.service.8.gz +%{_mandir}/man8/systemd-suspend.service.8.gz +%{_mandir}/man8/systemd-sysctl.8.gz +%{_mandir}/man8/systemd-sysctl.service.8.gz +%{_mandir}/man8/systemd-sysext.8.gz +%{_mandir}/man8/systemd-sysext.service.8.gz +%{_mandir}/man8/systemd-system-update-generator.8.gz +%{_mandir}/man8/systemd-sysusers.8.gz +%{_mandir}/man8/systemd-sysusers.service.8.gz +%{_mandir}/man8/systemd-sysv-generator.8.gz +%{_mandir}/man8/systemd-time-wait-sync.8.gz +%{_mandir}/man8/systemd-time-wait-sync.service.8.gz +%{_mandir}/man8/systemd-timedated.8.gz +%{_mandir}/man8/systemd-timedated.service.8.gz +%{_mandir}/man8/systemd-timesyncd.8.gz +%{_mandir}/man8/systemd-timesyncd.service.8.gz +%{_mandir}/man8/systemd-tmpfiles-clean.service.8.gz +%{_mandir}/man8/systemd-tmpfiles-clean.timer.8.gz +%{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8.gz +%{_mandir}/man8/systemd-tmpfiles-setup.service.8.gz +%{_mandir}/man8/systemd-tmpfiles.8.gz +%{_mandir}/man8/systemd-update-done.8.gz +%{_mandir}/man8/systemd-update-done.service.8.gz +%{_mandir}/man8/systemd-update-utmp-runlevel.service.8.gz +%{_mandir}/man8/systemd-update-utmp.8.gz +%{_mandir}/man8/systemd-update-utmp.service.8.gz +%{_mandir}/man8/systemd-user-sessions.8.gz +%{_mandir}/man8/systemd-user-sessions.service.8.gz +%{_mandir}/man8/systemd-vconsole-setup.8.gz +%{_mandir}/man8/systemd-vconsole-setup.service.8.gz +%{_mandir}/man8/systemd-veritysetup-generator.8.gz +%{_mandir}/man8/systemd-veritysetup.8.gz +%{_mandir}/man8/systemd-veritysetup@.service.8.gz +%{_mandir}/man8/systemd-volatile-root.8.gz +%{_mandir}/man8/systemd-volatile-root.service.8.gz +%{_mandir}/man8/systemd-xdg-autostart-generator.8.gz +%endif +%{_modprobedir}/systemd.conf +%{_pam_moduledir}/pam_systemd.so +%{_pam_vendordir}/systemd-user +%{_prefix}/lib/kernel/install.d/00-entry-directory.install +%{_prefix}/lib/kernel/install.d/50-depmod.install +%{_prefix}/lib/kernel/install.d/90-loaderentry.install +%{_sysconfdir}/xdg/systemd/user +%{_sysctldir}/99-sysctl.conf +%{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator +%if %{with sd_boot} +# These are part of the very few exceptions where glob pattern is allowd. +%{_systemd_util_dir}/boot/efi/linux*.efi.stub +%{_systemd_util_dir}/boot/efi/linux*.elf.stub +%{_systemd_util_dir}/boot/efi/systemd-boot*.efi +%endif +%{_systemd_util_dir}/libsystemd-shared-249.so +%{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list +%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh +%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh +%{_systemd_util_dir}/system-preset/99-default.preset +%{_systemd_util_dir}/systemd +%{_systemd_util_dir}/systemd-ac-power +%{_systemd_util_dir}/systemd-backlight +%{_systemd_util_dir}/systemd-binfmt +%if %{with sd_boot} +%{_systemd_util_dir}/systemd-bless-boot +%endif +%{_systemd_util_dir}/systemd-boot-check-no-failures +%{_systemd_util_dir}/systemd-cgroups-agent +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/systemd-cryptsetup +%endif +%{_systemd_util_dir}/systemd-fsck +%{_systemd_util_dir}/systemd-growfs +%{_systemd_util_dir}/systemd-hibernate-resume +%{_systemd_util_dir}/systemd-hostnamed +%if %{with sysvcompat} +%{_systemd_util_dir}/systemd-initctl +%endif +%{_systemd_util_dir}/systemd-journald +%{_systemd_util_dir}/systemd-localed +%{_systemd_util_dir}/systemd-logind +%{_systemd_util_dir}/systemd-makefs +%{_systemd_util_dir}/systemd-modules-load +%{_systemd_util_dir}/systemd-quotacheck +%{_systemd_util_dir}/systemd-random-seed +%{_systemd_util_dir}/systemd-remount-fs +%{_systemd_util_dir}/systemd-reply-password +%{_systemd_util_dir}/systemd-rfkill +%{_systemd_util_dir}/systemd-shutdown +%{_systemd_util_dir}/systemd-sleep +%{_systemd_util_dir}/systemd-socket-proxyd +%{_systemd_util_dir}/systemd-sulogin-shell +%{_systemd_util_dir}/systemd-sysctl +%if %{with sysvcompat} +%{_systemd_util_dir}/systemd-sysv-convert +%{_systemd_util_dir}/systemd-sysv-install +%endif +%{_systemd_util_dir}/systemd-time-wait-sync +%{_systemd_util_dir}/systemd-timedated +%{_systemd_util_dir}/systemd-timesyncd +%{_systemd_util_dir}/systemd-update-done +%{_systemd_util_dir}/systemd-update-utmp +%{_systemd_util_dir}/systemd-user-runtime-dir +%{_systemd_util_dir}/systemd-user-sessions +%{_systemd_util_dir}/systemd-vconsole-setup +%if ! 0%{?bootstrap} +%{_systemd_util_dir}/systemd-veritysetup +%endif +%{_systemd_util_dir}/systemd-volatile-root +%{_systemd_util_dir}/systemd-xdg-autostart-condition +%{_systemd_util_dir}/user-generators/systemd-xdg-autostart-generator +%{_systemd_util_dir}/user-preset/90-systemd.preset +%{_systemd_util_dir}/user-preset/99-default.preset +%{_systemd_util_dir}/user/app.slice +%{_systemd_util_dir}/user/background.slice +%{_systemd_util_dir}/user/basic.target +%{_systemd_util_dir}/user/bluetooth.target +%{_systemd_util_dir}/user/default.target +%{_systemd_util_dir}/user/exit.target +%{_systemd_util_dir}/user/graphical-session-pre.target +%{_systemd_util_dir}/user/graphical-session.target +%{_systemd_util_dir}/user/paths.target +%{_systemd_util_dir}/user/printer.target +%{_systemd_util_dir}/user/session.slice +%{_systemd_util_dir}/user/shutdown.target +%{_systemd_util_dir}/user/smartcard.target +%{_systemd_util_dir}/user/sockets.target +%{_systemd_util_dir}/user/sound.target +%{_systemd_util_dir}/user/systemd-exit.service +%{_systemd_util_dir}/user/systemd-tmpfiles-clean.service +%{_systemd_util_dir}/user/systemd-tmpfiles-clean.timer +%{_systemd_util_dir}/user/systemd-tmpfiles-setup.service +%{_systemd_util_dir}/user/timers.target +%{_systemd_util_dir}/user/xdg-desktop-autostart.target +%if %{with sd_boot} +%{_systemdgeneratordir}/systemd-bless-boot-generator +%endif +%if ! 0%{?bootstrap} +%{_systemdgeneratordir}/systemd-cryptsetup-generator +%endif +%{_systemdgeneratordir}/systemd-debug-generator +%{_systemdgeneratordir}/systemd-fstab-generator +%{_systemdgeneratordir}/systemd-getty-generator +%{_systemdgeneratordir}/systemd-gpt-auto-generator +%{_systemdgeneratordir}/systemd-hibernate-resume-generator +%if %{with sysvcompat} +%{_systemdgeneratordir}/systemd-rc-local-generator +%endif +%{_systemdgeneratordir}/systemd-run-generator +%{_systemdgeneratordir}/systemd-system-update-generator +%if %{with sysvcompat} +%{_systemdgeneratordir}/systemd-sysv-generator +%endif +%if ! 0%{?bootstrap} +%{_systemdgeneratordir}/systemd-veritysetup-generator +%endif +%{_sysusersdir}/systemd-journal.conf +%if %{with networkd} +# Yes, systemd-network.conf really belongs here, see +# https://github.com/systemd/systemd/pull/22416#issuecomment-1029828592 +%{_sysusersdir}/systemd-network.conf +%endif +%{_sysusersdir}/systemd-timesync.conf +%{_tmpfilesdir}/journal-nocow.conf +%{_tmpfilesdir}/suse.conf +%{_tmpfilesdir}/systemd-nologin.conf +%{_tmpfilesdir}/systemd-tmp.conf +%{_tmpfilesdir}/systemd.conf +%{_tmpfilesdir}/x11.conf +%{_udevrulesdir}/70-uaccess.rules +%{_udevrulesdir}/71-seat.rules +%{_udevrulesdir}/73-seat-late.rules +%{_udevrulesdir}/99-systemd.rules +%{_unitdir}/after-local.service +%{_unitdir}/autovt@.service +%{_unitdir}/basic.target +%{_unitdir}/blockdev@.target +%{_unitdir}/bluetooth.target +%{_unitdir}/boot-complete.target +%{_unitdir}/console-getty.service +%{_unitdir}/container-getty@.service +%if ! 0%{?bootstrap} +%{_unitdir}/cryptsetup-pre.target +%{_unitdir}/cryptsetup.target +%endif +%{_unitdir}/ctrl-alt-del.target +%{_unitdir}/dbus-org.freedesktop.hostname1.service +%{_unitdir}/dbus-org.freedesktop.locale1.service +%{_unitdir}/dbus-org.freedesktop.login1.service +%{_unitdir}/dbus-org.freedesktop.timedate1.service +%{_unitdir}/debug-shell.service +%{_unitdir}/default.target +%{_unitdir}/dev-hugepages.mount +%{_unitdir}/dev-mqueue.mount +%{_unitdir}/emergency.service +%{_unitdir}/emergency.target +%{_unitdir}/exit.target +%{_unitdir}/final.target +%{_unitdir}/first-boot-complete.target +%{_unitdir}/getty-pre.target +%{_unitdir}/getty.target +%{_unitdir}/getty@.service +%{_unitdir}/graphical.target +%if %{with sysvcompat} +%{_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/halt.target +%{_unitdir}/hibernate.target +%{_unitdir}/hybrid-sleep.target +%{_unitdir}/initrd-cleanup.service +%{_unitdir}/initrd-fs.target +%{_unitdir}/initrd-parse-etc.service +%{_unitdir}/initrd-root-device.target +%if ! 0%{?bootstrap} +%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target +%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target +%endif +%{_unitdir}/initrd-root-fs.target +%{_unitdir}/initrd-switch-root.service +%{_unitdir}/initrd-switch-root.target +%{_unitdir}/initrd-usr-fs.target +%{_unitdir}/initrd.target +%{_unitdir}/kexec.target +%{_unitdir}/local-fs-pre.target +%{_unitdir}/local-fs.target +%{_unitdir}/local-fs.target.wants/tmp.mount +%if %{with sysvcompat} +%{_unitdir}/local-fs.target.wants/var-lock.mount +%{_unitdir}/local-fs.target.wants/var-run.mount +%endif +%{_unitdir}/modprobe@.service +%{_unitdir}/multi-user.target +%{_unitdir}/multi-user.target.wants/after-local.service +%{_unitdir}/multi-user.target.wants/getty.target +%{_unitdir}/multi-user.target.wants/systemd-logind.service +%if %{with sysvcompat} +%{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/multi-user.target.wants/systemd-user-sessions.service +%{_unitdir}/network-online.target +%{_unitdir}/network-pre.target +%{_unitdir}/network.target +%{_unitdir}/nss-lookup.target +%{_unitdir}/nss-user-lookup.target +%{_unitdir}/paths.target +%{_unitdir}/poweroff.target +%{_unitdir}/printer.target +%{_unitdir}/proc-sys-fs-binfmt_misc.automount +%{_unitdir}/proc-sys-fs-binfmt_misc.mount +%{_unitdir}/quotaon.service +%if %{with sysvcompat} +%{_unitdir}/rc-local.service +%endif +%{_unitdir}/reboot.target +%if ! 0%{?bootstrap} +%{_unitdir}/remote-cryptsetup.target +%endif +%{_unitdir}/remote-fs-pre.target +%{_unitdir}/remote-fs.target +%if ! 0%{?bootstrap} +%{_unitdir}/remote-veritysetup.target +%endif +%{_unitdir}/rescue.service +%{_unitdir}/rescue.target +%if %{with sysvcompat} +%{_unitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/rpcbind.target +%if %{with sysvcompat} +%{_unitdir}/runlevel0.target +%{_unitdir}/runlevel1.target +%{_unitdir}/runlevel2.target +%{_unitdir}/runlevel3.target +%{_unitdir}/runlevel4.target +%{_unitdir}/runlevel5.target +%{_unitdir}/runlevel6.target +%endif +%{_unitdir}/serial-getty@.service +%{_unitdir}/shutdown.target +%{_unitdir}/sigpwr.target +%{_unitdir}/sleep.target +%{_unitdir}/slices.target +%{_unitdir}/smartcard.target +%{_unitdir}/sockets.target +%if %{with sysvcompat} +%{_unitdir}/sockets.target.wants/systemd-initctl.socket +%endif +%{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket +%{_unitdir}/sockets.target.wants/systemd-journald.socket +%{_unitdir}/sound.target +%{_unitdir}/suspend-then-hibernate.target +%{_unitdir}/suspend.target +%{_unitdir}/swap.target +%{_unitdir}/sys-fs-fuse-connections.mount +%{_unitdir}/sys-kernel-config.mount +%{_unitdir}/sys-kernel-debug.mount +%{_unitdir}/sys-kernel-tracing.mount +%{_unitdir}/sysinit.target +%if ! 0%{?bootstrap} +%{_unitdir}/sysinit.target.wants/cryptsetup.target +%endif +%{_unitdir}/sysinit.target.wants/dev-hugepages.mount +%{_unitdir}/sysinit.target.wants/dev-mqueue.mount +%{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount +%{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount +%{_unitdir}/sysinit.target.wants/sys-kernel-config.mount +%{_unitdir}/sysinit.target.wants/sys-kernel-debug.mount +%{_unitdir}/sysinit.target.wants/sys-kernel-tracing.mount +%{_unitdir}/sysinit.target.wants/systemd-ask-password-console.path +%{_unitdir}/sysinit.target.wants/systemd-binfmt.service +%if %{with sd_boot} +%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service +%endif +%{_unitdir}/sysinit.target.wants/systemd-firstboot.service +%{_unitdir}/sysinit.target.wants/systemd-journal-catalog-update.service +%{_unitdir}/sysinit.target.wants/systemd-journal-flush.service +%{_unitdir}/sysinit.target.wants/systemd-journald.service +%{_unitdir}/sysinit.target.wants/systemd-machine-id-commit.service +%{_unitdir}/sysinit.target.wants/systemd-modules-load.service +%{_unitdir}/sysinit.target.wants/systemd-random-seed.service +%{_unitdir}/sysinit.target.wants/systemd-sysctl.service +%{_unitdir}/sysinit.target.wants/systemd-sysusers.service +%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service +%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service +%{_unitdir}/sysinit.target.wants/systemd-update-done.service +%{_unitdir}/sysinit.target.wants/systemd-update-utmp.service +%if ! 0%{?bootstrap} +%{_unitdir}/sysinit.target.wants/veritysetup.target +%endif +%{_unitdir}/syslog.socket +%if ! 0%{?bootstrap} +%{_unitdir}/system-systemd\x2dcryptsetup.slice +%endif +%{_unitdir}/system-update-cleanup.service +%{_unitdir}/system-update-pre.target +%{_unitdir}/system-update.target +%{_unitdir}/systemd-ask-password-console.path +%{_unitdir}/systemd-ask-password-console.service +%{_unitdir}/systemd-ask-password-wall.path +%{_unitdir}/systemd-ask-password-wall.service +%{_unitdir}/systemd-backlight@.service +%{_unitdir}/systemd-binfmt.service +%if %{with sd_boot} +%{_unitdir}/systemd-bless-boot.service +%endif +%{_unitdir}/systemd-boot-check-no-failures.service +%if %{with sd_boot} +%{_unitdir}/systemd-boot-system-token.service +%endif +%{_unitdir}/systemd-exit.service +%{_unitdir}/systemd-firstboot.service +%{_unitdir}/systemd-fsck-root.service +%{_unitdir}/systemd-fsck@.service +%{_unitdir}/systemd-halt.service +%{_unitdir}/systemd-hibernate-resume@.service +%{_unitdir}/systemd-hibernate.service +%{_unitdir}/systemd-hostnamed.service +%{_unitdir}/systemd-hybrid-sleep.service +%if %{with sysvcompat} +%{_unitdir}/systemd-initctl.service +%{_unitdir}/systemd-initctl.socket +%endif +%{_unitdir}/systemd-journal-catalog-update.service +%{_unitdir}/systemd-journal-flush.service +%{_unitdir}/systemd-journald-dev-log.socket +%{_unitdir}/systemd-journald-varlink@.socket +%{_unitdir}/systemd-journald.service +%{_unitdir}/systemd-journald.socket +%{_unitdir}/systemd-journald@.service +%{_unitdir}/systemd-journald@.socket +%{_unitdir}/systemd-kexec.service +%{_unitdir}/systemd-localed.service +%{_unitdir}/systemd-logind.service +%{_unitdir}/systemd-machine-id-commit.service +%{_unitdir}/systemd-modules-load.service +%{_unitdir}/systemd-poweroff.service +%{_unitdir}/systemd-quotacheck.service +%{_unitdir}/systemd-random-seed.service +%{_unitdir}/systemd-reboot.service +%{_unitdir}/systemd-remount-fs.service +%{_unitdir}/systemd-rfkill.service +%{_unitdir}/systemd-rfkill.socket +%{_unitdir}/systemd-suspend-then-hibernate.service +%{_unitdir}/systemd-suspend.service +%{_unitdir}/systemd-sysctl.service +%{_unitdir}/systemd-sysext.service +%{_unitdir}/systemd-sysusers.service +%{_unitdir}/systemd-time-wait-sync.service +%{_unitdir}/systemd-timedated.service +%{_unitdir}/systemd-timesyncd.service +%{_unitdir}/systemd-tmpfiles-clean.service +%{_unitdir}/systemd-tmpfiles-clean.timer +%{_unitdir}/systemd-tmpfiles-setup-dev.service +%{_unitdir}/systemd-tmpfiles-setup.service +%{_unitdir}/systemd-update-done.service +%if %{with sysvcompat} +%{_unitdir}/systemd-update-utmp-runlevel.service +%endif +%{_unitdir}/systemd-update-utmp.service +%{_unitdir}/systemd-user-sessions.service +%{_unitdir}/systemd-vconsole-setup.service +%{_unitdir}/systemd-volatile-root.service +%{_unitdir}/time-set.target +%{_unitdir}/time-sync.target +%{_unitdir}/timers.target +%{_unitdir}/timers.target.wants/systemd-tmpfiles-clean.timer +%{_unitdir}/tmp.mount +%{_unitdir}/umount.target +%{_unitdir}/usb-gadget.target +%{_unitdir}/user-.slice.d +%{_unitdir}/user-.slice.d/10-defaults.conf +%{_unitdir}/user-runtime-dir@.service +%{_unitdir}/user.slice +%{_unitdir}/user@.service +%if %{with sysvcompat} +%{_unitdir}/var-lock.mount +%{_unitdir}/var-run.mount +%endif +%if ! 0%{?bootstrap} +%{_unitdir}/veritysetup-pre.target +%{_unitdir}/veritysetup.target +%endif +%if %{with split_usr} +/bin/systemctl +%endif diff --git a/files.udev b/files.udev new file mode 100644 index 00000000..4f75bcc9 --- /dev/null +++ b/files.udev @@ -0,0 +1,126 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%config(noreplace) %{_sysconfdir}/udev/udev.conf +%dir %{_prefix}/lib/udev +%dir %{_sysconfdir}/udev +%dir %{_sysconfdir}/udev/rules.d +%dir %{_systemd_util_dir}/network +%dir %{_udevhwdbdir} +%dir %{_udevrulesdir} +%doc %{_udevhwdbdir}/README +%doc %{_udevrulesdir}/README +%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin +%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation +%{_bindir}/systemd-hwdb +%{_bindir}/udevadm +%if ! 0%{?bootstrap} +%{_datadir}/bash-completion/completions/udevadm +%endif +%{_datadir}/pkgconfig/udev.pc +%if ! 0%{?bootstrap} +%{_datadir}/zsh/site-functions/_udevadm +%endif +%if ! 0%{?bootstrap} +%{_mandir}/man5/udev.conf.5.gz +%{_mandir}/man7/hwdb.7.gz +%{_mandir}/man7/udev.7.gz +%{_mandir}/man8/systemd-hwdb.8.gz +%{_mandir}/man8/systemd-network-generator.8.gz +%{_mandir}/man8/systemd-network-generator.service.8.gz +%{_mandir}/man8/systemd-udev-settle.service.8.gz +%{_mandir}/man8/systemd-udevd-control.socket.8.gz +%{_mandir}/man8/systemd-udevd-kernel.socket.8.gz +%{_mandir}/man8/systemd-udevd.8.gz +%{_mandir}/man8/systemd-udevd.service.8.gz +%{_mandir}/man8/udevadm.8.gz +%endif +%{_prefix}/lib/udev/ata_id +%{_prefix}/lib/udev/cdrom_id +# dmi_memory_id is only relevant on arches with DMI +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_prefix}/lib/udev/dmi_memory_id +%endif +%{_prefix}/lib/udev/fido_id +%{_prefix}/lib/udev/mtd_probe +%{_prefix}/lib/udev/path_id_compat +%{_prefix}/lib/udev/scsi_id +%{_prefix}/lib/udev/v4l_id +%{_systemd_util_dir}/network/99-default.link +%{_systemd_util_dir}/systemd-network-generator +%{_systemd_util_dir}/systemd-udevd +%{_tmpfilesdir}/static-nodes-permissions.conf +%{_udevhwdbdir}/20-OUI.hwdb +%{_udevhwdbdir}/20-acpi-vendor.hwdb +%{_udevhwdbdir}/20-bluetooth-vendor-product.hwdb +%{_udevhwdbdir}/20-dmi-id.hwdb +%{_udevhwdbdir}/20-net-ifname.hwdb +%{_udevhwdbdir}/20-pci-classes.hwdb +%{_udevhwdbdir}/20-pci-vendor-model.hwdb +%{_udevhwdbdir}/20-sdio-classes.hwdb +%{_udevhwdbdir}/20-sdio-vendor-model.hwdb +%{_udevhwdbdir}/20-usb-classes.hwdb +%{_udevhwdbdir}/20-usb-vendor-model.hwdb +%{_udevhwdbdir}/20-vmbus-class.hwdb +%{_udevhwdbdir}/60-autosuspend-chromiumos.hwdb +%{_udevhwdbdir}/60-autosuspend-fingerprint-reader.hwdb +%{_udevhwdbdir}/60-autosuspend.hwdb +%{_udevhwdbdir}/60-evdev.hwdb +%{_udevhwdbdir}/60-input-id.hwdb +%{_udevhwdbdir}/60-keyboard.hwdb +%{_udevhwdbdir}/60-seat.hwdb +%{_udevhwdbdir}/60-sensor.hwdb +%{_udevhwdbdir}/70-joystick.hwdb +%{_udevhwdbdir}/70-mouse.hwdb +%{_udevhwdbdir}/70-pointingstick.hwdb +%{_udevhwdbdir}/70-touchpad.hwdb +%{_udevhwdbdir}/80-ieee1394-unit-function.hwdb +%{_udevrulesdir}/50-udev-default.rules +%{_udevrulesdir}/60-autosuspend.rules +%{_udevrulesdir}/60-block.rules +%{_udevrulesdir}/60-cdrom_id.rules +%{_udevrulesdir}/60-drm.rules +%{_udevrulesdir}/60-evdev.rules +%{_udevrulesdir}/60-fido-id.rules +%{_udevrulesdir}/60-input-id.rules +%{_udevrulesdir}/60-persistent-alsa.rules +%{_udevrulesdir}/60-persistent-input.rules +%{_udevrulesdir}/60-persistent-storage-tape.rules +%{_udevrulesdir}/60-persistent-storage.rules +%{_udevrulesdir}/60-persistent-v4l.rules +%{_udevrulesdir}/60-sensor.rules +%{_udevrulesdir}/60-serial.rules +%{_udevrulesdir}/61-persistent-storage-compat.rules +%{_udevrulesdir}/64-btrfs.rules +%{_udevrulesdir}/70-joystick.rules +%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips +%{_udevrulesdir}/70-memory.rules +%endif +%{_udevrulesdir}/70-mouse.rules +%{_udevrulesdir}/70-power-switch.rules +%{_udevrulesdir}/70-touchpad.rules +%{_udevrulesdir}/75-net-description.rules +%{_udevrulesdir}/75-probe_mtd.rules +%{_udevrulesdir}/78-sound-card.rules +%{_udevrulesdir}/80-drivers.rules +%{_udevrulesdir}/80-net-setup-link.rules +%{_udevrulesdir}/81-net-dhcp.rules +%{_udevrulesdir}/90-vconsole.rules +%{_unitdir}/initrd-udevadm-cleanup-db.service +%{_unitdir}/kmod-static-nodes.service +%{_unitdir}/sockets.target.wants/systemd-udevd-control.socket +%{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket +%{_unitdir}/sysinit.target.wants/kmod-static-nodes.service +%{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service +%{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service +%{_unitdir}/sysinit.target.wants/systemd-udevd.service +%{_unitdir}/systemd-hwdb-update.service +%{_unitdir}/systemd-network-generator.service +%{_unitdir}/systemd-udev-settle.service +%{_unitdir}/systemd-udev-trigger.service +%{_unitdir}/systemd-udevd-control.socket +%{_unitdir}/systemd-udevd-kernel.socket +%{_unitdir}/systemd-udevd.service +%if %{with split_usr} +/sbin/udevadm +%endif diff --git a/systemd-v249.9+suse.75.g3743acbce3.tar.xz b/systemd-v249.9+suse.75.g3743acbce3.tar.xz deleted file mode 100644 index 0adfea70..00000000 --- a/systemd-v249.9+suse.75.g3743acbce3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:64320468ebe2502773e1365b50c369de2520ec4b614c623a4ca1339e26968ec2 -size 7278924 diff --git a/systemd-v249.9+suse.82.g117bd7f14a.tar.xz b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz new file mode 100644 index 00000000..048b7576 --- /dev/null +++ b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:167cad3440fd7babb26317d528842f78fa37573bdaeda29845990dc0986463f0 +size 7280500 diff --git a/systemd.changes b/systemd.changes index 65d3231c..0ab20e79 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,131 @@ +------------------------------------------------------------------- +Fri Feb 4 15:22:43 UTC 2022 - Franck Bui + +- Always create systemd-network system user, even if systemd-networkd is not + installed (bsc#1195559) + +------------------------------------------------------------------- +Wed Feb 2 09:33:14 UTC 2022 - Franck Bui + +- Make more use of %{_unitdir} in files.{systemd,container} + +------------------------------------------------------------------- +Tue Feb 1 09:18:25 UTC 2022 - Franck Bui + +- Installation of libnss_mymachines.so depended on %{bootstrap} but it is + actually installed when %{with machined} is true. + +- Call ldconfig when container subpackage is installed since it ships + nss-mymachines NSS plug-in module. + +------------------------------------------------------------------- +Mon Jan 31 15:52:44 UTC 2022 - Franck Bui + +- Import commit 117bd7f14aa7834d85a4306cd380d292bec04108 + + 1395c74be7 udevadm: cleanup-db: don't delete information for kept db entries (bsc#1194912) + bbafc8092a udevadm: cleanup_dir: use dot_or_dot_dot() + +------------------------------------------------------------------- +Mon Jan 31 14:54:07 UTC 2022 - Franck Bui + +- Drop 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch + 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch + + Given the fact that Factory no more ship SysV init scripts since several + months, only scripts coming from 3rd party applications should remain which + are unlikely to rely on the SUSE specifities implemented by these + patches. This change was announced on the Factory mailing list: + + https://lists.opensuse.org/archives/list/factory@lists.opensuse.org/thread/3ERUP5ZZJ6PPA36L3HVN46BH6U6JL74O/ + +------------------------------------------------------------------- +Mon Jan 31 11:37:23 UTC 2022 - Franck Bui + +- Import commit 885e0b9126bd2cf1e3f6b147c45ec58a5550c75c + + 41334be59e meson: minor cleanup + 3db0c28462 sysusers: split up systemd.conf + +- Drop 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch (bsc#1195153) + + Since v241, the patch isn't useful anymore because resolved is no more able to + create /etc/resolv.conf symlink by itself,it runs as 'systemd-resolve' + user. The symlink is now handled by a tmpfiles config file which is only + installed when systemd-resolved is. The tmpfiles config file has currently a + lower priority than the one shipped by netconfig. + +------------------------------------------------------------------- +Mon Jan 31 10:19:23 UTC 2022 - Franck Bui + +- Make use of %ldconfig_scriptlets + +------------------------------------------------------------------- +Fri Jan 28 16:04:36 UTC 2022 - Franck Bui + +- Merge nss-resolved and nss-mymachines NSS plug-in modules into systemd-network + and systemd-container respectively. + + These modules are plug-in modules hence the shared library packaging policy + doesn't apply for them. Moreover they're pretty useless alone without their + respective systemd services, Hence let's reduce the number of sub-packages as + the list keeps increasing. + +------------------------------------------------------------------- +Thu Jan 27 10:50:50 UTC 2022 - Franck Bui + +- Merge libudev-devel into systemd-devel + +------------------------------------------------------------------- +Thu Jan 27 07:50:07 UTC 2022 - Franck Bui + +- Make sure that libopenssl-devel is installed when building resolved. Openssl + was implictly pulled in by systemd-experimental subpackage but could be + missing if the build of this subpackage was disabled. + +------------------------------------------------------------------- +Wed Jan 26 17:34:28 UTC 2022 - Franck Bui + +- resolved: disable fallback DNS servers and fail when no DNS server info could + be obtained from the links. It's better to let the sysadmin know that + something is likely misconfigured rather than silently handing over the DNS + queries to Google or Cloudflare. + +------------------------------------------------------------------- +Wed Jan 26 15:20:57 UTC 2022 - Franck Bui + +- resolved: disable DNSSEC until the following issue is solved: + https://github.com/systemd/systemd/issues/10579 + +- Replace '%setup+%autopatch' with '%autosetup' + +------------------------------------------------------------------- +Mon Jan 24 15:51:07 UTC 2022 - Franck Bui + +- systemd.spec: explicitely list all files for each main (sub) packages + + Using glob patterns in %files section to reduce the number of listed files was + error-prone as some introduced files could silently be placed in the wrong + subpackage. The sections were also hard to read and many files needed to be + excluded from the main package making the point of glob pattern usage moot. + + systemd, udev, systemd-container and systemd-network packages have now their + list of files described in a dedicated file. The lists are kept sorted to make + them easy to parse. The size of the files, especially the one for the main + package, is still reasonable and much easier to read now. + + During this rework, a couple of cleanups happened: more use of + %{_systemd_util_dir}, some files was incorrectly owned by the main package and + have been moved to the correct sub-package, etc... + + Note: the rest of the subpackages might be addressed later but let's find how + it goes for now. + +------------------------------------------------------------------- +Wed Jan 19 15:34:05 UTC 2022 - Franck Bui + +- Move the whole content of /usr/share/doc/packages/systemd in doc subpackage + ------------------------------------------------------------------- Wed Jan 19 14:25:46 UTC 2022 - Franck Bui @@ -614,6 +742,9 @@ Mon May 10 13:12:56 UTC 2021 - Franck Bui - Import commit 6f5c11b28f5739b901390f22c2bf4c003cadedaa (merge of v248.2) + 2c8ec0095e udev/net_id: don't generate slot based names if multiple devices might claim the same slot (bsc#1192637) + [...] + For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/e5f93c9d2e9e26dd0dff430c4c072a547357ae7d...6f5c11b28f5739b901390f22c2bf4c003cadedaa diff --git a/systemd.spec b/systemd.spec index 1dbeb761..4ef6b10e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,5 +1,5 @@ # -# spec file for package systemd +# spec file # # Copyright (c) 2022 SUSE LLC # @@ -32,7 +32,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.75.g3743acbce3 +%define suse_version +suse.82.g117bd7f14a %define _testsuitedir /usr/lib/systemd/tests %if 0%{?bootstrap} @@ -159,12 +159,12 @@ Requires(post): pam-config >= 0.79-5 %endif %if 0%{?bootstrap} -Conflicts: systemd Conflicts: kiwi +Conflicts: systemd %endif -Conflicts: sysvinit Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 +Conflicts: sysvinit Provides: systemd-logger = %{version}-%{release} Obsoletes: systemd-logger < %{version}-%{release} Provides: systemd-analyze = %{version}-%{release} @@ -187,22 +187,25 @@ Source100: scripts-systemd-fix-machines-btrfs-subvol.sh Source101: scripts-systemd-upgrade-from-pre-210.sh Source102: scripts-systemd-migrate-sysconfig-i18n.sh -# Patches listed below are SUSE specific and should be kept at its -# minimum. We try hard to push our changes to upstream but sometimes -# they are only relevant for SUSE distros. Special rewards for those -# who will manage to get rid of one of them ! +Source200: files.systemd +Source201: files.udev +Source202: files.container +Source203: files.network +Source204: files.devel + +# Patches listed below are openSUSE specific and should be kept at its +# minimum. We try hard to push our changes to upstream but sometimes they are +# only relevant for SUSE distros. Special rewards for those who will manage to +# get rid of one of them ! 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 -Patch6: 0006-sysv-generator-add-back-support-for-SysV-scripts-for.patch Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch -Patch9: 0009-sysv-add-back-support-for-all-virtual-facility-and-f.patch Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch -Patch12: 0012-resolved-create-etc-resolv.conf-symlink-at-runtime.patch -Patch13: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch +Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.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 @@ -221,29 +224,36 @@ maintains mount and automount points and implements an elaborate transactional dependency-based service control logic. It can work as a drop-in replacement for sysvinit. -%if !0%{?bootstrap} %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later Supplements: (systemd and patterns-base-documentation) +%if 0%{?bootstrap} +Provides: systemd-doc = %{version}-%{release} +Conflicts: systemd-doc +%endif %description doc The HTML documentation for systemd. -# /bootstrap -%endif - %package devel -Summary: Development headers for systemd +Summary: Development files for libsystemd and libudev License: LGPL-2.1-or-later Requires: libsystemd0%{?mini} = %{version}-%{release} +Requires: libudev%{?mini}1 = %{version}-%{release} Requires: systemd-rpm-macros +Provides: libudev%{?mini}-devel = %{version}-%{release} +Obsoletes: libudev%{?mini}-devel < %{version}-%{release} %if 0%{?bootstrap} +Provides: systemd-devel = %{version}-%{release} Conflicts: systemd-devel +Provides: libudev-devel = %{version}-%{release} +Conflicts: libudev-devel %endif %description devel -Development headers and auxiliary files for developing applications for systemd. +Development headers and files for libsystemd and libudev libraries for +developing and building applications linking to these libraries. %package sysvinit Summary: System V init tools @@ -292,22 +302,21 @@ License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html Requires: %{name} = %{version}-%{release} %systemd_requires +Requires: filesystem Requires: kmod Requires: system-group-hardware Requires: group(kvm) Requires(post): sed Requires(post): coreutils -Requires(postun): coreutils +Requires(postun):coreutils +Conflicts: ConsoleKit < 0.4.1 +Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Conflicts: dracut < 044.1 Conflicts: util-linux < 2.16 -Conflicts: ConsoleKit < 0.4.1 -Requires: filesystem %if 0%{?bootstrap} Provides: udev = %{version}-%{release} -Conflicts: libudev1 Conflicts: udev # avoid kiwi picking it for bootstrap Requires: this-is-only-for-build-envs @@ -324,8 +333,8 @@ call tools to initialize a device, or load needed kernel modules. Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later %if 0%{?bootstrap} -Conflicts: libudev1 Conflicts: kiwi +Conflicts: libudev1 # avoid kiwi picking it for bootstrap Requires: this-is-only-for-build-envs %endif @@ -334,20 +343,6 @@ Requires: this-is-only-for-build-envs This package contains the dynamic library libudev, which provides access to udev device information -%package -n libudev%{?mini}-devel -Summary: Development files for libudev -License: LGPL-2.1-or-later -Requires: libudev%{?mini}1 = %{version}-%{release} -%if 0%{?bootstrap} -Provides: libudev-devel = %{version}-%{version} -Conflicts: libudev1 = %{version} -Conflicts: libudev-devel -%endif - -%description -n libudev%{?mini}-devel -This package contains the development files for the library libudev, a -dynamic library, which provides access to udev device information. - %if %{with coredump} %package coredump Summary: Systemd tools for coredump management @@ -367,33 +362,61 @@ Summary: Systemd tools for container management License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires +Obsoletes: nss-mymachines < %{version}-%{release} +Provides: nss-mymachines = %{version}-%{release} +Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} Conflicts: systemd-container +Provides: systemd-container = %{version}-%{release} %endif %description container Systemd tools to spawn and manage containers and virtual machines. -This package contains systemd-nspawn, machinectl, systemd-machined, -and systemd-importd. +In addition, it also contains a plugin for the Name Service Switch (NSS), +providing host name resolution for all local containers and virtual machines +using network namespacing and registered with systemd-machined. It also maps +UID/GIDs ranges used by containers to useful names. + +To activate this NSS module, you will need to include it in /etc/nsswitch.conf, +see nss-mymachines(8) manpage for more details. %if %{with networkd} || %{with resolved} %package network -Summary: Systemd tools for networkd and resolved +Summary: systemd network and Network Name Resolution managers License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} %systemd_requires # This Recommends because some symbols of libidn2 are dlopen()ed by resolved Recommends: pkgconfig(libidn2) BuildRequires: pkgconfig(libidn2) +BuildRequires: pkgconfig(openssl) +Obsoletes: nss-resolve < %{version}-%{release} +Provides: nss-resolve = %{version}-%{release} Provides: systemd:/usr/lib/systemd/systemd-networkd Provides: systemd:/usr/lib/systemd/systemd-resolved %description network -Systemd tools to manage network settings using networkd and -resolver tools for resolved +systemd-networkd is a system service that manages networks. It detects and +configures network devices as they appear, as well as manages network addresses +and routes for any link for which it finds a .network file, see +systemd.network(5). It can also create virtual network devices based on their +description given by systemd.netdev(5) files. It may be controlle by +networkctl(1). +systemd-resolved is a system service that provides network name resolution to +local applications. It implements a caching and validating DNS/DNSSEC stub +resolver, as well as an LLMNR and MulticastDNS resolver and responder. It may be +controlled by resolvectl(1). + +Addtionally, this package also contains a plug-in module for the Name Service +Switch (NSS), which enables hostname resolutions by contacting +systemd-resolved(8). It replaces the nss-dns plug-in module that traditionally +resolves hostnames via DNS. + +To activate this NSS module, you will need to include it in /etc/nsswitch.conf, +see nss-resolve(8) manpage for more details. %endif %if %{with portabled} @@ -442,38 +465,6 @@ To activate this NSS module, you will need to include it in /etc/nsswitch.conf, see nss-hostname(8) manpage for more details. %endif -%if %{with resolved} -%package -n nss-resolve -Summary: Plugin for local hostname resolution via systemd-resolved -License: LGPL-2.1-or-later -Requires: %{name}-network = %{version}-%{release} - -%description -n nss-resolve -This package contains a plug-in module for the Name Service Switch -(NSS), which enables host name resolutions via the systemd-resolved(8) -local network name resolution service. It replaces the nss-dns plug-in -module that traditionally resolves hostnames via DNS. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-resolve(8) manpage for more details. -%endif - -%if %{with machined} -%package -n nss-mymachines -Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later - -%description -n nss-mymachines -This package contains a plugin for the Name Service Switch (NSS), -providing host name resolution for all local containers and virtual -machines registered with systemd-machined to their respective IP -addresses. It also maps UID/GIDs ranges used by containers to useful -names. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-mymachines(8) manpage for more details. -%endif - %if %{with journal_remote} %package journal-remote Summary: Gateway for serving journal events over the network using HTTP @@ -505,11 +496,14 @@ Recommends: dosfstools # host and install them in the image, see install_missing_libraries() # for details. %if %{with resolved} -Requires: libidn2 pkgconfig(libidn2) +Requires: libidn2 +Requires: pkgconfig(libidn2) %endif %if %{with experimental} -Requires: libpwquality1 pkgconfig(pwquality) -Requires: libqrencode4 pkgconfig(libqrencode) +Requires: libpwquality1 +Requires: libqrencode4 +Requires: pkgconfig(libqrencode) +Requires: pkgconfig(pwquality) %endif Requires: %{name} = %{version}-%{release} Requires: attr @@ -518,6 +512,10 @@ Requires: busybox-static Requires: cryptsetup Requires: dosfstools Requires: libcap-progs +Requires: libfido2 +Requires: libtss2-esys0 +Requires: libtss2-mu0 +Requires: libtss2-rc0 Requires: lz4 Requires: make Requires: netcat @@ -526,10 +524,10 @@ Requires: quota Requires: socat Requires: squashfs Requires: systemd-container -Requires: libfido2 pkgconfig(libfido2) -Requires: libtss2-esys0 pkgconfig(tss2-esys) -Requires: libtss2-mu0 pkgconfig(tss2-mu) -Requires: libtss2-rc0 pkgconfig(tss2-rc) +Requires: pkgconfig(libfido2) +Requires: pkgconfig(tss2-esys) +Requires: pkgconfig(tss2-mu) +Requires: pkgconfig(tss2-rc) %if %{with coredump} Requires: systemd-coredump %endif @@ -611,11 +609,9 @@ Have fun with these services at your own risk. %endif %prep -%setup -q -n systemd-v%{version}%{suse_version} -%autopatch -p1 +%autosetup -p1 -n systemd-v%{version}%{suse_version} %build -# keep split-usr until all packages have moved their systemd rules to /usr %meson \ -Dmode=release \ -Dversion-tag=%{version}%{suse_version} \ @@ -657,6 +653,8 @@ Have fun with these services at your own risk. -Duserdb=false \ %endif %if 0%{?bootstrap} + -Dbashcompletiondir=no \ + -Dzshcompletiondir=no \ -Dtranslations=false \ -Dnss-myhostname=false \ -Dnss-systemd=false \ @@ -692,6 +690,10 @@ Have fun with these services at your own risk. %endif %if %{without resolved} -Dresolve=false \ +%else + -Ddns-servers='' \ + -Ddefault-dnssec=no \ + -Ddns-over-tls=openssl \ %endif %if %{without sysvcompat} -Dsysvinit-path= \ @@ -726,8 +728,8 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1* mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated -install -m0755 -D %{SOURCE3} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-convert -install -m0755 -D %{SOURCE4} %{buildroot}/%{_prefix}/lib/systemd/systemd-sysv-install +install -m0755 -D %{SOURCE3} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-convert +install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install %endif mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network @@ -735,10 +737,12 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn # Package the scripts used to fix all packaging issues. Also drop the # "scripts-{systemd/udev}" prefix which is used because osc doesn't -# allow directory structure... -for s in %{SOURCE100} %{SOURCE101} %{SOURCE102}; do - install -m0755 -D $s %{buildroot}%{_prefix}/lib/systemd/scripts/${s#*/scripts-systemd-} -done +# allow directories in the workspace... +%if %{with machined} +install -m0755 -D %{SOURCE100} %{buildroot}%{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh +%endif +install -m0755 -D %{SOURCE101} %{buildroot}%{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh +install -m0755 -D %{SOURCE102} %{buildroot}%{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %if %{with split_usr} mkdir -p %{buildroot}/{bin,sbin} @@ -813,10 +817,15 @@ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/ mkdir -p %{buildroot}%{_unitdir}/basic.target.wants mkdir -p %{buildroot}%{_unitdir}/default.target.wants mkdir -p %{buildroot}%{_unitdir}/dbus.target.wants +mkdir -p %{buildroot}%{_unitdir}/graphical.target.wants mkdir -p %{buildroot}%{_unitdir}/halt.target.wants +mkdir -p %{buildroot}%{_unitdir}/initrd-root-device.target.wants +mkdir -p %{buildroot}%{_unitdir}/initrd-root-fs.target.wants mkdir -p %{buildroot}%{_unitdir}/kexec.target.wants mkdir -p %{buildroot}%{_unitdir}/poweroff.target.wants mkdir -p %{buildroot}%{_unitdir}/reboot.target.wants +mkdir -p %{buildroot}%{_unitdir}/remote-fs.target.wants +mkdir -p %{buildroot}%{_unitdir}/rescue.target.wants mkdir -p %{buildroot}%{_unitdir}/shutdown.target.wants # Make sure the generator directories are created and properly owned. @@ -1100,6 +1109,7 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %post container %tmpfiles_create systemd-nspawn.conf %if %{with machined} +%ldconfig if [ $1 -gt 1 ]; then # Convert /var/lib/machines subvolume to make it suitable for # rollbacks, if needed. See bsc#992573. The installer has been fixed @@ -1118,24 +1128,14 @@ if [ $1 -gt 1 ]; then # shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi + +%postun container +%ldconfig %endif %if ! 0%{?bootstrap} -%post -n nss-myhostname -p /sbin/ldconfig -%postun -n nss-myhostname -p /sbin/ldconfig - -%post -n nss-systemd -p /sbin/ldconfig -%postun -n nss-systemd -p /sbin/ldconfig -%endif - -%if %{with resolved} -%post -n nss-resolve -p /sbin/ldconfig -%postun -n nss-resolve -p /sbin/ldconfig -%endif - -%if %{with machined} -%post -n nss-mymachines -p /sbin/ldconfig -%postun -n nss-mymachines -p /sbin/ldconfig +%ldconfig_scriptlets -n nss-myhostname +%ldconfig_scriptlets -n nss-systemd %endif %if %{with journal_remote} @@ -1178,6 +1178,7 @@ fi %service_add_post systemd-networkd-wait-online.service %endif %if %{with resolved} +%ldconfig %service_add_post systemd-resolved.service %endif @@ -1196,6 +1197,7 @@ fi %service_del_postun systemd-networkd-wait-online.service %endif %if %{with resolved} +%ldconfig %service_del_postun systemd-resolved.service %endif %endif @@ -1240,460 +1242,74 @@ fi %files %defattr(-,root,root) -%license LICENSE* -%if %{with sd_boot} -%{_bindir}/bootctl -%endif -%{_bindir}/busctl -%{_bindir}/hostnamectl -%{_bindir}/kernel-install -%{_bindir}/localectl -%{_bindir}/systemctl -%{_bindir}/systemd-analyze -%if ! 0%{?bootstrap} -%{_bindir}/systemd-cryptenroll -%endif -%{_bindir}/systemd-delta -%{_bindir}/systemd-dissect -%{_bindir}/systemd-escape -%{_bindir}/systemd-firstboot -%{_bindir}/systemd-id128 -%{_bindir}/systemd-path -%{_bindir}/systemd-sysusers -%{_bindir}/systemd-mount -%{_bindir}/systemd-umount -%{_bindir}/systemd-notify -%{_bindir}/systemd-run -%{_bindir}/systemd-sysext -%{_bindir}/journalctl -%{_bindir}/systemd-ask-password -%{_bindir}/loginctl -%{_bindir}/systemd-inhibit -%{_bindir}/systemd-tty-ask-password-agent -%{_bindir}/systemd-tmpfiles -%{_bindir}/systemd-machine-id-setup -%{_bindir}/systemd-socket-activate -%{_bindir}/systemd-stdio-bridge -%{_bindir}/systemd-detect-virt -%{_bindir}/timedatectl -%{_bindir}/systemd-cgls -%{_bindir}/systemd-cgtop -%{_bindir}/systemd-cat -%if %{with split_usr} -/bin/systemctl -%endif -%dir %{_prefix}/lib/kernel -%dir %{_prefix}/lib/kernel/install.d -%{_prefix}/lib/kernel/install.d/00-entry-directory.install -%{_prefix}/lib/kernel/install.d/50-depmod.install -%{_prefix}/lib/kernel/install.d/90-loaderentry.install -%dir %{_prefix}/lib/systemd -%dir %{_prefix}/lib/systemd/network -%dir %{_unitdir} -%{_userunitdir} -%exclude %{_prefix}/lib/systemd/systemd-network-generator -%exclude %{_unitdir}/systemd-network-generator.service -%if %{with coredump} -%exclude %{_prefix}/lib/systemd/systemd-coredump -%exclude %{_unitdir}/systemd-coredump* -%exclude %{_unitdir}/sockets.target.wants/systemd-coredump.socket -%endif -%if %{with journal_remote} -%exclude %{_unitdir}/systemd-journal-gatewayd.* -%exclude %{_unitdir}/systemd-journal-remote.* -%exclude %{_unitdir}/systemd-journal-upload.* -%exclude %{_prefix}/lib/systemd/systemd-journal-gatewayd -%exclude %{_prefix}/lib/systemd/systemd-journal-remote -%exclude %{_prefix}/lib/systemd/systemd-journal-upload -%exclude %{_datadir}/systemd/gatewayd -%endif -%exclude %{_prefix}/lib/systemd/systemd-udevd -%exclude %{_unitdir}/systemd-udev*.* -%exclude %{_unitdir}/systemd-hwdb*.* -%exclude %{_unitdir}/*.target.wants/systemd-udev*.* -%exclude %{_unitdir}/*.target.wants/systemd-hwdb*.* -%exclude %{_unitdir}/initrd-udevadm-cleanup-db.service -%exclude %{_unitdir}/kmod-static-nodes.service -%exclude %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service -%exclude %{_tmpfilesdir}/static-nodes-permissions.conf -%exclude %{_unitdir}/systemd-nspawn@.service -%if %{with machined} -%exclude %{_prefix}/lib/systemd/systemd-machined -%exclude %{_unitdir}/systemd-machined.service -%exclude %{_unitdir}/dbus-org.freedesktop.machine1.service -%exclude %{_unitdir}/var-lib-machines.mount -%exclude %{_unitdir}/machine.slice -%exclude %{_unitdir}/machines.target.wants -%exclude %{_unitdir}/*.target.wants/var-lib-machines.mount -%endif -%if %{with importd} -%exclude %{_prefix}/lib/systemd/systemd-import* -%exclude %{_prefix}/lib/systemd/systemd-pull -%exclude %{_prefix}/lib/systemd/import-pubring.gpg -%exclude %{_unitdir}/systemd-importd.service -%exclude %{_unitdir}/dbus-org.freedesktop.import1.service -%endif -%if %{with networkd} -%exclude %{_prefix}/lib/systemd/systemd-networkd -%exclude %{_prefix}/lib/systemd/systemd-networkd-wait-online -%exclude %{_unitdir}/systemd-networkd.service -%exclude %{_unitdir}/systemd-networkd.socket -%exclude %{_unitdir}/systemd-networkd-wait-online.service -%exclude %{_prefix}/lib/systemd/systemd-resolved -%exclude %{_unitdir}/systemd-resolved.service -%endif -%if %{with portabled} -%exclude %{_prefix}/lib/systemd/systemd-portabled -%exclude %{_prefix}/lib/systemd/portable -%exclude %{_unitdir}/systemd-portabled.service -%exclude %{_unitdir}/dbus-org.freedesktop.portable1.service -%exclude %{_tmpfilesdir}/portables.conf -%endif -%if %{with experimental} -%exclude %{_prefix}/lib/systemd/systemd-pstore -%exclude %{_unitdir}/systemd-pstore.service -%exclude %{_tmpfilesdir}/systemd-pstore.conf -%exclude %{_unitdir}/systemd-repart.service -%exclude %{_unitdir}/initrd-root-fs.target.wants/systemd-repart.service -%exclude %{_unitdir}/sysinit.target.wants/systemd-repart.service -%exclude %{_prefix}/lib/systemd/systemd-userwork -%exclude %{_prefix}/lib/systemd/systemd-userdbd -%exclude %{_unitdir}/systemd-userdbd.service -%exclude %{_unitdir}/systemd-userdbd.socket -%exclude %{_prefix}/lib/systemd/systemd-homed -%exclude %{_prefix}/lib/systemd/systemd-homework -%exclude %{_unitdir}/systemd-homed-activate.service -%exclude %{_unitdir}/systemd-homed.service +%include %{SOURCE200} + +%files -n udev%{?mini} +%defattr(-,root,root) +%include %{SOURCE201} + +%files container +%defattr(-,root,root) +%include %{SOURCE202} + +%if %{with networkd} || %{with resolved} +%files network +%defattr(-,root,root) +%include %{SOURCE203} %endif -%{_unitdir}/*.automount -%{_unitdir}/*.service -%{_unitdir}/*.slice -%{_unitdir}/*.target -%{_unitdir}/*.mount -%{_unitdir}/*.timer -%{_unitdir}/*.socket -%{_unitdir}/*.wants -%{_unitdir}/*.path - -%{_unitdir}/user-.slice.d/ - -%{_prefix}/lib/systemd/systemd-* -%{_prefix}/lib/systemd/systemd -%{_prefix}/lib/systemd/libsystemd-shared-*.so -%{_prefix}/lib/systemd/scripts -%exclude %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh -%dir %{_journalcatalogdir} -%{_journalcatalogdir}/systemd.catalog -%{_journalcatalogdir}/systemd.*.catalog -%{_presetdir} -%{_userpresetdir} -%{_systemdgeneratordir} -%{_systemdusergeneratordir} -%{_systemd_system_env_generator_dir} -%{_systemd_user_env_generator_dir} -%dir %{_ntpunitsdir} -%{_ntpunitsdir}/80-systemd-timesync.list -%dir %{_prefix}/lib/systemd/system-shutdown/ -%dir %{_prefix}/lib/systemd/system-sleep/ - -%{_pam_moduledir}/pam_systemd.so - -%if %{with sd_boot} -%dir %{_prefix}/lib/systemd/boot -%dir %{_prefix}/lib/systemd/boot/efi -%{_prefix}/lib/systemd/boot/efi/*.efi -%{_prefix}/lib/systemd/boot/efi/*.stub -%endif - -%dir %{_sysconfdir}/modules-load.d -%{_modulesloaddir} - -%dir %{_sysusersdir} -%doc %{_sysusersdir}/README -%{_sysusersdir}/systemd.conf - -%dir %{_sysconfdir}/tmpfiles.d -%{_tmpfilesdir}/ -%exclude %{_tmpfilesdir}/systemd-nspawn.conf - -%{_environmentdir}/ - -%dir %{_binfmtdir} -%dir %{_sysconfdir}/binfmt.d - -%dir %{_sysctldir} -%dir %{_sysconfdir}/sysctl.d -%doc %{_sysctldir}/README -%{_sysctldir}/99-sysctl.conf - -%dir %{_sysconfdir}/X11/xorg.conf.d -%dir %{_sysconfdir}/systemd -%dir %{_sysconfdir}/systemd/network -%dir %{_sysconfdir}/systemd/system -%dir %{_sysconfdir}/systemd/user -%dir %{_sysconfdir}/xdg/systemd -%{_sysconfdir}/xdg/systemd/user - -%dir %{_distconfdir}/X11/xinit -%dir %{_distconfdir}/X11/xinit/xinitrc.d -%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh - -%{_pam_vendordir}/systemd-user - -%config(noreplace) %{_sysconfdir}/systemd/journald.conf -%config(noreplace) %{_sysconfdir}/systemd/logind.conf -%config(noreplace) %{_sysconfdir}/systemd/sleep.conf -%config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf -%config(noreplace) %{_sysconfdir}/systemd/user.conf - -%dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/services -%dir %{_datadir}/dbus-1/system.d -%dir %{_datadir}/dbus-1/system-services - -%{_datadir}/dbus-1/services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.login1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.systemd1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.timedate1.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.timesync1.conf - -# FIXME: why do we have to own this dir ? -%dir %{_modprobedir} -%doc %{_modprobedir}/README -%{_modprobedir}/systemd.conf - -# Some files created at runtime. -%ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal/ -%ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf -%ghost %config(noreplace) %{_sysconfdir}/vconsole.conf -%ghost %config(noreplace) %{_sysconfdir}/locale.conf -%ghost %config(noreplace) %{_sysconfdir}/machine-info -%ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id - -%{_datadir}/systemd -%{_datadir}/factory - -%{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.login1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.timedate1.service -%{_datadir}/dbus-1/system-services/org.freedesktop.timesync1.service - -%dir %{_datadir}/polkit-1 -%dir %{_datadir}/polkit-1/actions -%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.hostname1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.locale1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy -%{_datadir}/polkit-1/actions/org.freedesktop.login1.policy - -%if ! 0%{?bootstrap} -%{_mandir}/man1/[a-rt-z]*ctl.1* -%{_mandir}/man1/systemc*.1* -%{_mandir}/man1/systemd*.1* -%{_mandir}/man5/[a-tv-z]* -%{_mandir}/man5/user* -%{_mandir}/man7/[bdfks]* -%{_mandir}/man8/kern* -%{_mandir}/man8/pam_* -%{_mandir}/man8/rc-local.* -%{_mandir}/man8/systemd-[a-gik-tvx]* -%{_mandir}/man8/systemd-h[aioy]* -%{_mandir}/man8/systemd-journald* -%{_mandir}/man8/systemd-u[ps]* -%{_mandir}/man8/30-systemd-environment-d-generator.* -%exclude %{_mandir}/man8/systemd-network-generator.* -%if %{with coredump} -%exclude %{_mandir}/man1/coredumpctl* -%exclude %{_mandir}/man5/coredump.conf* -%exclude %{_mandir}/man8/systemd-coredump* -%endif -%exclude %{_mandir}/man*/*nspawn* -%if %{with machined} -%exclude %{_mandir}/man*/machinectl* -%exclude %{_mandir}/man*/systemd-machined* -%endif -%if %{with importd} -%exclude %{_mandir}/man*/systemd-importd* -%endif -%if %{with journal_remote} -%exclude %{_mandir}/man5/journal-remote.conf* -%exclude %{_mandir}/man5/journal-upload.conf* -%endif -%if %{with portabled} -%exclude %{_mandir}/man*/portablectl* -%exclude %{_mandir}/man*/systemd-portabled* -%endif -%if %{with experimental} -%exclude %{_mandir}/man*/*pstore* -%exclude %{_mandir}/man*/*repart* -%exclude %{_mandir}/man*/userdbctl* -%exclude %{_mandir}/man*/systemd-userdbd* -%exclude %{_mandir}/man*/*homectl* -%exclude %{_mandir}/man*/*homed* -%exclude %{_mandir}/man*/org.freedesktop.home1* -%exclude %{_mandir}/man*/pam_systemd_home* -%exclude %{_datadir}/bash-completion/completions/homectl -%endif -%endif - -%{_docdir}/systemd -%exclude %{_docdir}/systemd/html - -%{_udevrulesdir}/70-uaccess.rules -%{_udevrulesdir}/71-seat.rules -%{_udevrulesdir}/73-seat-late.rules -%{_udevrulesdir}/99-systemd.rules -%dir %{_localstatedir}/lib/systemd -%dir %{_localstatedir}/lib/systemd/catalog -%if %{with sysvcompat} -%dir %{_localstatedir}/lib/systemd/sysv-convert -%dir %{_localstatedir}/lib/systemd/migrated -%endif -%ghost %{_localstatedir}/lib/systemd/catalog/database -%ghost %{_localstatedir}/lib/systemd/backlight -%ghost %{_localstatedir}/lib/systemd/i18n-migrated -%ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed - -%dir %{_datadir}/bash-completion -%dir %{_datadir}/bash-completion/completions -%{_datadir}/bash-completion/completions/* - -%dir %{_datadir}/zsh -%dir %{_datadir}/zsh/site-functions -%{_datadir}/zsh/site-functions/* -%{_datadir}/pkgconfig/systemd.pc - -%if ! 0%{?bootstrap} %files doc %defattr(-,root,root,-) -%dir %{_docdir}/systemd -%{_docdir}/systemd/html -%endif +%{_docdir}/systemd/ %files devel %defattr(-,root,root,-) -%{_libdir}/libsystemd.so -%{_libdir}/pkgconfig/libsystemd.pc -%{_includedir}/systemd/ -%if ! 0%{?bootstrap} -%{_mandir}/man3/SD*.3* -%{_mandir}/man3/sd*.3* -%endif +%license LICENSE.LGPL2.1 +%include %{SOURCE204} %files sysvinit %defattr(-,root,root,-) %if %{with split_usr} -/sbin/init -/sbin/reboot /sbin/halt -/sbin/shutdown +/sbin/init /sbin/poweroff +/sbin/reboot +/sbin/shutdown %if %{with sysvcompat} /sbin/telinit /sbin/runlevel %endif %endif -%{_sbindir}/init -%{_sbindir}/reboot %{_sbindir}/halt -%{_sbindir}/shutdown +%{_sbindir}/init %{_sbindir}/poweroff +%{_sbindir}/reboot +%{_sbindir}/shutdown %if %{with sysvcompat} -%{_sbindir}/telinit %{_sbindir}/runlevel +%{_sbindir}/telinit %endif %if ! 0%{?bootstrap} -%{_mandir}/man1/init.1* -%{_mandir}/man8/halt.8* -%{_mandir}/man8/reboot.8* -%{_mandir}/man8/shutdown.8* -%{_mandir}/man8/poweroff.8* -%{_mandir}/man8/telinit.8* -%{_mandir}/man8/runlevel.8* -%endif - -%files -n udev%{?mini} -%defattr(-,root,root) -%{_bindir}/udevadm -%{_bindir}/systemd-hwdb -%if %{with split_usr} -/sbin/udevadm -%endif -%dir %{_prefix}/lib/udev/ -%{_prefix}/lib/udev/ata_id -%{_prefix}/lib/udev/cdrom_id -# dmi_memory_id is only relevant on arches with DMI -%ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips -%{_prefix}/lib/udev/dmi_memory_id -%endif -%{_prefix}/lib/udev/fido_id -%{_prefix}/lib/udev/mtd_probe -%{_prefix}/lib/udev/path_id_compat -%{_prefix}/lib/udev/scsi_id -%{_prefix}/lib/udev/v4l_id -%ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation -%{_prefix}/lib/systemd/systemd-udevd -%{_prefix}/lib/systemd/systemd-network-generator -%dir %{_udevrulesdir}/ -%doc %{_udevrulesdir}/README -%exclude %{_udevrulesdir}/70-uaccess.rules -%exclude %{_udevrulesdir}/71-seat.rules -%exclude %{_udevrulesdir}/73-seat-late.rules -%exclude %{_udevrulesdir}/99-systemd.rules -%{_udevrulesdir}/*.rules -%{_udevhwdbdir}/ -%dir %{_sysconfdir}/udev/ -%dir %{_sysconfdir}/udev/rules.d/ -%ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin -%config(noreplace) %{_sysconfdir}/udev/udev.conf -%dir %{_unitdir} -%{_unitdir}/kmod-static-nodes.service -%{_unitdir}/sysinit.target.wants/kmod-static-nodes.service -%{_tmpfilesdir}/static-nodes-permissions.conf -%{_unitdir}/systemd-udev*.service -%{_unitdir}/systemd-udevd*.socket -%{_unitdir}/systemd-hwdb*.* -%{_unitdir}/initrd-udevadm-cleanup-db.service -%{_unitdir}/systemd-network-generator.service -%dir %{_unitdir}/sysinit.target.wants -%{_unitdir}/sysinit.target.wants/systemd-udev*.service -%dir %{_unitdir}/sockets.target.wants -%{_unitdir}/sockets.target.wants/systemd-udev*.socket -%{_unitdir}/*.target.wants/systemd-hwdb*.* -%{_prefix}/lib/systemd/network/99-default.link -%{_datadir}/pkgconfig/udev.pc -%if ! 0%{?bootstrap} -%{_mandir}/man5/udev* -%{_mandir}/man7/hwdb* -%{_mandir}/man7/udev* -%{_mandir}/man8/systemd-hwdb* -%{_mandir}/man8/systemd-udev* -%{_mandir}/man8/udev* -%{_mandir}/man8/systemd-network-generator.* +%{_mandir}/man1/init.1.gz +%{_mandir}/man8/halt.8.gz +%{_mandir}/man8/poweroff.8.gz +%{_mandir}/man8/reboot.8.gz +%{_mandir}/man8/runlevel.8.gz +%{_mandir}/man8/shutdown.8.gz +%{_mandir}/man8/telinit.8.gz %endif %files -n libsystemd0%{?mini} %defattr(-,root,root) -%{_libdir}/libsystemd.so.* +%license LICENSE.LGPL2.1 +%{_libdir}/libsystemd.so.0 +%{_libdir}/libsystemd.so.0.32.0 %files -n libudev%{?mini}1 %defattr(-,root,root) -%{_libdir}/libudev.so.* - -%files -n libudev%{?mini}-devel -%defattr(-,root,root) -%{_includedir}/libudev.h -%{_libdir}/libudev.so -%{_libdir}/pkgconfig/libudev.pc -%if ! 0%{?bootstrap} -%{_mandir}/man3/*udev*.3* -%endif +%license LICENSE.LGPL2.1 +%{_libdir}/libudev.so.1 +%{_libdir}/libudev.so.1.7.2 %if %{with coredump} %files coredump @@ -1703,6 +1319,7 @@ fi %{_unitdir}/systemd-coredump* %{_unitdir}/sockets.target.wants/systemd-coredump.socket %{_sysctldir}/50-coredump.conf +%{_sysusersdir}/systemd-coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump %if ! 0%{?bootstrap} @@ -1712,47 +1329,6 @@ fi %endif %endif -%files container -%defattr(-,root,root) -%dir %{_sysconfdir}/systemd/nspawn -%{_bindir}/systemd-nspawn -%{_unitdir}/systemd-nspawn@.service -%if %{with machined} -%{_bindir}/machinectl -%{_prefix}/lib/systemd/systemd-machined -%{_unitdir}/systemd-machined.service -%{_unitdir}/dbus-org.freedesktop.machine1.service -%{_unitdir}/var-lib-machines.mount -%{_unitdir}/machine.slice -%{_unitdir}/machines.target.wants -%{_unitdir}/*.target.wants/var-lib-machines.mount -%{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh -%{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service -%{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy -%{_tmpfilesdir}/systemd-nspawn.conf -%endif -%if %{with importd} -%{_prefix}/lib/systemd/systemd-import* -%{_prefix}/lib/systemd/systemd-pull -%{_prefix}/lib/systemd/import-pubring.gpg -%{_unitdir}/systemd-importd.service -%{_unitdir}/dbus-org.freedesktop.import1.service -%{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.import1.service -%{_datadir}/polkit-1/actions/org.freedesktop.import1.policy -%endif -%if ! 0%{?bootstrap} -%{_mandir}/man*/*nspawn* -%if %{with machined} -%{_mandir}/man*/machinectl* -%{_mandir}/man*/systemd-machined* -%endif -%if %{with importd} -%{_mandir}/man*/systemd-importd* -%endif -%endif - %if ! 0%{?bootstrap} %files lang -f systemd.lang @@ -1769,22 +1345,6 @@ fi %{_mandir}/man8/nss-systemd.* %endif -%if %{with resolved} -%files -n nss-resolve -%defattr(-, root, root) -%{_libdir}/libnss_resolve.so.2 -%{_mandir}/man8/libnss_resolve.* -%{_mandir}/man8/nss-resolve.* -%endif - -%if %{with machined} -%files -n nss-mymachines -%defattr(-,root,root) -%{_libdir}/libnss_mymachines.so* -%{_mandir}/man8/libnss_mymachines.* -%{_mandir}/man8/nss-mymachines.* -%endif - %if %{with journal_remote} %files journal-remote %defattr(-, root, root) @@ -1806,37 +1366,6 @@ fi %ghost %dir %{_localstatedir}/log/journal/remote %endif -%if %{with networkd} || %{with resolved} -%files network -%defattr(-,root,root) -%if %{with networkd} -%config(noreplace) %{_sysconfdir}/systemd/networkd.conf -%{_bindir}/networkctl -%{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.network1.service -%{_datadir}/polkit-1/actions/org.freedesktop.network1.policy -%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules -%{_prefix}/lib/systemd/network/*.network -%{_prefix}/lib/systemd/network/*.network.example -%{_prefix}/lib/systemd/systemd-networkd -%{_prefix}/lib/systemd/systemd-networkd-wait-online -%{_unitdir}/systemd-networkd.service -%{_unitdir}/systemd-networkd.socket -%{_unitdir}/systemd-networkd-wait-online.service -%endif -%if %{with resolved} -%{_bindir}/resolvectl -%{_bindir}/systemd-resolve -%config(noreplace) %{_sysconfdir}/systemd/resolved.conf -%{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf -%{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service -%{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy -%{_prefix}/lib/systemd/resolv.conf -%{_prefix}/lib/systemd/systemd-resolved -%{_unitdir}/systemd-resolved.service -%endif -%endif - %if %{with portabled} %files portable %defattr(-,root,root) @@ -1856,8 +1385,8 @@ fi %if %{with testsuite} %files testsuite %defattr(-,root,root) -%{_testsuitedir} %doc %{_testsuitedir}/test/README.testsuite +%{_testsuitedir} %endif %if %{with experimental} @@ -1874,6 +1403,8 @@ fi %{_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* From 2ea074e0362e904a20348f8451a8a5b1d6f1c731738137274be5a53f3cd6ee6c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 7 Feb 2022 08:27:18 +0000 Subject: [PATCH 088/124] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=346 --- systemd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd.spec b/systemd.spec index 4ef6b10e..9c477a66 100644 --- a/systemd.spec +++ b/systemd.spec @@ -335,6 +335,7 @@ License: LGPL-2.1-or-later %if 0%{?bootstrap} Conflicts: kiwi Conflicts: libudev1 +Provides: libudev1 # avoid kiwi picking it for bootstrap Requires: this-is-only-for-build-envs %endif From d69ef2391441e7ad2ad7ff322473b88cfee0ffb73734b4d82951c289f2a58d40 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 7 Feb 2022 14:30:06 +0000 Subject: [PATCH 089/124] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=347 --- systemd.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/systemd.spec b/systemd.spec index 9c477a66..a9850b0d 100644 --- a/systemd.spec +++ b/systemd.spec @@ -227,10 +227,11 @@ drop-in replacement for sysvinit. %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -Supplements: (systemd and patterns-base-documentation) %if 0%{?bootstrap} Provides: systemd-doc = %{version}-%{release} Conflicts: systemd-doc +%else +Supplements: (systemd and patterns-base-documentation) %endif %description doc From 499a776e27d50aa7c8af57de9cfbbf944f9a05f61040f53527148563fb87f756 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 19 Feb 2022 18:21:14 +0000 Subject: [PATCH 090/124] Accepting request 955799 from Base:System - Drop enablement symlink migration support of SysV init scripts And let's finish reducing the support of SysV init scripts to its minimum. - spec: fix dependencies for mini variants Make sure that all mini variants won't be installed in real systems and won't be involved when building medias with kiwi. Note that sub-packages that requires systemd (such as udev) don't need any special treatment since the specific deps are inherited from the main (mini) package. - spec: simplify systemd-mini-doc dependencies by assuming that the doc sub-package can't be a build requirement for other packages. - spec: libsystemd-mini and libudev-mini need to provide libsystemd and libudev respectively - Rename systemd-sysvinit into systemd-sysvcompat systemd-sysvinit was probably provided to allow systems to switch from sysvinit to systemd by overwriting /sbin/init with a link to systemd. But this isn't very useful anymore due to the fact that sysvinit is not supported since several years. Therefore the subpackage contains now the files needed to keep backward compatibility with SysV init scripts (most notably sysv-generator) and has been renamed accordingly. The few files that are not specific to sysvinit (such as /bin/init) have been moved to the main package. Normally this new subpackage shouldn't be needed (since all packages use systemd unit files) unless a 3rd party application is installed and still relies on SysV init scripts. - systemd.spec: explicitely turn on/off build options Hence a feature can't be accidentally turned on/off because its dep is pulled in or removed due to another feature being turned on/off. OBS-URL: https://build.opensuse.org/request/show/955799 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=348 --- files.systemd | 84 ++++-------------- files.sysvcompat | 45 ++++++++++ systemd-sysv-convert | 120 -------------------------- systemd.changes | 48 +++++++++++ systemd.spec | 201 ++++++++++++++++++------------------------- 5 files changed, 190 insertions(+), 308 deletions(-) create mode 100644 files.sysvcompat delete mode 100644 systemd-sysv-convert diff --git a/files.systemd b/files.systemd index 1a2d79a8..79a3cc49 100644 --- a/files.systemd +++ b/files.systemd @@ -30,10 +30,6 @@ %dir %{_journalcatalogdir} %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog -%if %{with sysvcompat} -%dir %{_localstatedir}/lib/systemd/migrated -%dir %{_localstatedir}/lib/systemd/sysv-convert -%endif %dir %{_modprobedir} %dir %{_modulesloaddir} %dir %{_prefix}/lib/kernel @@ -82,13 +78,6 @@ %dir %{_unitdir}/reboot.target.wants %dir %{_unitdir}/remote-fs.target.wants %dir %{_unitdir}/rescue.target.wants -%if %{with sysvcompat} -%dir %{_unitdir}/runlevel1.target.wants -%dir %{_unitdir}/runlevel2.target.wants -%dir %{_unitdir}/runlevel3.target.wants -%dir %{_unitdir}/runlevel4.target.wants -%dir %{_unitdir}/runlevel5.target.wants -%endif %dir %{_unitdir}/shutdown.target.wants %dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sysinit.target.wants @@ -236,6 +225,7 @@ %endif %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz +%{_mandir}/man1/init.1.gz %{_mandir}/man1/journalctl.1.gz %{_mandir}/man1/localectl.1.gz %{_mandir}/man1/loginctl.1.gz @@ -347,9 +337,13 @@ %{_mandir}/man7/systemd.syntax.7.gz %{_mandir}/man7/systemd.time.7.gz %{_mandir}/man8/30-systemd-environment-d-generator.8.gz +%{_mandir}/man8/halt.8.gz %{_mandir}/man8/kernel-install.8.gz %{_mandir}/man8/pam_systemd.8.gz +%{_mandir}/man8/poweroff.8.gz %{_mandir}/man8/rc-local.service.8.gz +%{_mandir}/man8/reboot.8.gz +%{_mandir}/man8/shutdown.8.gz %{_mandir}/man8/systemd-ask-password-console.path.8.gz %{_mandir}/man8/systemd-ask-password-console.service.8.gz %{_mandir}/man8/systemd-ask-password-wall.path.8.gz @@ -389,9 +383,6 @@ %{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz -%{_mandir}/man8/systemd-initctl.8.gz -%{_mandir}/man8/systemd-initctl.service.8.gz -%{_mandir}/man8/systemd-initctl.socket.8.gz %{_mandir}/man8/systemd-journald-audit.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz @@ -416,7 +407,6 @@ %{_mandir}/man8/systemd-quotacheck.service.8.gz %{_mandir}/man8/systemd-random-seed.8.gz %{_mandir}/man8/systemd-random-seed.service.8.gz -%{_mandir}/man8/systemd-rc-local-generator.8.gz %{_mandir}/man8/systemd-reboot.service.8.gz %{_mandir}/man8/systemd-remount-fs.8.gz %{_mandir}/man8/systemd-remount-fs.service.8.gz @@ -436,7 +426,6 @@ %{_mandir}/man8/systemd-system-update-generator.8.gz %{_mandir}/man8/systemd-sysusers.8.gz %{_mandir}/man8/systemd-sysusers.service.8.gz -%{_mandir}/man8/systemd-sysv-generator.8.gz %{_mandir}/man8/systemd-time-wait-sync.8.gz %{_mandir}/man8/systemd-time-wait-sync.service.8.gz %{_mandir}/man8/systemd-timedated.8.gz @@ -450,7 +439,6 @@ %{_mandir}/man8/systemd-tmpfiles.8.gz %{_mandir}/man8/systemd-update-done.8.gz %{_mandir}/man8/systemd-update-done.service.8.gz -%{_mandir}/man8/systemd-update-utmp-runlevel.service.8.gz %{_mandir}/man8/systemd-update-utmp.8.gz %{_mandir}/man8/systemd-update-utmp.service.8.gz %{_mandir}/man8/systemd-user-sessions.8.gz @@ -470,6 +458,11 @@ %{_prefix}/lib/kernel/install.d/00-entry-directory.install %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install +%{_sbindir}/halt +%{_sbindir}/init +%{_sbindir}/poweroff +%{_sbindir}/reboot +%{_sbindir}/shutdown %{_sysconfdir}/xdg/systemd/user %{_sysctldir}/99-sysctl.conf %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator @@ -500,9 +493,6 @@ %{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed -%if %{with sysvcompat} -%{_systemd_util_dir}/systemd-initctl -%endif %{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-logind @@ -518,10 +508,6 @@ %{_systemd_util_dir}/systemd-socket-proxyd %{_systemd_util_dir}/systemd-sulogin-shell %{_systemd_util_dir}/systemd-sysctl -%if %{with sysvcompat} -%{_systemd_util_dir}/systemd-sysv-convert -%{_systemd_util_dir}/systemd-sysv-install -%endif %{_systemd_util_dir}/systemd-time-wait-sync %{_systemd_util_dir}/systemd-timedated %{_systemd_util_dir}/systemd-timesyncd @@ -570,14 +556,8 @@ %{_systemdgeneratordir}/systemd-getty-generator %{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator -%if %{with sysvcompat} -%{_systemdgeneratordir}/systemd-rc-local-generator -%endif %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator -%if %{with sysvcompat} -%{_systemdgeneratordir}/systemd-sysv-generator -%endif %if ! 0%{?bootstrap} %{_systemdgeneratordir}/systemd-veritysetup-generator %endif @@ -628,9 +608,6 @@ %{_unitdir}/getty.target %{_unitdir}/getty@.service %{_unitdir}/graphical.target -%if %{with sysvcompat} -%{_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service -%endif %{_unitdir}/halt.target %{_unitdir}/hibernate.target %{_unitdir}/hybrid-sleep.target @@ -651,18 +628,11 @@ %{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs.target %{_unitdir}/local-fs.target.wants/tmp.mount -%if %{with sysvcompat} -%{_unitdir}/local-fs.target.wants/var-lock.mount -%{_unitdir}/local-fs.target.wants/var-run.mount -%endif %{_unitdir}/modprobe@.service %{_unitdir}/multi-user.target %{_unitdir}/multi-user.target.wants/after-local.service %{_unitdir}/multi-user.target.wants/getty.target %{_unitdir}/multi-user.target.wants/systemd-logind.service -%if %{with sysvcompat} -%{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service -%endif %{_unitdir}/multi-user.target.wants/systemd-user-sessions.service %{_unitdir}/network-online.target %{_unitdir}/network-pre.target @@ -675,9 +645,6 @@ %{_unitdir}/proc-sys-fs-binfmt_misc.automount %{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/quotaon.service -%if %{with sysvcompat} -%{_unitdir}/rc-local.service -%endif %{_unitdir}/reboot.target %if ! 0%{?bootstrap} %{_unitdir}/remote-cryptsetup.target @@ -689,19 +656,7 @@ %endif %{_unitdir}/rescue.service %{_unitdir}/rescue.target -%if %{with sysvcompat} -%{_unitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service -%endif %{_unitdir}/rpcbind.target -%if %{with sysvcompat} -%{_unitdir}/runlevel0.target -%{_unitdir}/runlevel1.target -%{_unitdir}/runlevel2.target -%{_unitdir}/runlevel3.target -%{_unitdir}/runlevel4.target -%{_unitdir}/runlevel5.target -%{_unitdir}/runlevel6.target -%endif %{_unitdir}/serial-getty@.service %{_unitdir}/shutdown.target %{_unitdir}/sigpwr.target @@ -709,9 +664,6 @@ %{_unitdir}/slices.target %{_unitdir}/smartcard.target %{_unitdir}/sockets.target -%if %{with sysvcompat} -%{_unitdir}/sockets.target.wants/systemd-initctl.socket -%endif %{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket %{_unitdir}/sockets.target.wants/systemd-journald.socket %{_unitdir}/sound.target @@ -783,10 +735,6 @@ %{_unitdir}/systemd-hibernate.service %{_unitdir}/systemd-hostnamed.service %{_unitdir}/systemd-hybrid-sleep.service -%if %{with sysvcompat} -%{_unitdir}/systemd-initctl.service -%{_unitdir}/systemd-initctl.socket -%endif %{_unitdir}/systemd-journal-catalog-update.service %{_unitdir}/systemd-journal-flush.service %{_unitdir}/systemd-journald-dev-log.socket @@ -820,9 +768,6 @@ %{_unitdir}/systemd-tmpfiles-setup-dev.service %{_unitdir}/systemd-tmpfiles-setup.service %{_unitdir}/systemd-update-done.service -%if %{with sysvcompat} -%{_unitdir}/systemd-update-utmp-runlevel.service -%endif %{_unitdir}/systemd-update-utmp.service %{_unitdir}/systemd-user-sessions.service %{_unitdir}/systemd-vconsole-setup.service @@ -839,14 +784,15 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service -%if %{with sysvcompat} -%{_unitdir}/var-lock.mount -%{_unitdir}/var-run.mount -%endif %if ! 0%{?bootstrap} %{_unitdir}/veritysetup-pre.target %{_unitdir}/veritysetup.target %endif %if %{with split_usr} /bin/systemctl +/sbin/halt +/sbin/init +/sbin/poweroff +/sbin/reboot +/sbin/shutdown %endif diff --git a/files.sysvcompat b/files.sysvcompat new file mode 100644 index 00000000..49e50a81 --- /dev/null +++ b/files.sysvcompat @@ -0,0 +1,45 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%dir %{_unitdir}/runlevel1.target.wants +%dir %{_unitdir}/runlevel2.target.wants +%dir %{_unitdir}/runlevel3.target.wants +%dir %{_unitdir}/runlevel4.target.wants +%dir %{_unitdir}/runlevel5.target.wants +%{_mandir}/man8/runlevel.8.gz +%{_mandir}/man8/systemd-initctl.8.gz +%{_mandir}/man8/systemd-initctl.service.8.gz +%{_mandir}/man8/systemd-initctl.socket.8.gz +%{_mandir}/man8/systemd-rc-local-generator.8.gz +%{_mandir}/man8/systemd-sysv-generator.8.gz +%{_mandir}/man8/systemd-update-utmp-runlevel.service.8.gz +%{_mandir}/man8/telinit.8.gz +%{_sbindir}/runlevel +%{_sbindir}/telinit +%{_systemd_util_dir}/systemd-initctl +%{_systemd_util_dir}/systemd-sysv-install +%{_systemdgeneratordir}/systemd-rc-local-generator +%{_systemdgeneratordir}/systemd-sysv-generator +%{_unitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service +%{_unitdir}/local-fs.target.wants/var-lock.mount +%{_unitdir}/local-fs.target.wants/var-run.mount +%{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service +%{_unitdir}/rc-local.service +%{_unitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service +%{_unitdir}/runlevel0.target +%{_unitdir}/runlevel1.target +%{_unitdir}/runlevel2.target +%{_unitdir}/runlevel3.target +%{_unitdir}/runlevel4.target +%{_unitdir}/runlevel5.target +%{_unitdir}/runlevel6.target +%{_unitdir}/sockets.target.wants/systemd-initctl.socket +%{_unitdir}/systemd-initctl.service +%{_unitdir}/systemd-initctl.socket +%{_unitdir}/systemd-update-utmp-runlevel.service +%{_unitdir}/var-lock.mount +%{_unitdir}/var-run.mount +%if %{with split_usr} +/sbin/runlevel +/sbin/telinit +%endif diff --git a/systemd-sysv-convert b/systemd-sysv-convert deleted file mode 100644 index f4417703..00000000 --- a/systemd-sysv-convert +++ /dev/null @@ -1,120 +0,0 @@ -#!/bin/bash - -info() { - echo "$(basename $0): $*" -} - -warn() { - echo >&2 "$(basename $0): warning, $*" -} - -usage() { - echo >&2 "usage: $(basename $0) --apply [ ...]" -} - -if [ "$UID" != "0" ]; then - warn "need to be root, aborting" - exit 1 -fi - -if [ $# -lt 2 ]; then - usage - exit 1 -fi - -database_lookup() { - local service unused - - # 'priority' field is not used but is kept for backward compat reason. - while read service unused; do - if [ $service == $1 ]; then - return 0 - fi - done >/var/lib/systemd/sysv-convert/database -} - -# Initialize the database. -if [ ! -e /var/lib/systemd/sysv-convert/database ]; then - touch /var/lib/systemd/sysv-convert/database -fi - -case "$1" in ---save) - # --save is kept for backward compatibility. - ;; ---apply) - shift - for service in $@; do - # For backward compat we accept the name of the - # service with or without the unit type suffix. If the - # suffix is not there, assume .service type. - case "$service" in - *.*) initscript="${service%.*}" ;; - *) initscript="$service" - service="$service.service" - esac - - # Did we already migrate this service during a previous update ? - database_lookup $initscript && - continue - - # Sanity check. - unit="/usr/lib/systemd/system/$service" - if [ ! -f "$unit" ]; then - warn "$unit not found, skipping" - continue - fi - - # Mark the service as processed to make sure we will do the migration only - # once. This is important especially for packages that keep their init - # scripts around even if they're no more used. Since the saved info won't - # be reused again we simply use an invalid runlevel and add the service - # in the db only once. - database_add $initscript -1 - - # Some services were renamed during the transition from SySV init to - # systemd (bsc#1181788). Rather than letting packages fixing that - # themselves by hacking our database directly, let's hard-code renames - # here. Not really nice but that's the least worst solution. - case $initscript in - ntpd) initscript=ntp ;; - esac - - # The package is introducing new services and never has any sysv init - # scripts (bsc#982303). - if [ ! -r /etc/init.d/$initscript ] && - [ ! -r /etc/init.d/boot.$initscript ]; then - continue - fi - - for rcnd in rc2.d rc3.d rc4.d rc5.d boot.d; do - # Was the sysvinit script enabled ? (bsc#982211) - case $rcnd in - boot.d) [ -L /etc/rc.d/boot.d/S??boot.$initscript ] || continue ;; - *) [ -L /etc/rc.d/$rcnd/S??$initscript ] || continue - esac - - case $rcnd in - boot.d) runlevel=3 ;; - *) runlevel=${rcnd:2:1} - esac - - target=runlevel$runlevel.target - info "enabling $unit (wanted by $target)..." - - mkdir -p "/etc/systemd/system/$target.wants" - ln -sf $unit /etc/systemd/system/$target.wants/$service - done - done - ;; -*) - usage - exit 1 -esac diff --git a/systemd.changes b/systemd.changes index 0ab20e79..5f1181ff 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,51 @@ +------------------------------------------------------------------- +Thu Feb 17 18:30:12 UTC 2022 - Franck Bui + +- Drop enablement symlink migration support of SysV init scripts + + And let's finish reducing the support of SysV init scripts to its minimum. + +------------------------------------------------------------------- +Mon Feb 14 15:11:04 UTC 2022 - Franck Bui + +- spec: fix dependencies for mini variants + + Make sure that all mini variants won't be installed in real systems and won't + be involved when building medias with kiwi. Note that sub-packages that + requires systemd (such as udev) don't need any special treatment since the + specific deps are inherited from the main (mini) package. + +- spec: simplify systemd-mini-doc dependencies by assuming that the doc + sub-package can't be a build requirement for other packages. + +- spec: libsystemd-mini and libudev-mini need to provide libsystemd and libudev + respectively + +------------------------------------------------------------------- +Mon Feb 14 07:39:12 UTC 2022 - Franck Bui + +- Rename systemd-sysvinit into systemd-sysvcompat + + systemd-sysvinit was probably provided to allow systems to switch from + sysvinit to systemd by overwriting /sbin/init with a link to systemd. But this + isn't very useful anymore due to the fact that sysvinit is not supported since + several years. Therefore the subpackage contains now the files needed to keep + backward compatibility with SysV init scripts (most notably sysv-generator) + and has been renamed accordingly. The few files that are not specific to + sysvinit (such as /bin/init) have been moved to the main package. + + Normally this new subpackage shouldn't be needed (since all packages use + systemd unit files) unless a 3rd party application is installed and still + relies on SysV init scripts. + +------------------------------------------------------------------- +Mon Feb 14 07:31:49 UTC 2022 - Franck Bui + +- systemd.spec: explicitely turn on/off build options + + Hence a feature can't be accidentally turned on/off because its dep is pulled + in or removed due to another feature being turned on/off. + ------------------------------------------------------------------- Fri Feb 4 15:22:43 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a9850b0d..559de805 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,11 +16,6 @@ # -# -# The git repository used to track all Suse specific changes can be -# found at: https://github.com/openSUSE/systemd. -# - %global flavor @BUILD_FLAVOR@%{nil} %if "%{flavor}" == "mini" @@ -35,6 +30,12 @@ %define suse_version +suse.82.g117bd7f14a %define _testsuitedir /usr/lib/systemd/tests +# Similar to %%with but returns true/false. The 'true' value can be redefined +# when a second parameter is passed. +%define __when_1() %{expand:%%{?with_%{1}:true}%%{!?with_%{1}:false}} +%define __when_2() %{expand:%%{?with_%{1}:%{2}}%%{!?with_%{1}:false}} +%define when() %{expand:%%__when_%# %{*}} + %if 0%{?bootstrap} %bcond_with coredump %bcond_with importd @@ -132,8 +133,15 @@ BuildRequires: gnu-efi %if 0%{?bootstrap} #!BuildIgnore: dbus-1 -Requires: this-is-only-for-build-envs Provides: systemd = %{version}-%{release} +Conflicts: systemd +# Don't consider the mini flavors when building kiwi medias. This conflict is +# automatically inherited by sub-packages requiring systemd (such as udev). +Conflicts: kiwi +# This dependency is used to ensure that the mini flavors are selected only +# inside OBS builds (where this dependency is ignored) and don't get installed +# on real systems. +Requires: this-is-only-for-build-envs %else # the buildignore is important for bootstrapping #!BuildIgnore: udev @@ -157,16 +165,16 @@ Requires(post): findutils Requires(post): systemd-presets-branding Requires(post): pam-config >= 0.79-5 %endif - -%if 0%{?bootstrap} -Conflicts: kiwi -Conflicts: systemd -%endif Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 +Provides: sbin_init +Provides: sysvinit:/sbin/init +Conflicts: sbin_init Conflicts: sysvinit Provides: systemd-logger = %{version}-%{release} Obsoletes: systemd-logger < %{version}-%{release} +Provides: systemd-sysvinit = %{version}-%{release} +Obsoletes: systemd-sysvinit < %{version}-%{release} Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 @@ -175,7 +183,6 @@ Source0: systemd-v%{version}%{suse_version}.tar.xz Source1: systemd-rpmlintrc Source2: systemd-user %if %{with sysvcompat} -Source3: systemd-sysv-convert Source4: systemd-sysv-install %endif Source5: tmpfiles-suse.conf @@ -192,11 +199,17 @@ Source201: files.udev Source202: files.container Source203: files.network Source204: files.devel +Source205: files.sysvcompat +# +# All changes backported from upstream are tracked by the git repository, which +# can be found at: https://github.com/openSUSE/systemd. +# # Patches listed below are openSUSE specific and should be kept at its # minimum. We try hard to push our changes to upstream but sometimes they are # only relevant for SUSE distros. Special rewards for those who will manage to # get rid of one of them ! +# 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 @@ -228,8 +241,8 @@ drop-in replacement for sysvinit. Summary: HTML documentation for systemd License: LGPL-2.1-or-later %if 0%{?bootstrap} -Provides: systemd-doc = %{version}-%{release} Conflicts: systemd-doc +Requires: this-is-only-for-build-envs %else Supplements: (systemd and patterns-base-documentation) %endif @@ -256,23 +269,32 @@ Conflicts: libudev-devel Development headers and files for libsystemd and libudev libraries for developing and building applications linking to these libraries. -%package sysvinit -Summary: System V init tools +%if %{with sysvcompat} +%package sysvcompat +Summary: SySV and LSB init script support for systemd (deprecated) License: LGPL-2.1-or-later Requires: %{name} = %{version}-%{release} -Provides: sbin_init -Conflicts: sbin_init -Provides: systemd-sysvinit = %{version}-%{release} -Provides: sysvinit:/sbin/init +Provides: systemd-sysvinit:%{_sbindir}/runlevel +Provides: systemd-sysvinit:%{_sbindir}/telinit -%description sysvinit -Drop-in replacement of System V init tools. +%description sysvcompat +This package ships the necessary files that enable minimal SysV and LSB init +scripts support in systemd. It also contains the obsolete SysV init tools +telinit(8) and runlevel(8). You should consider using systemctl(1) instead. + +Unless you have a 3rd party application installed on your system that still +relies on such scripts, this package should not be needed at all. + +Please note that the content of this package is considered as deprecated. +%endif %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later %if 0%{?bootstrap} +Conflicts: kiwi Conflicts: libsystemd0 +Provides: libsystemd0 = %{version}-%{release} Requires: this-is-only-for-build-envs %endif @@ -310,17 +332,14 @@ Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun):coreutils - Conflicts: ConsoleKit < 0.4.1 Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 %if 0%{?bootstrap} -Provides: udev = %{version}-%{release} Conflicts: udev -# avoid kiwi picking it for bootstrap -Requires: this-is-only-for-build-envs +Provides: udev = %{version}-%{release} %endif %description -n udev%{?mini} @@ -336,8 +355,7 @@ License: LGPL-2.1-or-later %if 0%{?bootstrap} Conflicts: kiwi Conflicts: libudev1 -Provides: libudev1 -# avoid kiwi picking it for bootstrap +Provides: libudev1 = %{version}-%{release} Requires: this-is-only-for-build-envs %endif @@ -369,8 +387,10 @@ Provides: nss-mymachines = %{version}-%{release} Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} +Conflicts: kiwi Conflicts: systemd-container Provides: systemd-container = %{version}-%{release} +Requires: this-is-only-for-build-envs %endif %description container @@ -625,13 +645,21 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ + -Dadm-group=false \ + -Dwheel-group=false \ + -Dgshadow=false \ + -Ddefault-hierarchy=unified \ + -Ddefault-kill-user-processes=false \ + -Dldconfig=false \ -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ - -Ddefault-hierarchy=unified \ - -Ddefault-kill-user-processes=false \ +%if %{without sysvcompat} + -Dsysvinit-path= \ + -Dsysvrcnd-path= \ +%endif -Drc-local=/etc/init.d/boot.local \ -Dcreate-log-dirs=false \ -Dbump-proc-sys-fs-nr-open=false \ @@ -643,17 +671,6 @@ Have fun with these services at your own risk. -Dima=false \ -Delfutils=auto \ -Doomd=false \ -%if %{with experimental} - -Dpstore=true \ - -Drepart=true \ - -Dhomed=true \ - -Duserdb=true \ -%else - -Dpstore=false \ - -Drepart=false \ - -Dhomed=false \ - -Duserdb=false \ -%endif %if 0%{?bootstrap} -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ @@ -665,53 +682,28 @@ Have fun with these services at your own risk. -Dman=true \ -Dhtml=true \ %endif -%if %{without coredump} - -Dcoredump=false \ -%endif -%if %{without sd_boot} - -Defi=false \ - -Dgnu-efi=false \ -%else - -Defi=true \ - -Dgnu-efi=true \ -%endif -%if %{without importd} - -Dimportd=false \ -%endif -%if %{without journal_remote} - -Dremote=false \ -%endif -%if %{without portabled} - -Dportabled=false \ -%endif -%if %{without machined} - -Dmachined=false \ -%endif -%if %{without networkd} - -Dnetworkd=false \ -%endif -%if %{without resolved} - -Dresolve=false \ -%else + -Dcoredump=%{when coredump} \ + -Dimportd=%{when importd} \ + -Dmachined=%{when machined} \ + -Dnetworkd=%{when networkd} \ + -Dportabled=%{when portabled} \ + -Dremote=%{when journal_remote} \ + \ + -Defi=%{when sd_boot} \ + -Dgnu-efi=%{when sd_boot} \ + \ + -Dresolve=%{when resolved} \ -Ddns-servers='' \ -Ddefault-dnssec=no \ - -Ddns-over-tls=openssl \ -%endif -%if %{without sysvcompat} - -Dsysvinit-path= \ - -Dsysvrcnd-path= \ -%endif -%if %{with testsuite} - -Dtests=unsafe \ - -Dinstall-tests=true \ -%else - -Dtests=false \ - -Dinstall-tests=false \ -%endif - -Dadm-group=false \ - -Dwheel-group=false \ - -Dgshadow=false \ - -Dldconfig=false + -Ddns-over-tls=%{when resolved openssl} \ + \ + -Dpstore=%{when experimental} \ + -Drepart=%{when experimental} \ + -Dhomed=%{when experimental} \ + -Duserdb=%{when experimental} \ + \ + -Dtests=%{when testsuite unsafe} \ + -Dinstall-tests=%{when testsuite} %meson_build @@ -727,10 +719,6 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif %if %{with sysvcompat} -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/sysv-convert -mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/migrated - -install -m0755 -D %{SOURCE3} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-convert install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install %endif @@ -751,12 +739,13 @@ mkdir -p %{buildroot}/{bin,sbin} # Legacy paths ln -s ../usr/bin/udevadm %{buildroot}/sbin/ ln -s ../usr/bin/systemctl %{buildroot}/bin/ -# Legacy sysvinit tools + ln -s ../usr/lib/systemd/systemd %{buildroot}/sbin/init ln -s ../usr/bin/systemctl %{buildroot}/sbin/reboot ln -s ../usr/bin/systemctl %{buildroot}/sbin/halt ln -s ../usr/bin/systemctl %{buildroot}/sbin/shutdown ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff +# Legacy sysvinit tools %if %{with sysvcompat} ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel @@ -1269,36 +1258,10 @@ fi %license LICENSE.LGPL2.1 %include %{SOURCE204} -%files sysvinit +%if %{with sysvcompat} +%files sysvcompat %defattr(-,root,root,-) -%if %{with split_usr} -/sbin/halt -/sbin/init -/sbin/poweroff -/sbin/reboot -/sbin/shutdown -%if %{with sysvcompat} -/sbin/telinit -/sbin/runlevel -%endif -%endif -%{_sbindir}/halt -%{_sbindir}/init -%{_sbindir}/poweroff -%{_sbindir}/reboot -%{_sbindir}/shutdown -%if %{with sysvcompat} -%{_sbindir}/runlevel -%{_sbindir}/telinit -%endif -%if ! 0%{?bootstrap} -%{_mandir}/man1/init.1.gz -%{_mandir}/man8/halt.8.gz -%{_mandir}/man8/poweroff.8.gz -%{_mandir}/man8/reboot.8.gz -%{_mandir}/man8/runlevel.8.gz -%{_mandir}/man8/shutdown.8.gz -%{_mandir}/man8/telinit.8.gz +%include %{SOURCE205} %endif %files -n libsystemd0%{?mini} From 9e059d51693b1c9731be0661be13bd7b5de46e89fea9236eaa3f13976b4eede9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 23 Feb 2022 15:25:54 +0000 Subject: [PATCH 091/124] Accepting request 956820 from Base:System - Import commit 0bb1977021be2fc9ebfae10d766dff0b1a457f88 (merge of v249.10) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/b9b83c5d11e686178ddd545862a00b33c6fdfabb...0bb1977021be2fc9ebfae10d766dff0b1a457f88 - Import commit b9b83c5d11e686178ddd545862a00b33c6fdfabb 8973cb2462 systemd-coredump: allow setting external core size to infinity (bsc#1195899 jsc#SLE-23866) - Fix build if %_distconfdir is not defined (see bsc#1195679) OBS-URL: https://build.opensuse.org/request/show/956820 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=349 --- files.systemd | 6 +++--- systemd-v249.10+suse.86.g0bb1977021.tar.xz | 3 +++ systemd-v249.9+suse.82.g117bd7f14a.tar.xz | 3 --- systemd.changes | 20 ++++++++++++++++++++ systemd.spec | 7 ++++--- 5 files changed, 30 insertions(+), 9 deletions(-) create mode 100644 systemd-v249.10+suse.86.g0bb1977021.tar.xz delete mode 100644 systemd-v249.9+suse.82.g117bd7f14a.tar.xz diff --git a/files.systemd b/files.systemd index 79a3cc49..8f0f173d 100644 --- a/files.systemd +++ b/files.systemd @@ -24,8 +24,8 @@ %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %endif -%dir %{_distconfdir}/X11/xinit -%dir %{_distconfdir}/X11/xinit/xinitrc.d +%dir %{xinitconfdir} +%dir %{xinitconfdir}/xinitrc.d %dir %{_environmentdir} %dir %{_journalcatalogdir} %dir %{_localstatedir}/lib/systemd @@ -205,7 +205,7 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif -%{_distconfdir}/X11/xinit/xinitrc.d/50-systemd-user.sh +%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog diff --git a/systemd-v249.10+suse.86.g0bb1977021.tar.xz b/systemd-v249.10+suse.86.g0bb1977021.tar.xz new file mode 100644 index 00000000..fdcaf7f0 --- /dev/null +++ b/systemd-v249.10+suse.86.g0bb1977021.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812 +size 7281992 diff --git a/systemd-v249.9+suse.82.g117bd7f14a.tar.xz b/systemd-v249.9+suse.82.g117bd7f14a.tar.xz deleted file mode 100644 index 048b7576..00000000 --- a/systemd-v249.9+suse.82.g117bd7f14a.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:167cad3440fd7babb26317d528842f78fa37573bdaeda29845990dc0986463f0 -size 7280500 diff --git a/systemd.changes b/systemd.changes index 5f1181ff..36c1c1b1 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Tue Feb 22 15:22:16 UTC 2022 - Franck Bui + +- Import commit 0bb1977021be2fc9ebfae10d766dff0b1a457f88 (merge of v249.10) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/b9b83c5d11e686178ddd545862a00b33c6fdfabb...0bb1977021be2fc9ebfae10d766dff0b1a457f88 + +------------------------------------------------------------------- +Tue Feb 22 14:50:50 UTC 2022 - Franck Bui + +- Import commit b9b83c5d11e686178ddd545862a00b33c6fdfabb + + 8973cb2462 systemd-coredump: allow setting external core size to infinity (bsc#1195899 jsc#SLE-23866) + +------------------------------------------------------------------- +Mon Feb 21 09:56:26 UTC 2022 - Fabian Vogt + +- Fix build if %_distconfdir is not defined (see bsc#1195679) + ------------------------------------------------------------------- Thu Feb 17 18:30:12 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 559de805..67bc1268 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,8 +27,9 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.82.g117bd7f14a +%define suse_version +suse.86.g0bb1977021 %define _testsuitedir /usr/lib/systemd/tests +%define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit # Similar to %%with but returns true/false. The 'true' value can be redefined # when a second parameter is passed. @@ -70,7 +71,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.9 +Version: 249.10 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -653,7 +654,7 @@ Have fun with these services at your own risk. -Dldconfig=false \ -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ - -Dxinitrcdir=%{_distconfdir}/X11/xinit/xinitrc.d \ + -Dxinitrcdir=%{xinitconfdir}/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ %if %{without sysvcompat} From 053f78ce40678474a5e637a97e975792cfa060b8bfb6b862baaa8030dde24da0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 26 Feb 2022 16:01:59 +0000 Subject: [PATCH 092/124] Accepting request 957371 from Base:System - Fix a regression caused by the split of the sysusers config files shipped by systemd (bsc#1196322) Calls to %sysusers_create were not updated accordingly. - spec: fix dependencies for mini variants (follow-up) systemd-mini-container is one of the sub-package that relies systemd-mini to conflict with kiwi and to not be installed on real systems. OBS-URL: https://build.opensuse.org/request/show/957371 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=350 --- systemd.changes | 16 ++++++++++++++++ systemd.spec | 7 ++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/systemd.changes b/systemd.changes index 36c1c1b1..eb4b4324 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Thu Feb 24 13:23:35 UTC 2022 - Franck Bui + +- Fix a regression caused by the split of the sysusers config files shipped by + systemd (bsc#1196322) + + Calls to %sysusers_create were not updated accordingly. + +------------------------------------------------------------------- +Wed Feb 23 17:46:12 UTC 2022 - Franck Bui + +- spec: fix dependencies for mini variants (follow-up) + + systemd-mini-container is one of the sub-package that relies systemd-mini to + conflict with kiwi and to not be installed on real systems. + ------------------------------------------------------------------- Tue Feb 22 15:22:16 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 67bc1268..31ea93ca 100644 --- a/systemd.spec +++ b/systemd.spec @@ -388,10 +388,8 @@ Provides: nss-mymachines = %{version}-%{release} Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn %if 0%{?bootstrap} -Conflicts: kiwi Conflicts: systemd-container Provides: systemd-container = %{version}-%{release} -Requires: this-is-only-for-build-envs %endif %description container @@ -951,7 +949,9 @@ pam-config --add --systemd || : # systemd-sysusers is not available in %pre so this needs to be done # in %%post. However this shouldn't be an issue since all files the # main package ships are owned by root. -%sysusers_create systemd.conf +%sysusers_create systemd-journal.conf +%sysusers_create systemd-network.conf +%sysusers_create systemd-timesync.conf [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : /usr/lib/systemd/systemd-random-seed save || : @@ -1171,6 +1171,7 @@ fi %endif %if %{with resolved} %ldconfig +%sysusers_create systemd-resolve.conf %service_add_post systemd-resolved.service %endif From aecfa91edca64390939bad66bf383e4ec701be083db37948794cabd9589b5f90 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 9 Mar 2022 17:47:02 +0000 Subject: [PATCH 093/124] Accepting request 960154 from Base:System - Fix the default target when it's been incorrectly set to one of the runlevel targets (bsc#1196567) The script 'upgrade-from-pre-210.sh' used to initialize the default target during migration from sysvinit to systemd. However it created symlinks to runlevel targets, which are deprecated and might be missing when systemd-sysvcompat package is not installed. If such symlinks are found the script now renames them to point to 'true' systemd target units. - When migrating from sysvinit to systemd (it probably won't happen anymore), let's use the default systemd target, which is the graphical.target one. In most cases it will do the right thing anyway. OBS-URL: https://build.opensuse.org/request/show/960154 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=351 --- scripts-systemd-upgrade-from-pre-210.sh | 40 ++++++++++++++----------- systemd.changes | 16 ++++++++++ 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/scripts-systemd-upgrade-from-pre-210.sh b/scripts-systemd-upgrade-from-pre-210.sh index 8a168915..2f5e53ff 100644 --- a/scripts-systemd-upgrade-from-pre-210.sh +++ b/scripts-systemd-upgrade-from-pre-210.sh @@ -1,30 +1,34 @@ #! /bin/bash # -# This script is supposed to be executed from the %post section. It -# contains all hacks needed to update a system which was running -# systemd < v210. This also includes systems migrating from SysV. +# This script is supposed to be executed from the %post section. It contains all +# hacks needed to update a system which was running systemd < v210. This also +# includes systems migrating from SysV. +# +# All hacks can potentially break the admin settings since they work in /etc... # -# All hacks can potentially break the admin settings since they work -# in /etc... -# Try to read default runlevel from the old inittab if it exists. If -# it fails fallback to runlevel 3 which should still be better than -# the rescue shell. # -# Note: /etc/inittab was part of the aaa_base package which can be -# upgraded before systemd is. Therefore this file is likely to be -# missing. -if [ ! -e /etc/systemd/system/default.target -a -e /etc/inittab ]; then - runlevel=$(sed -n -r "s/^id:([[:digit:]]):initdefault:/\1/p" /etc/inittab) - : ${runlevel:=3} - echo "Initializing default.target to runlevel${runlevel}.target" - ln -s /usr/lib/systemd/system/runlevel${runlevel}.target /etc/systemd/system/default.target +# During migration from sysvinit to systemd, we used to set the systemd default +# target to one of the 'runlevel*.target' after reading the default runlevel +# from /etc/inittab. We don't do that anymore because in most cases using the +# graphical.target target, which is the default, will do the right +# thing. Moreover the runlevel targets are considered as deprecated, so we +# convert them into "true" systemd targets instead here. +# +if target=$(readlink /etc/systemd/system/default.target); then + target=$(basename $target) + case "$target" in + runlevel?.target) + echo "Default systemd target is '$target' but use of runlevels is deprecated" + systemctl --no-reload set-default $target + esac fi -# migrate any symlink which may refer to the old path +# +# Migrate any symlink which may refer to the old path. +# for f in $(find /etc/systemd/system -type l -xtype l); do new_target="/usr$(readlink $f)" [ -f "$new_target" ] && ln -s -f $new_target $f done - diff --git a/systemd.changes b/systemd.changes index eb4b4324..7c998920 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Mar 8 07:41:41 UTC 2022 - Franck Bui + +- Fix the default target when it's been incorrectly set to one of the runlevel + targets (bsc#1196567) + + The script 'upgrade-from-pre-210.sh' used to initialize the default target + during migration from sysvinit to systemd. However it created symlinks to + runlevel targets, which are deprecated and might be missing when + systemd-sysvcompat package is not installed. If such symlinks are found the + script now renames them to point to 'true' systemd target units. + +- When migrating from sysvinit to systemd (it probably won't happen anymore), + let's use the default systemd target, which is the graphical.target one. In + most cases it will do the right thing anyway. + ------------------------------------------------------------------- Thu Feb 24 13:23:35 UTC 2022 - Franck Bui From e8aa5c69c39588153ddd42485bce5b3a15b33e0f462227015ffbc1f12f5f4d10 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 18 Mar 2022 15:41:17 +0000 Subject: [PATCH 094/124] Accepting request 962458 from Base:System - Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch A temporary workaround until bsc#1197178 is resolved. - Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a...8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 - Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a 37b683c832 journal: preserve acls when rotating user journals with NOCOW attribute set d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd 78c2766689 journal-file: explicitly handle file systems that do not support hole punching 7ecfb4b098 journal-file: fix error handling of pread() in journald_file_punch_holes() c4946a412c journal-file: don't use pread() when determining where to append, use mmap as before d3fbd20628 journal: various fixes to journal_file_read_object() 5897a8e8d4 shared: Handle filesystems that don't support hole punching in COPY_HOLES 27746408e2 journal: Truncate file instead of punching hole in final object 59b6130030 shared: Ensure COPY_HOLES copies trailing holes ac9ccba73f journal: stat journal file after truncating 0257283444 journal: Copy holes when archiving BTRFS journal files 26c2a9952d shared: Copy holes in sparse files in copy_bytes_full() 6c7191dece copy: fix wrong argument passed to S_ISREG() in copy_file_fd_full() af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device ID (bsc#1195529) - Update Supplements to new format in baselibs.conf - Fix libsystemd-shared exclusion in baselibs.conf - Exclude new cryptsetup libraries in baselibs.conf - systemd.spec: minor simplification by assuming that %{bootstrap} is always defined. OBS-URL: https://build.opensuse.org/request/show/962458 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=352 --- ...conf-parser-introduce-early-drop-ins.patch | 142 +++++++++--------- ...and-var-lock-bind-mount-if-they-aren.patch | 10 +- ...twork.service-an-alias-of-systemd-ne.patch | 29 ---- ...-Pass-tty-to-use-by-agetty-via-stdin.patch | 90 +++++++++++ baselibs.conf | 5 +- files.container | 7 +- files.devel | 7 +- files.network | 9 ++ files.systemd | 103 ++++++++++--- files.udev | 9 +- systemd-v249.10+suse.86.g0bb1977021.tar.xz | 3 - systemd-v250.4+suse.35.g8ef8dfd540.tar.xz | 3 + systemd.changes | 70 +++++++++ systemd.spec | 58 ++++--- 14 files changed, 383 insertions(+), 162 deletions(-) delete mode 100644 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch create mode 100644 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch delete mode 100644 systemd-v249.10+suse.86.g0bb1977021.tar.xz create mode 100644 systemd-v250.4+suse.35.g8ef8dfd540.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index bf5a21d2..bcd96141 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,4 +1,4 @@ -From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001 +From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 48 ++++++++++-- - src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 195 insertions(+), 5 deletions(-) + src/shared/conf-parser.c | 48 +++++++++-- + src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 197 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index d0ac1b2660..cb453fa50d 100644 +index 1e1967d7ea..eb81732dfa 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -430,6 +430,7 @@ int config_parse( +@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, static int config_parse_many_files( const char* const* conf_files, @@ -77,20 +77,20 @@ index d0ac1b2660..cb453fa50d 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -442,6 +443,12 @@ static int config_parse_many_files( - char **fn; - int r; - +@@ -481,6 +482,12 @@ static int config_parse_many_files( + stats_by_path = hashmap_new(&path_hash_ops_free_free); + if (!stats_by_path) + return -ENOMEM; ++ } ++ + STRV_FOREACH(fn, early_files) { -+ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); + if (r < 0) + return r; -+ } -+ + } + /* First read the first found main config file. */ - STRV_FOREACH(fn, (char**) conf_files) { - r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); -@@ -464,6 +471,28 @@ static int config_parse_many_files( +@@ -521,6 +528,28 @@ static int config_parse_many_files( return 0; } @@ -119,9 +119,9 @@ index d0ac1b2660..cb453fa50d 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -475,15 +504,19 @@ int config_parse_many_nulstr( +@@ -532,15 +561,19 @@ int config_parse_many_nulstr( void *userdata, - usec_t *ret_mtime) { + Hashmap **ret_stats_by_path) { - _cleanup_strv_free_ char **files = NULL; + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; @@ -139,12 +139,12 @@ index d0ac1b2660..cb453fa50d 100644 + + return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files, + sections, lookup, table, flags, userdata, - ret_mtime); + ret_stats_by_path); } -@@ -499,8 +532,8 @@ int config_parse_many( +@@ -556,8 +589,8 @@ int config_parse_many( void *userdata, - usec_t *ret_mtime) { + Hashmap **ret_stats_by_path) { + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; _cleanup_strv_free_ char **dropin_dirs = NULL; @@ -152,22 +152,22 @@ index d0ac1b2660..cb453fa50d 100644 const char *suffix; int r; -@@ -513,7 +546,12 @@ int config_parse_many( +@@ -570,7 +603,12 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime); +- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + + return config_parse_many_files(conf_files, early_files, late_files, -+ sections, lookup, table, flags, userdata, ret_mtime); ++ sections, lookup, table, flags, userdata, ret_stats_by_path); } #define DEFINE_PARSER(type, vartype, conv_func) \ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 5da864347e..77d9f28a79 100644 +index e61932ab16..de408272f0 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -179,9 +179,9 @@ index 5da864347e..77d9f28a79 100644 +#include "rm-rf.h" #include "string-util.h" #include "strv.h" - #include "tmpfile-util.h" -@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) { - } + #include "tests.h" +@@ -391,4 +394,155 @@ TEST(config_parse) { + test_config_parse_one(i, config_file[i]); } +static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) { @@ -228,8 +228,8 @@ index 5da864347e..77d9f28a79 100644 + } +} + -+static void test_config_parse_many_one(bool nulstr, const char *main, char **conf_files, -+ const char *name, const char *early, const char *late) { ++static void test_config_parse_many_nulstr_one(bool nulstr, const char *main, char **conf_files, ++ const char *name, const char *early, const char *late) { + + _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL; + _cleanup_strv_free_ char **conf_dirs = NULL; @@ -281,67 +281,61 @@ index 5da864347e..77d9f28a79 100644 + assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); +} + -+static void test_config_parse_many(bool nulstr) { ++static void test_config_parse_many_nulstr(bool nulstr) { + log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : ""); + -+ test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL); ++ test_config_parse_many_nulstr_one(nulstr, NULL, NULL, NULL, NULL, NULL); + -+ test_config_parse_many_one(nulstr, -+ "dir/main.conf", NULL, -+ "dir/main.conf", NULL, NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/main.conf", NULL, ++ "dir/main.conf", NULL, NULL); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/__50-foo.conf"), -+ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/__50-foo.conf"), ++ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), -+ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), ++ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + + /* Early conf files should never override the main one whatever their + * priority/location. */ -+ test_config_parse_many_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), -+ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), ++ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); + + /* Late conf files always take precendence over the early conf files + * and the main one. */ -+ test_config_parse_many_one(nulstr, -+ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", -+ "dir2/10-foo.conf"), -+ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", ++ "dir2/10-foo.conf"), ++ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); +} + - int main(int argc, char **argv) { - unsigned i; - -@@ -407,5 +556,8 @@ int main(int argc, char **argv) { - for (i = 0; i < ELEMENTSOF(config_file); i++) - test_config_parse(i, config_file[i]); - -+ test_config_parse_many(true); -+ test_config_parse_many(false); ++TEST(config_parse_many) { ++ test_config_parse_many_nulstr(true); ++ test_config_parse_many_nulstr(false); ++} + - return 0; - } + DEFINE_TEST_MAIN(LOG_INFO); -- -2.26.2 +2.34.1 diff --git a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch index 8cdd1ce8..00e1cb09 100644 --- a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch +++ b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch @@ -1,4 +1,4 @@ -From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001 +From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 29 Oct 2012 13:01:20 +0000 Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they @@ -13,10 +13,10 @@ Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they create mode 100644 units/var-run.mount diff --git a/units/meson.build b/units/meson.build -index 17e9ead9c1..7b926f9f91 100644 +index a9bf28f6d9..739fd84d2c 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -160,6 +160,8 @@ units = [ +@@ -165,6 +165,8 @@ units = [ ['umount.target', ''], ['usb-gadget.target', ''], ['user.slice', ''], @@ -24,7 +24,7 @@ index 17e9ead9c1..7b926f9f91 100644 + ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'], ['var-lib-machines.mount', 'ENABLE_MACHINED', 'remote-fs.target.wants/ machines.target.wants/'], - ] + ['systemd-oomd.socket', 'ENABLE_OOMD'], diff --git a/units/var-lock.mount b/units/var-lock.mount new file mode 100644 index 0000000000..07277adac3 @@ -76,5 +76,5 @@ index 0000000000..ab4da424c9 +Type=bind +Options=bind -- -2.26.2 +2.34.1 diff --git a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch deleted file mode 100644 index cb8f69a8..00000000 --- a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001 -From: Pawel Wieczorkiewicz -Date: Tue, 2 Jun 2015 13:33:24 +0000 -Subject: [PATCH 07/11] networkd: make network.service an alias of - systemd-networkd.service - -NetworkManager and wicked does this already. This is needed by yast2 -and other parts of the system. - -[fixes boo#933092] ---- - units/systemd-networkd.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in -index ffa45ba049..6a5d0dea3c 100644 ---- a/units/systemd-networkd.service.in -+++ b/units/systemd-networkd.service.in -@@ -53,6 +53,7 @@ User=systemd-network - - [Install] - WantedBy=multi-user.target -+Alias=network.service - Also=systemd-networkd.socket - Alias=dbus-org.freedesktop.network1.service - --- -2.26.2 - diff --git a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch new file mode 100644 index 00000000..107b6553 --- /dev/null +++ b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch @@ -0,0 +1,90 @@ +From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 17 Mar 2022 11:35:33 +0100 +Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin" + +This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. +--- + units/console-getty.service.in | 4 +--- + units/container-getty@.service.in | 4 +--- + units/getty@.service.in | 4 +--- + units/serial-getty@.service.in | 4 +--- + 4 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/units/console-getty.service.in b/units/console-getty.service.in +index 73871d6f50..bb67541dce 100644 +--- a/units/console-getty.service.in ++++ b/units/console-getty.service.in +@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM + Type=idle + Restart=always + UtmpIdentifier=cons +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/console + TTYReset=yes + TTYVHangup=yes +diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in +index a6e3f94e2a..ed1eb7bde1 100644 +--- a/units/container-getty@.service.in ++++ b/units/container-getty@.service.in +@@ -28,13 +28,11 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM + Type=idle + Restart=always + RestartSec=0 + UtmpIdentifier=pts/%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/pts/%I + TTYReset=yes + TTYVHangup=yes +diff --git a/units/getty@.service.in b/units/getty@.service.in +index 21d66f9367..78deb7cffe 100644 +--- a/units/getty@.service.in ++++ b/units/getty@.service.in +@@ -38,13 +38,11 @@ ConditionPathExists=/dev/tty0 + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM + Type=idle + Restart=always + RestartSec=0 + UtmpIdentifier=%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/%I + TTYReset=yes + TTYVHangup=yes +diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in +index 2433124c55..bb7af3105d 100644 +--- a/units/serial-getty@.service.in ++++ b/units/serial-getty@.service.in +@@ -33,12 +33,10 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 %I $TERM + Type=idle + Restart=always + UtmpIdentifier=%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/%I + TTYReset=yes + TTYVHangup=yes +-- +2.34.1 + diff --git a/baselibs.conf b/baselibs.conf index 4e056067..d8badad8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,9 +2,10 @@ # https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart # systemd - supplements "packageand(systemd:pam-)" + supplements "(systemd and pam-)" -/lib/systemd/system/ - -/usr/lib/systemd/libsystemd-shared.*\.so + -/usr/lib/systemd + -/usr/lib/cryptsetup post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 diff --git a/files.container b/files.container index faac2676..cae9352f 100644 --- a/files.container +++ b/files.container @@ -3,7 +3,7 @@ # %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn %{_mandir}/man1/systemd-nspawn.1.gz @@ -17,6 +17,9 @@ %dir %{_unitdir}/machines.target.wants %{_bindir}/machinectl %{_datadir}/bash-completion/completions/machinectl +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Image.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy @@ -40,6 +43,8 @@ %endif %if %{with importd} +%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Transfer.xml %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy diff --git a/files.devel b/files.devel index e551dc7f..7cd0b082 100644 --- a/files.devel +++ b/files.devel @@ -7,7 +7,7 @@ %{_libdir}/libudev.so %{_libdir}/pkgconfig/libsystemd.pc %{_libdir}/pkgconfig/libudev.pc -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man3/SD_ALERT.3.gz %{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz %{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz @@ -55,6 +55,7 @@ %{_mandir}/man3/SD_BUS_PROPERTY.3.gz %{_mandir}/man3/SD_BUS_SIGNAL.3.gz %{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.3.gz +%{_mandir}/man3/SD_BUS_VTABLE_CAPABILITY.3.gz %{_mandir}/man3/SD_BUS_VTABLE_END.3.gz %{_mandir}/man3/SD_BUS_VTABLE_START.3.gz %{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz @@ -84,6 +85,8 @@ %{_mandir}/man3/SD_ID128_MAKE_STR.3.gz %{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz %{_mandir}/man3/SD_ID128_NULL.3.gz +%{_mandir}/man3/SD_ID128_STRING_MAX.3.gz +%{_mandir}/man3/SD_ID128_TO_STRING.3.gz %{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz %{_mandir}/man3/SD_INFO.3.gz %{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz @@ -426,6 +429,7 @@ %{_mandir}/man3/sd_event_add_defer.3.gz %{_mandir}/man3/sd_event_add_exit.3.gz %{_mandir}/man3/sd_event_add_inotify.3.gz +%{_mandir}/man3/sd_event_add_inotify_fd.3.gz %{_mandir}/man3/sd_event_add_io.3.gz %{_mandir}/man3/sd_event_add_post.3.gz %{_mandir}/man3/sd_event_add_signal.3.gz @@ -495,6 +499,7 @@ %{_mandir}/man3/sd_event_source_set_prepare.3.gz %{_mandir}/man3/sd_event_source_set_priority.3.gz %{_mandir}/man3/sd_event_source_set_ratelimit.3.gz +%{_mandir}/man3/sd_event_source_set_ratelimit_expire_callback.3.gz %{_mandir}/man3/sd_event_source_set_time.3.gz %{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz %{_mandir}/man3/sd_event_source_set_time_relative.3.gz diff --git a/files.network b/files.network index 4118d63d..9e3f698c 100644 --- a/files.network +++ b/files.network @@ -7,6 +7,10 @@ %dir %{_systemd_util_dir}/network %{_bindir}/networkctl %{_datadir}/bash-completion/completions/networkctl +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Link.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Network.xml %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy @@ -15,11 +19,13 @@ %{_mandir}/man1/networkctl.1.gz %{_mandir}/man5/networkd.conf.5.gz %{_mandir}/man5/networkd.conf.d.5.gz +%{_mandir}/man5/org.freedesktop.network1.5.gz %{_mandir}/man5/systemd.network.5.gz %{_mandir}/man8/systemd-networkd-wait-online.8.gz %{_mandir}/man8/systemd-networkd-wait-online.service.8.gz %{_mandir}/man8/systemd-networkd.8.gz %{_mandir}/man8/systemd-networkd.service.8.gz +%{_systemd_util_dir}/network/80-6rd-tunnel.network %{_systemd_util_dir}/network/80-container-host0.network %{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-vz.network @@ -40,6 +46,9 @@ %{_bindir}/systemd-resolve %{_datadir}/bash-completion/completions/resolvectl %{_datadir}/bash-completion/completions/systemd-resolve +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy diff --git a/files.systemd b/files.systemd index 8f0f173d..b919c2af 100644 --- a/files.systemd +++ b/files.systemd @@ -8,11 +8,12 @@ %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf %dir %{_binfmtdir} -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %endif %dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/interfaces %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %dir %{_datadir}/dbus-1/system.d @@ -20,14 +21,15 @@ %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions %dir %{_datadir}/systemd -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %endif -%dir %{xinitconfdir} -%dir %{xinitconfdir}/xinitrc.d %dir %{_environmentdir} %dir %{_journalcatalogdir} +%if ! %{bootstrap} +%dir %{_libdir}/cryptsetup +%endif %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} @@ -82,6 +84,8 @@ %dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sysinit.target.wants %dir %{_unitdir}/timers.target.wants +%dir %{xinitconfdir} +%dir %{xinitconfdir}/xinitrc.d %doc %{_modprobedir}/README %doc %{_sysctldir}/README %doc %{_sysusersdir}/README @@ -113,7 +117,8 @@ %{_bindir}/systemd-cat %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop -%if ! 0%{?bootstrap} +%{_bindir}/systemd-creds +%if ! %{bootstrap} %{_bindir}/systemd-cryptenroll %endif %{_bindir}/systemd-delta @@ -136,7 +141,7 @@ %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-umount %{_bindir}/timedatectl -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %if %{with sd_boot} %{_datadir}/bash-completion/completions/bootctl %endif @@ -160,6 +165,29 @@ %{_datadir}/bash-completion/completions/systemd-run %{_datadir}/bash-completion/completions/timedatectl %endif +# dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294 +%{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Seat.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Session.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.User.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Scope.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Slice.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service @@ -181,7 +209,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %if %{with sd_boot} %{_datadir}/zsh/site-functions/_bootctl %endif @@ -205,7 +233,6 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif -%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog @@ -220,6 +247,11 @@ %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if ! 0%{bootstrap} +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%endif +%if ! 0%{bootstrap} %if %{with sd_boot} %{_mandir}/man1/bootctl.1.gz %endif @@ -235,6 +267,7 @@ %{_mandir}/man1/systemd-cat.1.gz %{_mandir}/man1/systemd-cgls.1.gz %{_mandir}/man1/systemd-cgtop.1.gz +%{_mandir}/man1/systemd-creds.1.gz %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man1/systemd-delta.1.gz %{_mandir}/man1/systemd-detect-virt.1.gz @@ -250,6 +283,7 @@ %{_mandir}/man1/systemd-path.1.gz %{_mandir}/man1/systemd-run.1.gz %{_mandir}/man1/systemd-socket-activate.1.gz +%{_mandir}/man1/systemd-stdio-bridge.1.gz %{_mandir}/man1/systemd-tty-ask-password-agent.1.gz %{_mandir}/man1/systemd-umount.1.gz %{_mandir}/man1/systemd.1.gz @@ -258,8 +292,10 @@ %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/environment.d.5.gz +%{_mandir}/man5/extension-release.5.gz %{_mandir}/man5/hostname.5.gz %{_mandir}/man5/initrd-release.5.gz +%{_mandir}/man5/integritytab.5.gz %{_mandir}/man5/journald.conf.5.gz %{_mandir}/man5/journald.conf.d.5.gz %{_mandir}/man5/journald@.conf.5.gz @@ -323,8 +359,12 @@ %{_mandir}/man7/file-hierarchy.7.gz %{_mandir}/man7/kernel-command-line.7.gz %if %{with sd_boot} +%{_mandir}/man7/linuxaa64.efi.stub.7.gz +%{_mandir}/man7/linuxia32.efi.stub.7.gz +%{_mandir}/man7/linuxx64.efi.stub.7.gz %{_mandir}/man7/sd-boot.7.gz %{_mandir}/man7/systemd-boot.7.gz +%{_mandir}/man7/systemd-stub.7.gz %endif %{_mandir}/man7/systemd.directives.7.gz %{_mandir}/man7/systemd.environment-generator.7.gz @@ -383,6 +423,9 @@ %{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz +%{_mandir}/man8/systemd-integritysetup-generator.8.gz +%{_mandir}/man8/systemd-integritysetup.8.gz +%{_mandir}/man8/systemd-integritysetup@.service.8.gz %{_mandir}/man8/systemd-journald-audit.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz @@ -455,7 +498,7 @@ %{_modprobedir}/systemd.conf %{_pam_moduledir}/pam_systemd.so %{_pam_vendordir}/systemd-user -%{_prefix}/lib/kernel/install.d/00-entry-directory.install +%{_prefix}/lib/kernel/install.conf %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_sbindir}/halt @@ -472,7 +515,7 @@ %{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/systemd-boot*.efi %endif -%{_systemd_util_dir}/libsystemd-shared-249.so +%{_systemd_util_dir}/libsystemd-shared-250.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh @@ -486,13 +529,16 @@ %endif %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemd_util_dir}/systemd-cryptsetup %endif %{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-integritysetup +%endif %{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-logind @@ -516,7 +562,7 @@ %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions %{_systemd_util_dir}/systemd-vconsole-setup -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemd_util_dir}/systemd-veritysetup %endif %{_systemd_util_dir}/systemd-volatile-root @@ -548,7 +594,7 @@ %if %{with sd_boot} %{_systemdgeneratordir}/systemd-bless-boot-generator %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemdgeneratordir}/systemd-cryptsetup-generator %endif %{_systemdgeneratordir}/systemd-debug-generator @@ -556,9 +602,12 @@ %{_systemdgeneratordir}/systemd-getty-generator %{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator +%if ! %{bootstrap} +%{_systemdgeneratordir}/systemd-integritysetup-generator +%endif %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemdgeneratordir}/systemd-veritysetup-generator %endif %{_sysusersdir}/systemd-journal.conf @@ -586,7 +635,7 @@ %{_unitdir}/boot-complete.target %{_unitdir}/console-getty.service %{_unitdir}/container-getty@.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/cryptsetup-pre.target %{_unitdir}/cryptsetup.target %endif @@ -602,6 +651,7 @@ %{_unitdir}/emergency.service %{_unitdir}/emergency.target %{_unitdir}/exit.target +%{_unitdir}/factory-reset.target %{_unitdir}/final.target %{_unitdir}/first-boot-complete.target %{_unitdir}/getty-pre.target @@ -615,7 +665,7 @@ %{_unitdir}/initrd-fs.target %{_unitdir}/initrd-parse-etc.service %{_unitdir}/initrd-root-device.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target %endif @@ -624,6 +674,10 @@ %{_unitdir}/initrd-switch-root.target %{_unitdir}/initrd-usr-fs.target %{_unitdir}/initrd.target +%if ! %{bootstrap} +%{_unitdir}/integritysetup-pre.target +%{_unitdir}/integritysetup.target +%endif %{_unitdir}/kexec.target %{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs.target @@ -646,12 +700,12 @@ %{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/quotaon.service %{_unitdir}/reboot.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/remote-cryptsetup.target %endif %{_unitdir}/remote-fs-pre.target %{_unitdir}/remote-fs.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/remote-veritysetup.target %endif %{_unitdir}/rescue.service @@ -675,11 +729,14 @@ %{_unitdir}/sys-kernel-debug.mount %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/sysinit.target.wants/cryptsetup.target %endif %{_unitdir}/sysinit.target.wants/dev-hugepages.mount %{_unitdir}/sysinit.target.wants/dev-mqueue.mount +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/integritysetup.target +%endif %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount @@ -703,11 +760,11 @@ %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service %{_unitdir}/sysinit.target.wants/systemd-update-utmp.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/sysinit.target.wants/veritysetup.target %endif %{_unitdir}/syslog.socket -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/system-update-cleanup.service @@ -725,6 +782,7 @@ %{_unitdir}/systemd-boot-check-no-failures.service %if %{with sd_boot} %{_unitdir}/systemd-boot-system-token.service +%{_unitdir}/systemd-boot-update.service %endif %{_unitdir}/systemd-exit.service %{_unitdir}/systemd-firstboot.service @@ -784,10 +842,11 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/veritysetup-pre.target %{_unitdir}/veritysetup.target %endif +%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %if %{with split_usr} /bin/systemctl /sbin/halt diff --git a/files.udev b/files.udev index 4f75bcc9..52a309e6 100644 --- a/files.udev +++ b/files.udev @@ -14,14 +14,14 @@ %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %{_bindir}/systemd-hwdb %{_bindir}/udevadm -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/zsh/site-functions/_udevadm %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man5/udev.conf.5.gz %{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/udev.7.gz @@ -70,6 +70,8 @@ %{_udevhwdbdir}/60-keyboard.hwdb %{_udevhwdbdir}/60-seat.hwdb %{_udevhwdbdir}/60-sensor.hwdb +%{_udevhwdbdir}/70-analyzers.hwdb +%{_udevhwdbdir}/70-cameras.hwdb %{_udevhwdbdir}/70-joystick.hwdb %{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/70-pointingstick.hwdb @@ -92,6 +94,7 @@ %{_udevrulesdir}/60-serial.rules %{_udevrulesdir}/61-persistent-storage-compat.rules %{_udevrulesdir}/64-btrfs.rules +%{_udevrulesdir}/70-camera.rules %{_udevrulesdir}/70-joystick.rules %ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips %{_udevrulesdir}/70-memory.rules diff --git a/systemd-v249.10+suse.86.g0bb1977021.tar.xz b/systemd-v249.10+suse.86.g0bb1977021.tar.xz deleted file mode 100644 index fdcaf7f0..00000000 --- a/systemd-v249.10+suse.86.g0bb1977021.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812 -size 7281992 diff --git a/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz new file mode 100644 index 00000000..d2bee6fe --- /dev/null +++ b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed75c74660149af8a8fe454169f9cd295aa329c2638d2de8474d8eed869112d5 +size 7626056 diff --git a/systemd.changes b/systemd.changes index 7c998920..82a330ca 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,73 @@ +------------------------------------------------------------------- +Thu Mar 17 10:38:16 UTC 2022 - Franck Bui + +- Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch + + A temporary workaround until bsc#1197178 is resolved. + +------------------------------------------------------------------- +Wed Mar 16 20:50:35 UTC 2022 - Franck Bui + +- Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a...8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 + +------------------------------------------------------------------- +Wed Mar 16 20:36:36 UTC 2022 - Franck Bui + +- Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a + + 37b683c832 journal: preserve acls when rotating user journals with NOCOW attribute set + d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd + 78c2766689 journal-file: explicitly handle file systems that do not support hole punching + 7ecfb4b098 journal-file: fix error handling of pread() in journald_file_punch_holes() + c4946a412c journal-file: don't use pread() when determining where to append, use mmap as before + d3fbd20628 journal: various fixes to journal_file_read_object() + 5897a8e8d4 shared: Handle filesystems that don't support hole punching in COPY_HOLES + 27746408e2 journal: Truncate file instead of punching hole in final object + 59b6130030 shared: Ensure COPY_HOLES copies trailing holes + ac9ccba73f journal: stat journal file after truncating + 0257283444 journal: Copy holes when archiving BTRFS journal files + 26c2a9952d shared: Copy holes in sparse files in copy_bytes_full() + 6c7191dece copy: fix wrong argument passed to S_ISREG() in copy_file_fd_full() + af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device ID (bsc#1195529) + +------------------------------------------------------------------- +Sat Mar 12 12:57:26 UTC 2022 - Callum Farmer + +- Update Supplements to new format in baselibs.conf +- Fix libsystemd-shared exclusion in baselibs.conf +- Exclude new cryptsetup libraries in baselibs.conf + +------------------------------------------------------------------- +Tue Mar 8 19:08:03 UTC 2022 - Franck Bui + +- systemd.spec: minor simplification by assuming that %{bootstrap} is always + defined. + +------------------------------------------------------------------- +Tue Mar 8 17:50:57 UTC 2022 - Franck Bui + +- Make sure to create 'systemd-coredump' system user when systemd-coredump is + installed (follow-up for the split of the sysusers config files). + +------------------------------------------------------------------- +Tue Mar 8 09:41:42 UTC 2022 - Franck Bui + +- Upgrade to v250.3 (commit dbd8bd2b9fd827ca89ed18034b60703c95798e01) + + See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for + details. + + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch + 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch + +- Dropped 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch + + The alias makes little sense as soon as multiple network managers are used in + parallel. + ------------------------------------------------------------------- Tue Mar 8 07:41:41 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 31ea93ca..c1daf61f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.86.g0bb1977021 +%define suse_version +suse.35.g8ef8dfd540 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -37,7 +37,7 @@ %define __when_2() %{expand:%%{?with_%{1}:%{2}}%%{!?with_%{1}:false}} %define when() %{expand:%%__when_%# %{*}} -%if 0%{?bootstrap} +%if %{bootstrap} %bcond_with coredump %bcond_with importd %bcond_with journal_remote @@ -71,12 +71,12 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.10 +Version: 250.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if ! 0%{?bootstrap} +%if ! %{bootstrap} BuildRequires: docbook-xsl-stylesheets BuildRequires: kbd BuildRequires: libapparmor-devel @@ -132,7 +132,7 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 BuildRequires: gnu-efi %endif -%if 0%{?bootstrap} +%if %{bootstrap} #!BuildIgnore: dbus-1 Provides: systemd = %{version}-%{release} Conflicts: systemd @@ -215,12 +215,16 @@ 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 -Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +%if %{with sysvcompat} Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +%endif Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch 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 + # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git # repository. But in very few cases, some stuff might be broken in @@ -241,7 +245,7 @@ drop-in replacement for sysvinit. %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: systemd-doc Requires: this-is-only-for-build-envs %else @@ -259,7 +263,7 @@ Requires: libudev%{?mini}1 = %{version}-%{release} Requires: systemd-rpm-macros Provides: libudev%{?mini}-devel = %{version}-%{release} Obsoletes: libudev%{?mini}-devel < %{version}-%{release} -%if 0%{?bootstrap} +%if %{bootstrap} Provides: systemd-devel = %{version}-%{release} Conflicts: systemd-devel Provides: libudev-devel = %{version}-%{release} @@ -292,7 +296,7 @@ Please note that the content of this package is considered as deprecated. %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: kiwi Conflicts: libsystemd0 Provides: libsystemd0 = %{version}-%{release} @@ -338,7 +342,7 @@ Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: udev Provides: udev = %{version}-%{release} %endif @@ -353,7 +357,7 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: kiwi Conflicts: libudev1 Provides: libudev1 = %{version}-%{release} @@ -387,7 +391,7 @@ Obsoletes: nss-mymachines < %{version}-%{release} Provides: nss-mymachines = %{version}-%{release} Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: systemd-container Provides: systemd-container = %{version}-%{release} %endif @@ -458,7 +462,7 @@ http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -625,7 +629,7 @@ The package contains: homed, pstore, repart, userdbd. Have fun with these services at your own risk. %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %lang_package %endif @@ -670,7 +674,7 @@ Have fun with these services at your own risk. -Dima=false \ -Delfutils=auto \ -Doomd=false \ -%if 0%{?bootstrap} +%if %{bootstrap} -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ -Dtranslations=false \ @@ -690,6 +694,7 @@ Have fun with these services at your own risk. \ -Defi=%{when sd_boot} \ -Dgnu-efi=%{when sd_boot} \ + -Dsbat-distro= \ \ -Dresolve=%{when resolved} \ -Ddns-servers='' \ @@ -913,7 +918,7 @@ rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %find_lang systemd %endif @@ -942,7 +947,7 @@ if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then chmod 444 %{_sysconfdir}/machine-id fi -%if ! 0%{?bootstrap} +%if ! %{bootstrap} pam-config --add --systemd || : %endif @@ -1125,7 +1130,12 @@ fi %ldconfig %endif -%if ! 0%{?bootstrap} +%if %{with coredump} +%post coredump +%sysusers_create systemd-coredump.conf +%endif + +%if ! %{bootstrap} %ldconfig_scriptlets -n nss-myhostname %ldconfig_scriptlets -n nss-systemd %endif @@ -1270,13 +1280,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.32.0 +%{_libdir}/libsystemd.so.0.33.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.2 +%{_libdir}/libudev.so.1.7.3 %if %{with coredump} %files coredump @@ -1289,14 +1299,14 @@ fi %{_sysusersdir}/systemd-coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man1/coredumpctl* %{_mandir}/man5/coredump.conf* %{_mandir}/man8/systemd-coredump* %endif %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %files lang -f systemd.lang %files -n nss-myhostname @@ -1383,6 +1393,10 @@ fi %{_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 From 65d268d7746af2f050784a6116be287626fe147f6c000afaa4bee50b48b82408 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 19 Mar 2022 10:56:42 +0000 Subject: [PATCH 095/124] https://bugzilla.opensuse.org/show_bug.cgi?id=1197309 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=353 --- ...conf-parser-introduce-early-drop-ins.patch | 142 +++++++++--------- ...and-var-lock-bind-mount-if-they-aren.patch | 10 +- ...twork.service-an-alias-of-systemd-ne.patch | 29 ++++ ...-Pass-tty-to-use-by-agetty-via-stdin.patch | 90 ----------- baselibs.conf | 5 +- files.container | 7 +- files.devel | 7 +- files.network | 9 -- files.systemd | 103 +++---------- files.udev | 9 +- systemd-v249.10+suse.86.g0bb1977021.tar.xz | 3 + systemd-v250.4+suse.35.g8ef8dfd540.tar.xz | 3 - systemd.changes | 70 --------- systemd.spec | 58 +++---- 14 files changed, 162 insertions(+), 383 deletions(-) create mode 100644 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch delete mode 100644 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch create mode 100644 systemd-v249.10+suse.86.g0bb1977021.tar.xz delete mode 100644 systemd-v250.4+suse.35.g8ef8dfd540.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index bcd96141..bf5a21d2 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,4 +1,4 @@ -From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001 +From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 48 +++++++++-- - src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 197 insertions(+), 5 deletions(-) + src/shared/conf-parser.c | 48 ++++++++++-- + src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 195 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 1e1967d7ea..eb81732dfa 100644 +index d0ac1b2660..cb453fa50d 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, +@@ -430,6 +430,7 @@ int config_parse( static int config_parse_many_files( const char* const* conf_files, @@ -77,20 +77,20 @@ index 1e1967d7ea..eb81732dfa 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -481,6 +482,12 @@ static int config_parse_many_files( - stats_by_path = hashmap_new(&path_hash_ops_free_free); - if (!stats_by_path) - return -ENOMEM; -+ } -+ +@@ -442,6 +443,12 @@ static int config_parse_many_files( + char **fn; + int r; + + STRV_FOREACH(fn, early_files) { -+ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); + if (r < 0) + return r; - } - ++ } ++ /* First read the first found main config file. */ -@@ -521,6 +528,28 @@ static int config_parse_many_files( + STRV_FOREACH(fn, (char**) conf_files) { + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); +@@ -464,6 +471,28 @@ static int config_parse_many_files( return 0; } @@ -119,9 +119,9 @@ index 1e1967d7ea..eb81732dfa 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -532,15 +561,19 @@ int config_parse_many_nulstr( +@@ -475,15 +504,19 @@ int config_parse_many_nulstr( void *userdata, - Hashmap **ret_stats_by_path) { + usec_t *ret_mtime) { - _cleanup_strv_free_ char **files = NULL; + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; @@ -139,12 +139,12 @@ index 1e1967d7ea..eb81732dfa 100644 + + return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files, + sections, lookup, table, flags, userdata, - ret_stats_by_path); + ret_mtime); } -@@ -556,8 +589,8 @@ int config_parse_many( +@@ -499,8 +532,8 @@ int config_parse_many( void *userdata, - Hashmap **ret_stats_by_path) { + usec_t *ret_mtime) { + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; _cleanup_strv_free_ char **dropin_dirs = NULL; @@ -152,22 +152,22 @@ index 1e1967d7ea..eb81732dfa 100644 const char *suffix; int r; -@@ -570,7 +603,12 @@ int config_parse_many( +@@ -513,7 +546,12 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); +- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime); + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + + return config_parse_many_files(conf_files, early_files, late_files, -+ sections, lookup, table, flags, userdata, ret_stats_by_path); ++ sections, lookup, table, flags, userdata, ret_mtime); } #define DEFINE_PARSER(type, vartype, conv_func) \ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index e61932ab16..de408272f0 100644 +index 5da864347e..77d9f28a79 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -179,9 +179,9 @@ index e61932ab16..de408272f0 100644 +#include "rm-rf.h" #include "string-util.h" #include "strv.h" - #include "tests.h" -@@ -391,4 +394,155 @@ TEST(config_parse) { - test_config_parse_one(i, config_file[i]); + #include "tmpfile-util.h" +@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) { + } } +static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) { @@ -228,8 +228,8 @@ index e61932ab16..de408272f0 100644 + } +} + -+static void test_config_parse_many_nulstr_one(bool nulstr, const char *main, char **conf_files, -+ const char *name, const char *early, const char *late) { ++static void test_config_parse_many_one(bool nulstr, const char *main, char **conf_files, ++ const char *name, const char *early, const char *late) { + + _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL; + _cleanup_strv_free_ char **conf_dirs = NULL; @@ -281,61 +281,67 @@ index e61932ab16..de408272f0 100644 + assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); +} + -+static void test_config_parse_many_nulstr(bool nulstr) { ++static void test_config_parse_many(bool nulstr) { + log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : ""); + -+ test_config_parse_many_nulstr_one(nulstr, NULL, NULL, NULL, NULL, NULL); ++ test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL); + -+ test_config_parse_many_nulstr_one(nulstr, -+ "dir/main.conf", NULL, -+ "dir/main.conf", NULL, NULL); ++ test_config_parse_many_one(nulstr, ++ "dir/main.conf", NULL, ++ "dir/main.conf", NULL, NULL); + -+ test_config_parse_many_nulstr_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_nulstr_one(nulstr, -+ NULL, STRV_MAKE("dir1/__50-foo.conf"), -+ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/__50-foo.conf"), ++ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); + -+ test_config_parse_many_nulstr_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), -+ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), ++ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); + -+ test_config_parse_many_nulstr_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_nulstr_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + + /* Early conf files should never override the main one whatever their + * priority/location. */ -+ test_config_parse_many_nulstr_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), -+ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); ++ test_config_parse_many_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), ++ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); + + /* Late conf files always take precendence over the early conf files + * and the main one. */ -+ test_config_parse_many_nulstr_one(nulstr, -+ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_one(nulstr, ++ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + -+ test_config_parse_many_nulstr_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", -+ "dir2/10-foo.conf"), -+ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); ++ test_config_parse_many_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", ++ "dir2/10-foo.conf"), ++ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); +} + -+TEST(config_parse_many) { -+ test_config_parse_many_nulstr(true); -+ test_config_parse_many_nulstr(false); -+} + int main(int argc, char **argv) { + unsigned i; + +@@ -407,5 +556,8 @@ int main(int argc, char **argv) { + for (i = 0; i < ELEMENTSOF(config_file); i++) + test_config_parse(i, config_file[i]); + ++ test_config_parse_many(true); ++ test_config_parse_many(false); + - DEFINE_TEST_MAIN(LOG_INFO); + return 0; + } -- -2.34.1 +2.26.2 diff --git a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch index 00e1cb09..8cdd1ce8 100644 --- a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch +++ b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch @@ -1,4 +1,4 @@ -From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001 +From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 29 Oct 2012 13:01:20 +0000 Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they @@ -13,10 +13,10 @@ Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they create mode 100644 units/var-run.mount diff --git a/units/meson.build b/units/meson.build -index a9bf28f6d9..739fd84d2c 100644 +index 17e9ead9c1..7b926f9f91 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -165,6 +165,8 @@ units = [ +@@ -160,6 +160,8 @@ units = [ ['umount.target', ''], ['usb-gadget.target', ''], ['user.slice', ''], @@ -24,7 +24,7 @@ index a9bf28f6d9..739fd84d2c 100644 + ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'], ['var-lib-machines.mount', 'ENABLE_MACHINED', 'remote-fs.target.wants/ machines.target.wants/'], - ['systemd-oomd.socket', 'ENABLE_OOMD'], + ] diff --git a/units/var-lock.mount b/units/var-lock.mount new file mode 100644 index 0000000000..07277adac3 @@ -76,5 +76,5 @@ index 0000000000..ab4da424c9 +Type=bind +Options=bind -- -2.34.1 +2.26.2 diff --git a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch new file mode 100644 index 00000000..cb8f69a8 --- /dev/null +++ b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch @@ -0,0 +1,29 @@ +From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001 +From: Pawel Wieczorkiewicz +Date: Tue, 2 Jun 2015 13:33:24 +0000 +Subject: [PATCH 07/11] networkd: make network.service an alias of + systemd-networkd.service + +NetworkManager and wicked does this already. This is needed by yast2 +and other parts of the system. + +[fixes boo#933092] +--- + units/systemd-networkd.service.in | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in +index ffa45ba049..6a5d0dea3c 100644 +--- a/units/systemd-networkd.service.in ++++ b/units/systemd-networkd.service.in +@@ -53,6 +53,7 @@ User=systemd-network + + [Install] + WantedBy=multi-user.target ++Alias=network.service + Also=systemd-networkd.socket + Alias=dbus-org.freedesktop.network1.service + +-- +2.26.2 + diff --git a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch deleted file mode 100644 index 107b6553..00000000 --- a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 17 Mar 2022 11:35:33 +0100 -Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin" - -This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. ---- - units/console-getty.service.in | 4 +--- - units/container-getty@.service.in | 4 +--- - units/getty@.service.in | 4 +--- - units/serial-getty@.service.in | 4 +--- - 4 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/units/console-getty.service.in b/units/console-getty.service.in -index 73871d6f50..bb67541dce 100644 ---- a/units/console-getty.service.in -+++ b/units/console-getty.service.in -@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM - Type=idle - Restart=always - UtmpIdentifier=cons --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/console - TTYReset=yes - TTYVHangup=yes -diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in -index a6e3f94e2a..ed1eb7bde1 100644 ---- a/units/container-getty@.service.in -+++ b/units/container-getty@.service.in -@@ -28,13 +28,11 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM - Type=idle - Restart=always - RestartSec=0 - UtmpIdentifier=pts/%I --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/pts/%I - TTYReset=yes - TTYVHangup=yes -diff --git a/units/getty@.service.in b/units/getty@.service.in -index 21d66f9367..78deb7cffe 100644 ---- a/units/getty@.service.in -+++ b/units/getty@.service.in -@@ -38,13 +38,11 @@ ConditionPathExists=/dev/tty0 - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM - Type=idle - Restart=always - RestartSec=0 - UtmpIdentifier=%I --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/%I - TTYReset=yes - TTYVHangup=yes -diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in -index 2433124c55..bb7af3105d 100644 ---- a/units/serial-getty@.service.in -+++ b/units/serial-getty@.service.in -@@ -33,12 +33,10 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 - $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 %I $TERM - Type=idle - Restart=always - UtmpIdentifier=%I --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/%I - TTYReset=yes - TTYVHangup=yes --- -2.34.1 - diff --git a/baselibs.conf b/baselibs.conf index d8badad8..4e056067 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,10 +2,9 @@ # https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart # systemd - supplements "(systemd and pam-)" + supplements "packageand(systemd:pam-)" -/lib/systemd/system/ - -/usr/lib/systemd - -/usr/lib/cryptsetup + -/usr/lib/systemd/libsystemd-shared.*\.so post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 diff --git a/files.container b/files.container index cae9352f..faac2676 100644 --- a/files.container +++ b/files.container @@ -3,7 +3,7 @@ # %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn %{_mandir}/man1/systemd-nspawn.1.gz @@ -17,9 +17,6 @@ %dir %{_unitdir}/machines.target.wants %{_bindir}/machinectl %{_datadir}/bash-completion/completions/machinectl -%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Image.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy @@ -43,8 +40,6 @@ %endif %if %{with importd} -%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Manager.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Transfer.xml %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy diff --git a/files.devel b/files.devel index 7cd0b082..e551dc7f 100644 --- a/files.devel +++ b/files.devel @@ -7,7 +7,7 @@ %{_libdir}/libudev.so %{_libdir}/pkgconfig/libsystemd.pc %{_libdir}/pkgconfig/libudev.pc -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_mandir}/man3/SD_ALERT.3.gz %{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz %{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz @@ -55,7 +55,6 @@ %{_mandir}/man3/SD_BUS_PROPERTY.3.gz %{_mandir}/man3/SD_BUS_SIGNAL.3.gz %{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.3.gz -%{_mandir}/man3/SD_BUS_VTABLE_CAPABILITY.3.gz %{_mandir}/man3/SD_BUS_VTABLE_END.3.gz %{_mandir}/man3/SD_BUS_VTABLE_START.3.gz %{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz @@ -85,8 +84,6 @@ %{_mandir}/man3/SD_ID128_MAKE_STR.3.gz %{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz %{_mandir}/man3/SD_ID128_NULL.3.gz -%{_mandir}/man3/SD_ID128_STRING_MAX.3.gz -%{_mandir}/man3/SD_ID128_TO_STRING.3.gz %{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz %{_mandir}/man3/SD_INFO.3.gz %{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz @@ -429,7 +426,6 @@ %{_mandir}/man3/sd_event_add_defer.3.gz %{_mandir}/man3/sd_event_add_exit.3.gz %{_mandir}/man3/sd_event_add_inotify.3.gz -%{_mandir}/man3/sd_event_add_inotify_fd.3.gz %{_mandir}/man3/sd_event_add_io.3.gz %{_mandir}/man3/sd_event_add_post.3.gz %{_mandir}/man3/sd_event_add_signal.3.gz @@ -499,7 +495,6 @@ %{_mandir}/man3/sd_event_source_set_prepare.3.gz %{_mandir}/man3/sd_event_source_set_priority.3.gz %{_mandir}/man3/sd_event_source_set_ratelimit.3.gz -%{_mandir}/man3/sd_event_source_set_ratelimit_expire_callback.3.gz %{_mandir}/man3/sd_event_source_set_time.3.gz %{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz %{_mandir}/man3/sd_event_source_set_time_relative.3.gz diff --git a/files.network b/files.network index 9e3f698c..4118d63d 100644 --- a/files.network +++ b/files.network @@ -7,10 +7,6 @@ %dir %{_systemd_util_dir}/network %{_bindir}/networkctl %{_datadir}/bash-completion/completions/networkctl -%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Link.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Manager.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Network.xml %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy @@ -19,13 +15,11 @@ %{_mandir}/man1/networkctl.1.gz %{_mandir}/man5/networkd.conf.5.gz %{_mandir}/man5/networkd.conf.d.5.gz -%{_mandir}/man5/org.freedesktop.network1.5.gz %{_mandir}/man5/systemd.network.5.gz %{_mandir}/man8/systemd-networkd-wait-online.8.gz %{_mandir}/man8/systemd-networkd-wait-online.service.8.gz %{_mandir}/man8/systemd-networkd.8.gz %{_mandir}/man8/systemd-networkd.service.8.gz -%{_systemd_util_dir}/network/80-6rd-tunnel.network %{_systemd_util_dir}/network/80-container-host0.network %{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-vz.network @@ -46,9 +40,6 @@ %{_bindir}/systemd-resolve %{_datadir}/bash-completion/completions/resolvectl %{_datadir}/bash-completion/completions/systemd-resolve -%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy diff --git a/files.systemd b/files.systemd index b919c2af..8f0f173d 100644 --- a/files.systemd +++ b/files.systemd @@ -8,12 +8,11 @@ %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf %dir %{_binfmtdir} -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %endif %dir %{_datadir}/dbus-1 -%dir %{_datadir}/dbus-1/interfaces %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %dir %{_datadir}/dbus-1/system.d @@ -21,15 +20,14 @@ %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions %dir %{_datadir}/systemd -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %endif +%dir %{xinitconfdir} +%dir %{xinitconfdir}/xinitrc.d %dir %{_environmentdir} %dir %{_journalcatalogdir} -%if ! %{bootstrap} -%dir %{_libdir}/cryptsetup -%endif %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} @@ -84,8 +82,6 @@ %dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sysinit.target.wants %dir %{_unitdir}/timers.target.wants -%dir %{xinitconfdir} -%dir %{xinitconfdir}/xinitrc.d %doc %{_modprobedir}/README %doc %{_sysctldir}/README %doc %{_sysusersdir}/README @@ -117,8 +113,7 @@ %{_bindir}/systemd-cat %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop -%{_bindir}/systemd-creds -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_bindir}/systemd-cryptenroll %endif %{_bindir}/systemd-delta @@ -141,7 +136,7 @@ %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-umount %{_bindir}/timedatectl -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %if %{with sd_boot} %{_datadir}/bash-completion/completions/bootctl %endif @@ -165,29 +160,6 @@ %{_datadir}/bash-completion/completions/systemd-run %{_datadir}/bash-completion/completions/timedatectl %endif -# dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294 -%{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Manager.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Seat.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Session.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.User.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Scope.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Slice.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml -%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service @@ -209,7 +181,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %if %{with sd_boot} %{_datadir}/zsh/site-functions/_bootctl %endif @@ -233,6 +205,7 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif +%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog @@ -247,11 +220,6 @@ %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if ! 0%{bootstrap} -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so -%endif -%if ! 0%{bootstrap} %if %{with sd_boot} %{_mandir}/man1/bootctl.1.gz %endif @@ -267,7 +235,6 @@ %{_mandir}/man1/systemd-cat.1.gz %{_mandir}/man1/systemd-cgls.1.gz %{_mandir}/man1/systemd-cgtop.1.gz -%{_mandir}/man1/systemd-creds.1.gz %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man1/systemd-delta.1.gz %{_mandir}/man1/systemd-detect-virt.1.gz @@ -283,7 +250,6 @@ %{_mandir}/man1/systemd-path.1.gz %{_mandir}/man1/systemd-run.1.gz %{_mandir}/man1/systemd-socket-activate.1.gz -%{_mandir}/man1/systemd-stdio-bridge.1.gz %{_mandir}/man1/systemd-tty-ask-password-agent.1.gz %{_mandir}/man1/systemd-umount.1.gz %{_mandir}/man1/systemd.1.gz @@ -292,10 +258,8 @@ %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/environment.d.5.gz -%{_mandir}/man5/extension-release.5.gz %{_mandir}/man5/hostname.5.gz %{_mandir}/man5/initrd-release.5.gz -%{_mandir}/man5/integritytab.5.gz %{_mandir}/man5/journald.conf.5.gz %{_mandir}/man5/journald.conf.d.5.gz %{_mandir}/man5/journald@.conf.5.gz @@ -359,12 +323,8 @@ %{_mandir}/man7/file-hierarchy.7.gz %{_mandir}/man7/kernel-command-line.7.gz %if %{with sd_boot} -%{_mandir}/man7/linuxaa64.efi.stub.7.gz -%{_mandir}/man7/linuxia32.efi.stub.7.gz -%{_mandir}/man7/linuxx64.efi.stub.7.gz %{_mandir}/man7/sd-boot.7.gz %{_mandir}/man7/systemd-boot.7.gz -%{_mandir}/man7/systemd-stub.7.gz %endif %{_mandir}/man7/systemd.directives.7.gz %{_mandir}/man7/systemd.environment-generator.7.gz @@ -423,9 +383,6 @@ %{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz -%{_mandir}/man8/systemd-integritysetup-generator.8.gz -%{_mandir}/man8/systemd-integritysetup.8.gz -%{_mandir}/man8/systemd-integritysetup@.service.8.gz %{_mandir}/man8/systemd-journald-audit.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz @@ -498,7 +455,7 @@ %{_modprobedir}/systemd.conf %{_pam_moduledir}/pam_systemd.so %{_pam_vendordir}/systemd-user -%{_prefix}/lib/kernel/install.conf +%{_prefix}/lib/kernel/install.d/00-entry-directory.install %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_sbindir}/halt @@ -515,7 +472,7 @@ %{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/systemd-boot*.efi %endif -%{_systemd_util_dir}/libsystemd-shared-250.so +%{_systemd_util_dir}/libsystemd-shared-249.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh @@ -529,16 +486,13 @@ %endif %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_systemd_util_dir}/systemd-cryptsetup %endif %{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed -%if ! %{bootstrap} -%{_systemd_util_dir}/systemd-integritysetup -%endif %{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-logind @@ -562,7 +516,7 @@ %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions %{_systemd_util_dir}/systemd-vconsole-setup -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_systemd_util_dir}/systemd-veritysetup %endif %{_systemd_util_dir}/systemd-volatile-root @@ -594,7 +548,7 @@ %if %{with sd_boot} %{_systemdgeneratordir}/systemd-bless-boot-generator %endif -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_systemdgeneratordir}/systemd-cryptsetup-generator %endif %{_systemdgeneratordir}/systemd-debug-generator @@ -602,12 +556,9 @@ %{_systemdgeneratordir}/systemd-getty-generator %{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator -%if ! %{bootstrap} -%{_systemdgeneratordir}/systemd-integritysetup-generator -%endif %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_systemdgeneratordir}/systemd-veritysetup-generator %endif %{_sysusersdir}/systemd-journal.conf @@ -635,7 +586,7 @@ %{_unitdir}/boot-complete.target %{_unitdir}/console-getty.service %{_unitdir}/container-getty@.service -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/cryptsetup-pre.target %{_unitdir}/cryptsetup.target %endif @@ -651,7 +602,6 @@ %{_unitdir}/emergency.service %{_unitdir}/emergency.target %{_unitdir}/exit.target -%{_unitdir}/factory-reset.target %{_unitdir}/final.target %{_unitdir}/first-boot-complete.target %{_unitdir}/getty-pre.target @@ -665,7 +615,7 @@ %{_unitdir}/initrd-fs.target %{_unitdir}/initrd-parse-etc.service %{_unitdir}/initrd-root-device.target -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target %endif @@ -674,10 +624,6 @@ %{_unitdir}/initrd-switch-root.target %{_unitdir}/initrd-usr-fs.target %{_unitdir}/initrd.target -%if ! %{bootstrap} -%{_unitdir}/integritysetup-pre.target -%{_unitdir}/integritysetup.target -%endif %{_unitdir}/kexec.target %{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs.target @@ -700,12 +646,12 @@ %{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/quotaon.service %{_unitdir}/reboot.target -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/remote-cryptsetup.target %endif %{_unitdir}/remote-fs-pre.target %{_unitdir}/remote-fs.target -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/remote-veritysetup.target %endif %{_unitdir}/rescue.service @@ -729,14 +675,11 @@ %{_unitdir}/sys-kernel-debug.mount %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/sysinit.target.wants/cryptsetup.target %endif %{_unitdir}/sysinit.target.wants/dev-hugepages.mount %{_unitdir}/sysinit.target.wants/dev-mqueue.mount -%if ! %{bootstrap} -%{_unitdir}/sysinit.target.wants/integritysetup.target -%endif %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount @@ -760,11 +703,11 @@ %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service %{_unitdir}/sysinit.target.wants/systemd-update-utmp.service -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/sysinit.target.wants/veritysetup.target %endif %{_unitdir}/syslog.socket -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/system-update-cleanup.service @@ -782,7 +725,6 @@ %{_unitdir}/systemd-boot-check-no-failures.service %if %{with sd_boot} %{_unitdir}/systemd-boot-system-token.service -%{_unitdir}/systemd-boot-update.service %endif %{_unitdir}/systemd-exit.service %{_unitdir}/systemd-firstboot.service @@ -842,11 +784,10 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_unitdir}/veritysetup-pre.target %{_unitdir}/veritysetup.target %endif -%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %if %{with split_usr} /bin/systemctl /sbin/halt diff --git a/files.udev b/files.udev index 52a309e6..4f75bcc9 100644 --- a/files.udev +++ b/files.udev @@ -14,14 +14,14 @@ %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %{_bindir}/systemd-hwdb %{_bindir}/udevadm -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_datadir}/zsh/site-functions/_udevadm %endif -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_mandir}/man5/udev.conf.5.gz %{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/udev.7.gz @@ -70,8 +70,6 @@ %{_udevhwdbdir}/60-keyboard.hwdb %{_udevhwdbdir}/60-seat.hwdb %{_udevhwdbdir}/60-sensor.hwdb -%{_udevhwdbdir}/70-analyzers.hwdb -%{_udevhwdbdir}/70-cameras.hwdb %{_udevhwdbdir}/70-joystick.hwdb %{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/70-pointingstick.hwdb @@ -94,7 +92,6 @@ %{_udevrulesdir}/60-serial.rules %{_udevrulesdir}/61-persistent-storage-compat.rules %{_udevrulesdir}/64-btrfs.rules -%{_udevrulesdir}/70-camera.rules %{_udevrulesdir}/70-joystick.rules %ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips %{_udevrulesdir}/70-memory.rules diff --git a/systemd-v249.10+suse.86.g0bb1977021.tar.xz b/systemd-v249.10+suse.86.g0bb1977021.tar.xz new file mode 100644 index 00000000..fdcaf7f0 --- /dev/null +++ b/systemd-v249.10+suse.86.g0bb1977021.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812 +size 7281992 diff --git a/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz deleted file mode 100644 index d2bee6fe..00000000 --- a/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed75c74660149af8a8fe454169f9cd295aa329c2638d2de8474d8eed869112d5 -size 7626056 diff --git a/systemd.changes b/systemd.changes index 82a330ca..7c998920 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,73 +1,3 @@ -------------------------------------------------------------------- -Thu Mar 17 10:38:16 UTC 2022 - Franck Bui - -- Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch - - A temporary workaround until bsc#1197178 is resolved. - -------------------------------------------------------------------- -Wed Mar 16 20:50:35 UTC 2022 - Franck Bui - -- Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4) - - For a complete list of changes, visit: - https://github.com/openSUSE/systemd/compare/ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a...8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 - -------------------------------------------------------------------- -Wed Mar 16 20:36:36 UTC 2022 - Franck Bui - -- Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a - - 37b683c832 journal: preserve acls when rotating user journals with NOCOW attribute set - d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd - 78c2766689 journal-file: explicitly handle file systems that do not support hole punching - 7ecfb4b098 journal-file: fix error handling of pread() in journald_file_punch_holes() - c4946a412c journal-file: don't use pread() when determining where to append, use mmap as before - d3fbd20628 journal: various fixes to journal_file_read_object() - 5897a8e8d4 shared: Handle filesystems that don't support hole punching in COPY_HOLES - 27746408e2 journal: Truncate file instead of punching hole in final object - 59b6130030 shared: Ensure COPY_HOLES copies trailing holes - ac9ccba73f journal: stat journal file after truncating - 0257283444 journal: Copy holes when archiving BTRFS journal files - 26c2a9952d shared: Copy holes in sparse files in copy_bytes_full() - 6c7191dece copy: fix wrong argument passed to S_ISREG() in copy_file_fd_full() - af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device ID (bsc#1195529) - -------------------------------------------------------------------- -Sat Mar 12 12:57:26 UTC 2022 - Callum Farmer - -- Update Supplements to new format in baselibs.conf -- Fix libsystemd-shared exclusion in baselibs.conf -- Exclude new cryptsetup libraries in baselibs.conf - -------------------------------------------------------------------- -Tue Mar 8 19:08:03 UTC 2022 - Franck Bui - -- systemd.spec: minor simplification by assuming that %{bootstrap} is always - defined. - -------------------------------------------------------------------- -Tue Mar 8 17:50:57 UTC 2022 - Franck Bui - -- Make sure to create 'systemd-coredump' system user when systemd-coredump is - installed (follow-up for the split of the sysusers config files). - -------------------------------------------------------------------- -Tue Mar 8 09:41:42 UTC 2022 - Franck Bui - -- Upgrade to v250.3 (commit dbd8bd2b9fd827ca89ed18034b60703c95798e01) - - See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for - details. - - * Rebased 0001-conf-parser-introduce-early-drop-ins.patch - 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch - -- Dropped 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch - - The alias makes little sense as soon as multiple network managers are used in - parallel. - ------------------------------------------------------------------- Tue Mar 8 07:41:41 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index c1daf61f..31ea93ca 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.35.g8ef8dfd540 +%define suse_version +suse.86.g0bb1977021 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -37,7 +37,7 @@ %define __when_2() %{expand:%%{?with_%{1}:%{2}}%%{!?with_%{1}:false}} %define when() %{expand:%%__when_%# %{*}} -%if %{bootstrap} +%if 0%{?bootstrap} %bcond_with coredump %bcond_with importd %bcond_with journal_remote @@ -71,12 +71,12 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 250.4 +Version: 249.10 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if ! %{bootstrap} +%if ! 0%{?bootstrap} BuildRequires: docbook-xsl-stylesheets BuildRequires: kbd BuildRequires: libapparmor-devel @@ -132,7 +132,7 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 BuildRequires: gnu-efi %endif -%if %{bootstrap} +%if 0%{?bootstrap} #!BuildIgnore: dbus-1 Provides: systemd = %{version}-%{release} Conflicts: systemd @@ -215,16 +215,12 @@ 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} +Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch -%endif Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch 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 - # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git # repository. But in very few cases, some stuff might be broken in @@ -245,7 +241,7 @@ drop-in replacement for sysvinit. %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -%if %{bootstrap} +%if 0%{?bootstrap} Conflicts: systemd-doc Requires: this-is-only-for-build-envs %else @@ -263,7 +259,7 @@ Requires: libudev%{?mini}1 = %{version}-%{release} Requires: systemd-rpm-macros Provides: libudev%{?mini}-devel = %{version}-%{release} Obsoletes: libudev%{?mini}-devel < %{version}-%{release} -%if %{bootstrap} +%if 0%{?bootstrap} Provides: systemd-devel = %{version}-%{release} Conflicts: systemd-devel Provides: libudev-devel = %{version}-%{release} @@ -296,7 +292,7 @@ Please note that the content of this package is considered as deprecated. %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -%if %{bootstrap} +%if 0%{?bootstrap} Conflicts: kiwi Conflicts: libsystemd0 Provides: libsystemd0 = %{version}-%{release} @@ -342,7 +338,7 @@ Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 -%if %{bootstrap} +%if 0%{?bootstrap} Conflicts: udev Provides: udev = %{version}-%{release} %endif @@ -357,7 +353,7 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -%if %{bootstrap} +%if 0%{?bootstrap} Conflicts: kiwi Conflicts: libudev1 Provides: libudev1 = %{version}-%{release} @@ -391,7 +387,7 @@ Obsoletes: nss-mymachines < %{version}-%{release} Provides: nss-mymachines = %{version}-%{release} Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn -%if %{bootstrap} +%if 0%{?bootstrap} Conflicts: systemd-container Provides: systemd-container = %{version}-%{release} %endif @@ -462,7 +458,7 @@ http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES %endif -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -629,7 +625,7 @@ The package contains: homed, pstore, repart, userdbd. Have fun with these services at your own risk. %endif -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %lang_package %endif @@ -674,7 +670,7 @@ Have fun with these services at your own risk. -Dima=false \ -Delfutils=auto \ -Doomd=false \ -%if %{bootstrap} +%if 0%{?bootstrap} -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ -Dtranslations=false \ @@ -694,7 +690,6 @@ Have fun with these services at your own risk. \ -Defi=%{when sd_boot} \ -Dgnu-efi=%{when sd_boot} \ - -Dsbat-distro= \ \ -Dresolve=%{when resolved} \ -Ddns-servers='' \ @@ -918,7 +913,7 @@ rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %find_lang systemd %endif @@ -947,7 +942,7 @@ if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then chmod 444 %{_sysconfdir}/machine-id fi -%if ! %{bootstrap} +%if ! 0%{?bootstrap} pam-config --add --systemd || : %endif @@ -1130,12 +1125,7 @@ fi %ldconfig %endif -%if %{with coredump} -%post coredump -%sysusers_create systemd-coredump.conf -%endif - -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %ldconfig_scriptlets -n nss-myhostname %ldconfig_scriptlets -n nss-systemd %endif @@ -1280,13 +1270,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.33.0 +%{_libdir}/libsystemd.so.0.32.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.3 +%{_libdir}/libudev.so.1.7.2 %if %{with coredump} %files coredump @@ -1299,14 +1289,14 @@ fi %{_sysusersdir}/systemd-coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %{_mandir}/man1/coredumpctl* %{_mandir}/man5/coredump.conf* %{_mandir}/man8/systemd-coredump* %endif %endif -%if ! %{bootstrap} +%if ! 0%{?bootstrap} %files lang -f systemd.lang %files -n nss-myhostname @@ -1393,10 +1383,6 @@ fi %{_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 From 98421d83470a30b206e5c9dce39f7dc7989d806a6d0ce4a9cf3bfff3f07fb1a7 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 28 Mar 2022 14:58:41 +0000 Subject: [PATCH 096/124] Accepting request 964674 from Base:System - spec: cope with %{_modprobedir} being /lib/modprobe.d on SLE - Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch A temporary workaround until bsc#1197178 is resolved. - Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a...8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 - Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a 37b683c832 journal: preserve acls when rotating user journals with NOCOW attribute set d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd 78c2766689 journal-file: explicitly handle file systems that do not support hole punching 7ecfb4b098 journal-file: fix error handling of pread() in journald_file_punch_holes() c4946a412c journal-file: don't use pread() when determining where to append, use mmap as before d3fbd20628 journal: various fixes to journal_file_read_object() 5897a8e8d4 shared: Handle filesystems that don't support hole punching in COPY_HOLES 27746408e2 journal: Truncate file instead of punching hole in final object 59b6130030 shared: Ensure COPY_HOLES copies trailing holes ac9ccba73f journal: stat journal file after truncating 0257283444 journal: Copy holes when archiving BTRFS journal files 26c2a9952d shared: Copy holes in sparse files in copy_bytes_full() 6c7191dece copy: fix wrong argument passed to S_ISREG() in copy_file_fd_full() af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device ID (bsc#1195529) - Update Supplements to new format in baselibs.conf - Fix libsystemd-shared exclusion in baselibs.conf - Exclude new cryptsetup libraries in baselibs.conf - systemd.spec: minor simplification by assuming that %{bootstrap} is always OBS-URL: https://build.opensuse.org/request/show/964674 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=354 --- ...conf-parser-introduce-early-drop-ins.patch | 142 +++++++++--------- ...and-var-lock-bind-mount-if-they-aren.patch | 10 +- ...twork.service-an-alias-of-systemd-ne.patch | 29 ---- ...-Pass-tty-to-use-by-agetty-via-stdin.patch | 90 +++++++++++ baselibs.conf | 5 +- files.container | 7 +- files.devel | 7 +- files.network | 9 ++ files.systemd | 103 ++++++++++--- files.udev | 9 +- systemd-v249.10+suse.86.g0bb1977021.tar.xz | 3 - systemd-v250.4+suse.35.g8ef8dfd540.tar.xz | 3 + systemd.changes | 75 +++++++++ systemd.spec | 63 +++++--- 14 files changed, 393 insertions(+), 162 deletions(-) delete mode 100644 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch create mode 100644 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch delete mode 100644 systemd-v249.10+suse.86.g0bb1977021.tar.xz create mode 100644 systemd-v250.4+suse.35.g8ef8dfd540.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index bf5a21d2..bcd96141 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,4 +1,4 @@ -From 4ff82a9455d7b6672e79f2938728a3a8299c3158 Mon Sep 17 00:00:00 2001 +From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 48 ++++++++++-- - src/test/test-conf-parser.c | 152 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 195 insertions(+), 5 deletions(-) + src/shared/conf-parser.c | 48 +++++++++-- + src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 197 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index d0ac1b2660..cb453fa50d 100644 +index 1e1967d7ea..eb81732dfa 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -430,6 +430,7 @@ int config_parse( +@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, static int config_parse_many_files( const char* const* conf_files, @@ -77,20 +77,20 @@ index d0ac1b2660..cb453fa50d 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -442,6 +443,12 @@ static int config_parse_many_files( - char **fn; - int r; - +@@ -481,6 +482,12 @@ static int config_parse_many_files( + stats_by_path = hashmap_new(&path_hash_ops_free_free); + if (!stats_by_path) + return -ENOMEM; ++ } ++ + STRV_FOREACH(fn, early_files) { -+ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); ++ r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); + if (r < 0) + return r; -+ } -+ + } + /* First read the first found main config file. */ - STRV_FOREACH(fn, (char**) conf_files) { - r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &mtime); -@@ -464,6 +471,28 @@ static int config_parse_many_files( +@@ -521,6 +528,28 @@ static int config_parse_many_files( return 0; } @@ -119,9 +119,9 @@ index d0ac1b2660..cb453fa50d 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -475,15 +504,19 @@ int config_parse_many_nulstr( +@@ -532,15 +561,19 @@ int config_parse_many_nulstr( void *userdata, - usec_t *ret_mtime) { + Hashmap **ret_stats_by_path) { - _cleanup_strv_free_ char **files = NULL; + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; @@ -139,12 +139,12 @@ index d0ac1b2660..cb453fa50d 100644 + + return config_parse_many_files(STRV_MAKE_CONST(conf_file), early_files, late_files, + sections, lookup, table, flags, userdata, - ret_mtime); + ret_stats_by_path); } -@@ -499,8 +532,8 @@ int config_parse_many( +@@ -556,8 +589,8 @@ int config_parse_many( void *userdata, - usec_t *ret_mtime) { + Hashmap **ret_stats_by_path) { + _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; _cleanup_strv_free_ char **dropin_dirs = NULL; @@ -152,22 +152,22 @@ index d0ac1b2660..cb453fa50d 100644 const char *suffix; int r; -@@ -513,7 +546,12 @@ int config_parse_many( +@@ -570,7 +603,12 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_mtime); +- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); + r = config_parse_split_conf_files(files, &early_files, &late_files); + if (r < 0) + return r; + + return config_parse_many_files(conf_files, early_files, late_files, -+ sections, lookup, table, flags, userdata, ret_mtime); ++ sections, lookup, table, flags, userdata, ret_stats_by_path); } #define DEFINE_PARSER(type, vartype, conv_func) \ diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 5da864347e..77d9f28a79 100644 +index e61932ab16..de408272f0 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -179,9 +179,9 @@ index 5da864347e..77d9f28a79 100644 +#include "rm-rf.h" #include "string-util.h" #include "strv.h" - #include "tmpfile-util.h" -@@ -385,6 +388,152 @@ static void test_config_parse(unsigned i, const char *s) { - } + #include "tests.h" +@@ -391,4 +394,155 @@ TEST(config_parse) { + test_config_parse_one(i, config_file[i]); } +static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) { @@ -228,8 +228,8 @@ index 5da864347e..77d9f28a79 100644 + } +} + -+static void test_config_parse_many_one(bool nulstr, const char *main, char **conf_files, -+ const char *name, const char *early, const char *late) { ++static void test_config_parse_many_nulstr_one(bool nulstr, const char *main, char **conf_files, ++ const char *name, const char *early, const char *late) { + + _cleanup_free_ char *parsed_name = NULL, *parsed_early = NULL, *parsed_late = NULL; + _cleanup_strv_free_ char **conf_dirs = NULL; @@ -281,67 +281,61 @@ index 5da864347e..77d9f28a79 100644 + assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); +} + -+static void test_config_parse_many(bool nulstr) { ++static void test_config_parse_many_nulstr(bool nulstr) { + log_info("== %s%s ==", __func__, nulstr ? "_nulstr" : ""); + -+ test_config_parse_many_one(nulstr, NULL, NULL, NULL, NULL, NULL); ++ test_config_parse_many_nulstr_one(nulstr, NULL, NULL, NULL, NULL, NULL); + -+ test_config_parse_many_one(nulstr, -+ "dir/main.conf", NULL, -+ "dir/main.conf", NULL, NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/main.conf", NULL, ++ "dir/main.conf", NULL, NULL); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/__50-foo.conf"), -+ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/__50-foo.conf"), ++ "dir1/__50-foo.conf", "dir1/__50-foo.conf", NULL); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), -+ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir1/50-bar.conf"), ++ "dir1/50-bar.conf", NULL, "dir1/50-bar.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), -+ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/50-foo.conf", "dir2/10-bar.conf"), ++ "dir1/50-foo.conf", NULL, "dir1/50-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ NULL, STRV_MAKE("dir1/10-foo.conf", "dir2/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + + /* Early conf files should never override the main one whatever their + * priority/location. */ -+ test_config_parse_many_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), -+ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf"), ++ "dir/10-main.conf", "dir2/__99-foo.conf", NULL); + + /* Late conf files always take precendence over the early conf files + * and the main one. */ -+ test_config_parse_many_one(nulstr, -+ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), -+ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/50-main.conf", STRV_MAKE("dir1/10-foo.conf"), ++ "dir1/10-foo.conf", NULL, "dir1/10-foo.conf"); + -+ test_config_parse_many_one(nulstr, -+ "dir/10-main.conf", -+ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", -+ "dir2/10-foo.conf"), -+ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); ++ test_config_parse_many_nulstr_one(nulstr, ++ "dir/10-main.conf", ++ STRV_MAKE("dir1/__10-foo.conf", "dir2/__99-foo.conf", ++ "dir2/10-foo.conf"), ++ "dir2/10-foo.conf", "dir2/__99-foo.conf", "dir2/10-foo.conf"); +} + - int main(int argc, char **argv) { - unsigned i; - -@@ -407,5 +556,8 @@ int main(int argc, char **argv) { - for (i = 0; i < ELEMENTSOF(config_file); i++) - test_config_parse(i, config_file[i]); - -+ test_config_parse_many(true); -+ test_config_parse_many(false); ++TEST(config_parse_many) { ++ test_config_parse_many_nulstr(true); ++ test_config_parse_many_nulstr(false); ++} + - return 0; - } + DEFINE_TEST_MAIN(LOG_INFO); -- -2.26.2 +2.34.1 diff --git a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch index 8cdd1ce8..00e1cb09 100644 --- a/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch +++ b/0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch @@ -1,4 +1,4 @@ -From e78660b66efc6ab28b655ca584315504b76cb4dc Mon Sep 17 00:00:00 2001 +From 9ab58f2dbcbbafc10a1b4de046a9b0e03bb08595 Mon Sep 17 00:00:00 2001 From: Frederic Crozat Date: Mon, 29 Oct 2012 13:01:20 +0000 Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they @@ -13,10 +13,10 @@ Subject: [PATCH 02/11] restore /var/run and /var/lock bind mount if they create mode 100644 units/var-run.mount diff --git a/units/meson.build b/units/meson.build -index 17e9ead9c1..7b926f9f91 100644 +index a9bf28f6d9..739fd84d2c 100644 --- a/units/meson.build +++ b/units/meson.build -@@ -160,6 +160,8 @@ units = [ +@@ -165,6 +165,8 @@ units = [ ['umount.target', ''], ['usb-gadget.target', ''], ['user.slice', ''], @@ -24,7 +24,7 @@ index 17e9ead9c1..7b926f9f91 100644 + ['var-lock.mount', 'HAVE_SYSV_COMPAT', 'local-fs.target.wants/'], ['var-lib-machines.mount', 'ENABLE_MACHINED', 'remote-fs.target.wants/ machines.target.wants/'], - ] + ['systemd-oomd.socket', 'ENABLE_OOMD'], diff --git a/units/var-lock.mount b/units/var-lock.mount new file mode 100644 index 0000000000..07277adac3 @@ -76,5 +76,5 @@ index 0000000000..ab4da424c9 +Type=bind +Options=bind -- -2.26.2 +2.34.1 diff --git a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch b/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch deleted file mode 100644 index cb8f69a8..00000000 --- a/0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 533a1b6996c3d99cf27ae05f0cd8131dcd9bbf30 Mon Sep 17 00:00:00 2001 -From: Pawel Wieczorkiewicz -Date: Tue, 2 Jun 2015 13:33:24 +0000 -Subject: [PATCH 07/11] networkd: make network.service an alias of - systemd-networkd.service - -NetworkManager and wicked does this already. This is needed by yast2 -and other parts of the system. - -[fixes boo#933092] ---- - units/systemd-networkd.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in -index ffa45ba049..6a5d0dea3c 100644 ---- a/units/systemd-networkd.service.in -+++ b/units/systemd-networkd.service.in -@@ -53,6 +53,7 @@ User=systemd-network - - [Install] - WantedBy=multi-user.target -+Alias=network.service - Also=systemd-networkd.socket - Alias=dbus-org.freedesktop.network1.service - --- -2.26.2 - diff --git a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch new file mode 100644 index 00000000..107b6553 --- /dev/null +++ b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch @@ -0,0 +1,90 @@ +From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 17 Mar 2022 11:35:33 +0100 +Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin" + +This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. +--- + units/console-getty.service.in | 4 +--- + units/container-getty@.service.in | 4 +--- + units/getty@.service.in | 4 +--- + units/serial-getty@.service.in | 4 +--- + 4 files changed, 4 insertions(+), 12 deletions(-) + +diff --git a/units/console-getty.service.in b/units/console-getty.service.in +index 73871d6f50..bb67541dce 100644 +--- a/units/console-getty.service.in ++++ b/units/console-getty.service.in +@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM + Type=idle + Restart=always + UtmpIdentifier=cons +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/console + TTYReset=yes + TTYVHangup=yes +diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in +index a6e3f94e2a..ed1eb7bde1 100644 +--- a/units/container-getty@.service.in ++++ b/units/container-getty@.service.in +@@ -28,13 +28,11 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM + Type=idle + Restart=always + RestartSec=0 + UtmpIdentifier=pts/%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/pts/%I + TTYReset=yes + TTYVHangup=yes +diff --git a/units/getty@.service.in b/units/getty@.service.in +index 21d66f9367..78deb7cffe 100644 +--- a/units/getty@.service.in ++++ b/units/getty@.service.in +@@ -38,13 +38,11 @@ ConditionPathExists=/dev/tty0 + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM + Type=idle + Restart=always + RestartSec=0 + UtmpIdentifier=%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/%I + TTYReset=yes + TTYVHangup=yes +diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in +index 2433124c55..bb7af3105d 100644 +--- a/units/serial-getty@.service.in ++++ b/units/serial-getty@.service.in +@@ -33,12 +33,10 @@ Before=rescue.service + # The '-o' option value tells agetty to replace 'login' arguments with an + # option to preserve environment (-p), followed by '--' for safety, and then + # the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 %I $TERM + Type=idle + Restart=always + UtmpIdentifier=%I +-StandardInput=tty +-StandardOutput=tty + TTYPath=/dev/%I + TTYReset=yes + TTYVHangup=yes +-- +2.34.1 + diff --git a/baselibs.conf b/baselibs.conf index 4e056067..d8badad8 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -2,9 +2,10 @@ # https://en.opensuse.org/openSUSE:Build_Service_baselibs.conf#Quickstart # systemd - supplements "packageand(systemd:pam-)" + supplements "(systemd and pam-)" -/lib/systemd/system/ - -/usr/lib/systemd/libsystemd-shared.*\.so + -/usr/lib/systemd + -/usr/lib/cryptsetup post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 diff --git a/files.container b/files.container index faac2676..cae9352f 100644 --- a/files.container +++ b/files.container @@ -3,7 +3,7 @@ # %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn %{_mandir}/man1/systemd-nspawn.1.gz @@ -17,6 +17,9 @@ %dir %{_unitdir}/machines.target.wants %{_bindir}/machinectl %{_datadir}/bash-completion/completions/machinectl +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Image.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Machine.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.machine1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.machine1.service %{_datadir}/dbus-1/system.d/org.freedesktop.machine1.conf %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy @@ -40,6 +43,8 @@ %endif %if %{with importd} +%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.import1.Transfer.xml %{_datadir}/dbus-1/system-services/org.freedesktop.import1.service %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %{_datadir}/polkit-1/actions/org.freedesktop.import1.policy diff --git a/files.devel b/files.devel index e551dc7f..7cd0b082 100644 --- a/files.devel +++ b/files.devel @@ -7,7 +7,7 @@ %{_libdir}/libudev.so %{_libdir}/pkgconfig/libsystemd.pc %{_libdir}/pkgconfig/libudev.pc -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man3/SD_ALERT.3.gz %{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz %{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz @@ -55,6 +55,7 @@ %{_mandir}/man3/SD_BUS_PROPERTY.3.gz %{_mandir}/man3/SD_BUS_SIGNAL.3.gz %{_mandir}/man3/SD_BUS_SIGNAL_WITH_NAMES.3.gz +%{_mandir}/man3/SD_BUS_VTABLE_CAPABILITY.3.gz %{_mandir}/man3/SD_BUS_VTABLE_END.3.gz %{_mandir}/man3/SD_BUS_VTABLE_START.3.gz %{_mandir}/man3/SD_BUS_WRITABLE_PROPERTY.3.gz @@ -84,6 +85,8 @@ %{_mandir}/man3/SD_ID128_MAKE_STR.3.gz %{_mandir}/man3/SD_ID128_MAKE_UUID_STR.3.gz %{_mandir}/man3/SD_ID128_NULL.3.gz +%{_mandir}/man3/SD_ID128_STRING_MAX.3.gz +%{_mandir}/man3/SD_ID128_TO_STRING.3.gz %{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz %{_mandir}/man3/SD_INFO.3.gz %{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz @@ -426,6 +429,7 @@ %{_mandir}/man3/sd_event_add_defer.3.gz %{_mandir}/man3/sd_event_add_exit.3.gz %{_mandir}/man3/sd_event_add_inotify.3.gz +%{_mandir}/man3/sd_event_add_inotify_fd.3.gz %{_mandir}/man3/sd_event_add_io.3.gz %{_mandir}/man3/sd_event_add_post.3.gz %{_mandir}/man3/sd_event_add_signal.3.gz @@ -495,6 +499,7 @@ %{_mandir}/man3/sd_event_source_set_prepare.3.gz %{_mandir}/man3/sd_event_source_set_priority.3.gz %{_mandir}/man3/sd_event_source_set_ratelimit.3.gz +%{_mandir}/man3/sd_event_source_set_ratelimit_expire_callback.3.gz %{_mandir}/man3/sd_event_source_set_time.3.gz %{_mandir}/man3/sd_event_source_set_time_accuracy.3.gz %{_mandir}/man3/sd_event_source_set_time_relative.3.gz diff --git a/files.network b/files.network index 4118d63d..9e3f698c 100644 --- a/files.network +++ b/files.network @@ -7,6 +7,10 @@ %dir %{_systemd_util_dir}/network %{_bindir}/networkctl %{_datadir}/bash-completion/completions/networkctl +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.DHCPServer.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Link.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.network1.Network.xml %{_datadir}/dbus-1/system-services/org.freedesktop.network1.service %{_datadir}/dbus-1/system.d/org.freedesktop.network1.conf %{_datadir}/polkit-1/actions/org.freedesktop.network1.policy @@ -15,11 +19,13 @@ %{_mandir}/man1/networkctl.1.gz %{_mandir}/man5/networkd.conf.5.gz %{_mandir}/man5/networkd.conf.d.5.gz +%{_mandir}/man5/org.freedesktop.network1.5.gz %{_mandir}/man5/systemd.network.5.gz %{_mandir}/man8/systemd-networkd-wait-online.8.gz %{_mandir}/man8/systemd-networkd-wait-online.service.8.gz %{_mandir}/man8/systemd-networkd.8.gz %{_mandir}/man8/systemd-networkd.service.8.gz +%{_systemd_util_dir}/network/80-6rd-tunnel.network %{_systemd_util_dir}/network/80-container-host0.network %{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-vz.network @@ -40,6 +46,9 @@ %{_bindir}/systemd-resolve %{_datadir}/bash-completion/completions/resolvectl %{_datadir}/bash-completion/completions/systemd-resolve +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.DnssdService.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Link.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.resolve1.Manager.xml %{_datadir}/dbus-1/system-services/org.freedesktop.resolve1.service %{_datadir}/dbus-1/system.d/org.freedesktop.resolve1.conf %{_datadir}/polkit-1/actions/org.freedesktop.resolve1.policy diff --git a/files.systemd b/files.systemd index 8f0f173d..b919c2af 100644 --- a/files.systemd +++ b/files.systemd @@ -8,11 +8,12 @@ %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf %dir %{_binfmtdir} -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %endif %dir %{_datadir}/dbus-1 +%dir %{_datadir}/dbus-1/interfaces %dir %{_datadir}/dbus-1/services %dir %{_datadir}/dbus-1/system-services %dir %{_datadir}/dbus-1/system.d @@ -20,14 +21,15 @@ %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions %dir %{_datadir}/systemd -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %endif -%dir %{xinitconfdir} -%dir %{xinitconfdir}/xinitrc.d %dir %{_environmentdir} %dir %{_journalcatalogdir} +%if ! %{bootstrap} +%dir %{_libdir}/cryptsetup +%endif %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} @@ -82,6 +84,8 @@ %dir %{_unitdir}/sockets.target.wants %dir %{_unitdir}/sysinit.target.wants %dir %{_unitdir}/timers.target.wants +%dir %{xinitconfdir} +%dir %{xinitconfdir}/xinitrc.d %doc %{_modprobedir}/README %doc %{_sysctldir}/README %doc %{_sysusersdir}/README @@ -113,7 +117,8 @@ %{_bindir}/systemd-cat %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop -%if ! 0%{?bootstrap} +%{_bindir}/systemd-creds +%if ! %{bootstrap} %{_bindir}/systemd-cryptenroll %endif %{_bindir}/systemd-delta @@ -136,7 +141,7 @@ %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-umount %{_bindir}/timedatectl -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %if %{with sd_boot} %{_datadir}/bash-completion/completions/bootctl %endif @@ -160,6 +165,29 @@ %{_datadir}/bash-completion/completions/systemd-run %{_datadir}/bash-completion/completions/timedatectl %endif +# dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294 +%{_datadir}/dbus-1/interfaces/org.freedesktop.LogControl1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Seat.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.Session.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.login1.User.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Automount.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Device.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Job.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Manager.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Mount.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Path.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Scope.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Service.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Slice.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Socket.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Swap.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Target.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Timer.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.Unit.xml +%{_datadir}/dbus-1/interfaces/org.freedesktop.timedate1.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.hostname1.service %{_datadir}/dbus-1/system-services/org.freedesktop.locale1.service @@ -181,7 +209,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %if %{with sd_boot} %{_datadir}/zsh/site-functions/_bootctl %endif @@ -205,7 +233,6 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif -%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog @@ -220,6 +247,11 @@ %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if ! 0%{bootstrap} +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%endif +%if ! 0%{bootstrap} %if %{with sd_boot} %{_mandir}/man1/bootctl.1.gz %endif @@ -235,6 +267,7 @@ %{_mandir}/man1/systemd-cat.1.gz %{_mandir}/man1/systemd-cgls.1.gz %{_mandir}/man1/systemd-cgtop.1.gz +%{_mandir}/man1/systemd-creds.1.gz %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man1/systemd-delta.1.gz %{_mandir}/man1/systemd-detect-virt.1.gz @@ -250,6 +283,7 @@ %{_mandir}/man1/systemd-path.1.gz %{_mandir}/man1/systemd-run.1.gz %{_mandir}/man1/systemd-socket-activate.1.gz +%{_mandir}/man1/systemd-stdio-bridge.1.gz %{_mandir}/man1/systemd-tty-ask-password-agent.1.gz %{_mandir}/man1/systemd-umount.1.gz %{_mandir}/man1/systemd.1.gz @@ -258,8 +292,10 @@ %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/environment.d.5.gz +%{_mandir}/man5/extension-release.5.gz %{_mandir}/man5/hostname.5.gz %{_mandir}/man5/initrd-release.5.gz +%{_mandir}/man5/integritytab.5.gz %{_mandir}/man5/journald.conf.5.gz %{_mandir}/man5/journald.conf.d.5.gz %{_mandir}/man5/journald@.conf.5.gz @@ -323,8 +359,12 @@ %{_mandir}/man7/file-hierarchy.7.gz %{_mandir}/man7/kernel-command-line.7.gz %if %{with sd_boot} +%{_mandir}/man7/linuxaa64.efi.stub.7.gz +%{_mandir}/man7/linuxia32.efi.stub.7.gz +%{_mandir}/man7/linuxx64.efi.stub.7.gz %{_mandir}/man7/sd-boot.7.gz %{_mandir}/man7/systemd-boot.7.gz +%{_mandir}/man7/systemd-stub.7.gz %endif %{_mandir}/man7/systemd.directives.7.gz %{_mandir}/man7/systemd.environment-generator.7.gz @@ -383,6 +423,9 @@ %{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz +%{_mandir}/man8/systemd-integritysetup-generator.8.gz +%{_mandir}/man8/systemd-integritysetup.8.gz +%{_mandir}/man8/systemd-integritysetup@.service.8.gz %{_mandir}/man8/systemd-journald-audit.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz @@ -455,7 +498,7 @@ %{_modprobedir}/systemd.conf %{_pam_moduledir}/pam_systemd.so %{_pam_vendordir}/systemd-user -%{_prefix}/lib/kernel/install.d/00-entry-directory.install +%{_prefix}/lib/kernel/install.conf %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_sbindir}/halt @@ -472,7 +515,7 @@ %{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/systemd-boot*.efi %endif -%{_systemd_util_dir}/libsystemd-shared-249.so +%{_systemd_util_dir}/libsystemd-shared-250.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh @@ -486,13 +529,16 @@ %endif %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemd_util_dir}/systemd-cryptsetup %endif %{_systemd_util_dir}/systemd-fsck %{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-integritysetup +%endif %{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-logind @@ -516,7 +562,7 @@ %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions %{_systemd_util_dir}/systemd-vconsole-setup -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemd_util_dir}/systemd-veritysetup %endif %{_systemd_util_dir}/systemd-volatile-root @@ -548,7 +594,7 @@ %if %{with sd_boot} %{_systemdgeneratordir}/systemd-bless-boot-generator %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemdgeneratordir}/systemd-cryptsetup-generator %endif %{_systemdgeneratordir}/systemd-debug-generator @@ -556,9 +602,12 @@ %{_systemdgeneratordir}/systemd-getty-generator %{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator +%if ! %{bootstrap} +%{_systemdgeneratordir}/systemd-integritysetup-generator +%endif %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_systemdgeneratordir}/systemd-veritysetup-generator %endif %{_sysusersdir}/systemd-journal.conf @@ -586,7 +635,7 @@ %{_unitdir}/boot-complete.target %{_unitdir}/console-getty.service %{_unitdir}/container-getty@.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/cryptsetup-pre.target %{_unitdir}/cryptsetup.target %endif @@ -602,6 +651,7 @@ %{_unitdir}/emergency.service %{_unitdir}/emergency.target %{_unitdir}/exit.target +%{_unitdir}/factory-reset.target %{_unitdir}/final.target %{_unitdir}/first-boot-complete.target %{_unitdir}/getty-pre.target @@ -615,7 +665,7 @@ %{_unitdir}/initrd-fs.target %{_unitdir}/initrd-parse-etc.service %{_unitdir}/initrd-root-device.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target %endif @@ -624,6 +674,10 @@ %{_unitdir}/initrd-switch-root.target %{_unitdir}/initrd-usr-fs.target %{_unitdir}/initrd.target +%if ! %{bootstrap} +%{_unitdir}/integritysetup-pre.target +%{_unitdir}/integritysetup.target +%endif %{_unitdir}/kexec.target %{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs.target @@ -646,12 +700,12 @@ %{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/quotaon.service %{_unitdir}/reboot.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/remote-cryptsetup.target %endif %{_unitdir}/remote-fs-pre.target %{_unitdir}/remote-fs.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/remote-veritysetup.target %endif %{_unitdir}/rescue.service @@ -675,11 +729,14 @@ %{_unitdir}/sys-kernel-debug.mount %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/sysinit.target.wants/cryptsetup.target %endif %{_unitdir}/sysinit.target.wants/dev-hugepages.mount %{_unitdir}/sysinit.target.wants/dev-mqueue.mount +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/integritysetup.target +%endif %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount @@ -703,11 +760,11 @@ %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service %{_unitdir}/sysinit.target.wants/systemd-update-utmp.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/sysinit.target.wants/veritysetup.target %endif %{_unitdir}/syslog.socket -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/system-update-cleanup.service @@ -725,6 +782,7 @@ %{_unitdir}/systemd-boot-check-no-failures.service %if %{with sd_boot} %{_unitdir}/systemd-boot-system-token.service +%{_unitdir}/systemd-boot-update.service %endif %{_unitdir}/systemd-exit.service %{_unitdir}/systemd-firstboot.service @@ -784,10 +842,11 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_unitdir}/veritysetup-pre.target %{_unitdir}/veritysetup.target %endif +%{xinitconfdir}/xinitrc.d/50-systemd-user.sh %if %{with split_usr} /bin/systemctl /sbin/halt diff --git a/files.udev b/files.udev index 4f75bcc9..52a309e6 100644 --- a/files.udev +++ b/files.udev @@ -14,14 +14,14 @@ %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %{_bindir}/systemd-hwdb %{_bindir}/udevadm -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_datadir}/zsh/site-functions/_udevadm %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man5/udev.conf.5.gz %{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/udev.7.gz @@ -70,6 +70,8 @@ %{_udevhwdbdir}/60-keyboard.hwdb %{_udevhwdbdir}/60-seat.hwdb %{_udevhwdbdir}/60-sensor.hwdb +%{_udevhwdbdir}/70-analyzers.hwdb +%{_udevhwdbdir}/70-cameras.hwdb %{_udevhwdbdir}/70-joystick.hwdb %{_udevhwdbdir}/70-mouse.hwdb %{_udevhwdbdir}/70-pointingstick.hwdb @@ -92,6 +94,7 @@ %{_udevrulesdir}/60-serial.rules %{_udevrulesdir}/61-persistent-storage-compat.rules %{_udevrulesdir}/64-btrfs.rules +%{_udevrulesdir}/70-camera.rules %{_udevrulesdir}/70-joystick.rules %ifarch %{arm} aarch64 %{ix86} x86_64 ia64 mips %{_udevrulesdir}/70-memory.rules diff --git a/systemd-v249.10+suse.86.g0bb1977021.tar.xz b/systemd-v249.10+suse.86.g0bb1977021.tar.xz deleted file mode 100644 index fdcaf7f0..00000000 --- a/systemd-v249.10+suse.86.g0bb1977021.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:325535487567c463664a7e4b54fc31f0a7dff95f49812b89ac7cd1c5c9f82812 -size 7281992 diff --git a/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz new file mode 100644 index 00000000..d2bee6fe --- /dev/null +++ b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ed75c74660149af8a8fe454169f9cd295aa329c2638d2de8474d8eed869112d5 +size 7626056 diff --git a/systemd.changes b/systemd.changes index 7c998920..e8567d8a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,78 @@ +------------------------------------------------------------------- +Wed Mar 23 15:17:40 UTC 2022 - Franck Bui + +- spec: cope with %{_modprobedir} being /lib/modprobe.d on SLE + +------------------------------------------------------------------- +Thu Mar 17 10:38:16 UTC 2022 - Franck Bui + +- Add 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch + + A temporary workaround until bsc#1197178 is resolved. + +------------------------------------------------------------------- +Wed Mar 16 20:50:35 UTC 2022 - Franck Bui + +- Import commit 8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 (merge of v250.4) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a...8ef8dfd5401ba18caec59e54a05af9f2e0d7ac65 + +------------------------------------------------------------------- +Wed Mar 16 20:36:36 UTC 2022 - Franck Bui + +- Import commit ca89b1d1fd1ae86cc1e763d2d01ec2806f3a4d3a + + 37b683c832 journal: preserve acls when rotating user journals with NOCOW attribute set + d043fabebc journal: when copying journal file to undo NOCOW flag, go via fd + 78c2766689 journal-file: explicitly handle file systems that do not support hole punching + 7ecfb4b098 journal-file: fix error handling of pread() in journald_file_punch_holes() + c4946a412c journal-file: don't use pread() when determining where to append, use mmap as before + d3fbd20628 journal: various fixes to journal_file_read_object() + 5897a8e8d4 shared: Handle filesystems that don't support hole punching in COPY_HOLES + 27746408e2 journal: Truncate file instead of punching hole in final object + 59b6130030 shared: Ensure COPY_HOLES copies trailing holes + ac9ccba73f journal: stat journal file after truncating + 0257283444 journal: Copy holes when archiving BTRFS journal files + 26c2a9952d shared: Copy holes in sparse files in copy_bytes_full() + 6c7191dece copy: fix wrong argument passed to S_ISREG() in copy_file_fd_full() + af0a43024d udev: 60-persistent-storage-tape.rules: handle duplicate device ID (bsc#1195529) + +------------------------------------------------------------------- +Sat Mar 12 12:57:26 UTC 2022 - Callum Farmer + +- Update Supplements to new format in baselibs.conf +- Fix libsystemd-shared exclusion in baselibs.conf +- Exclude new cryptsetup libraries in baselibs.conf + +------------------------------------------------------------------- +Tue Mar 8 19:08:03 UTC 2022 - Franck Bui + +- systemd.spec: minor simplification by assuming that %{bootstrap} is always + defined. + +------------------------------------------------------------------- +Tue Mar 8 17:50:57 UTC 2022 - Franck Bui + +- Make sure to create 'systemd-coredump' system user when systemd-coredump is + installed (follow-up for the split of the sysusers config files). + +------------------------------------------------------------------- +Tue Mar 8 09:41:42 UTC 2022 - Franck Bui + +- Upgrade to v250.3 (commit dbd8bd2b9fd827ca89ed18034b60703c95798e01) + + See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for + details. + + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch + 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch + +- Dropped 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch + + The alias makes little sense as soon as multiple network managers are used in + parallel. + ------------------------------------------------------------------- Tue Mar 8 07:41:41 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 31ea93ca..464b6839 100644 --- a/systemd.spec +++ b/systemd.spec @@ -27,7 +27,7 @@ %endif %define min_kernel_version 4.5 -%define suse_version +suse.86.g0bb1977021 +%define suse_version +suse.35.g8ef8dfd540 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -37,7 +37,7 @@ %define __when_2() %{expand:%%{?with_%{1}:%{2}}%%{!?with_%{1}:false}} %define when() %{expand:%%__when_%# %{*}} -%if 0%{?bootstrap} +%if %{bootstrap} %bcond_with coredump %bcond_with importd %bcond_with journal_remote @@ -71,12 +71,12 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 249.10 +Version: 250.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if ! 0%{?bootstrap} +%if ! %{bootstrap} BuildRequires: docbook-xsl-stylesheets BuildRequires: kbd BuildRequires: libapparmor-devel @@ -132,7 +132,7 @@ BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 BuildRequires: gnu-efi %endif -%if 0%{?bootstrap} +%if %{bootstrap} #!BuildIgnore: dbus-1 Provides: systemd = %{version}-%{release} Conflicts: systemd @@ -215,12 +215,16 @@ 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 -Patch7: 0007-networkd-make-network.service-an-alias-of-systemd-ne.patch +%if %{with sysvcompat} Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch +%endif Patch10: 0001-conf-parser-introduce-early-drop-ins.patch Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch 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 + # Patches listed below are put in quarantine. Normally all changes # must go to upstream first and then are cherry-picked in the SUSE git # repository. But in very few cases, some stuff might be broken in @@ -241,7 +245,7 @@ drop-in replacement for sysvinit. %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: systemd-doc Requires: this-is-only-for-build-envs %else @@ -259,7 +263,7 @@ Requires: libudev%{?mini}1 = %{version}-%{release} Requires: systemd-rpm-macros Provides: libudev%{?mini}-devel = %{version}-%{release} Obsoletes: libudev%{?mini}-devel < %{version}-%{release} -%if 0%{?bootstrap} +%if %{bootstrap} Provides: systemd-devel = %{version}-%{release} Conflicts: systemd-devel Provides: libudev-devel = %{version}-%{release} @@ -292,7 +296,7 @@ Please note that the content of this package is considered as deprecated. %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: kiwi Conflicts: libsystemd0 Provides: libsystemd0 = %{version}-%{release} @@ -338,7 +342,7 @@ Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: udev Provides: udev = %{version}-%{release} %endif @@ -353,7 +357,7 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: kiwi Conflicts: libudev1 Provides: libudev1 = %{version}-%{release} @@ -387,7 +391,7 @@ Obsoletes: nss-mymachines < %{version}-%{release} Provides: nss-mymachines = %{version}-%{release} Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn -%if 0%{?bootstrap} +%if %{bootstrap} Conflicts: systemd-container Provides: systemd-container = %{version}-%{release} %endif @@ -458,7 +462,7 @@ http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -625,7 +629,7 @@ The package contains: homed, pstore, repart, userdbd. Have fun with these services at your own risk. %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %lang_package %endif @@ -670,7 +674,7 @@ Have fun with these services at your own risk. -Dima=false \ -Delfutils=auto \ -Doomd=false \ -%if 0%{?bootstrap} +%if %{bootstrap} -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ -Dtranslations=false \ @@ -690,6 +694,7 @@ Have fun with these services at your own risk. \ -Defi=%{when sd_boot} \ -Dgnu-efi=%{when sd_boot} \ + -Dsbat-distro= \ \ -Dresolve=%{when resolved} \ -Ddns-servers='' \ @@ -759,6 +764,11 @@ rm -f %{buildroot}/etc/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2} +# kmod keeps insisting on using /lib on SLE. +if [ "%{_modprobedir}" != /usr/lib/modprobe.d ]; then + mv %{buildroot}/usr/lib/modprobe.d %{buildroot}%{_modprobedir} +fi + # don't enable wall ask password service, it spams every console (bnc#747783) rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -913,7 +923,7 @@ rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %find_lang systemd %endif @@ -942,7 +952,7 @@ if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then chmod 444 %{_sysconfdir}/machine-id fi -%if ! 0%{?bootstrap} +%if ! %{bootstrap} pam-config --add --systemd || : %endif @@ -1125,7 +1135,12 @@ fi %ldconfig %endif -%if ! 0%{?bootstrap} +%if %{with coredump} +%post coredump +%sysusers_create systemd-coredump.conf +%endif + +%if ! %{bootstrap} %ldconfig_scriptlets -n nss-myhostname %ldconfig_scriptlets -n nss-systemd %endif @@ -1270,13 +1285,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.32.0 +%{_libdir}/libsystemd.so.0.33.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.2 +%{_libdir}/libudev.so.1.7.3 %if %{with coredump} %files coredump @@ -1289,14 +1304,14 @@ fi %{_sysusersdir}/systemd-coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %{_mandir}/man1/coredumpctl* %{_mandir}/man5/coredump.conf* %{_mandir}/man8/systemd-coredump* %endif %endif -%if ! 0%{?bootstrap} +%if ! %{bootstrap} %files lang -f systemd.lang %files -n nss-myhostname @@ -1383,6 +1398,10 @@ fi %{_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 From 9cdcd2bbdc03724867b5472fa15276170d8150c4be50dd68a29d99921eb26d7c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 5 Apr 2022 17:57:49 +0000 Subject: [PATCH 097/124] Accepting request 966218 from Base:System - Temporarily disable 'libcryptsetup plugins until dracut 056 is merged in Factory - Add 0001-meson-build-kernel-install-man-page-when-necessary.patch Submitted to upstream: https://github.com/systemd/systemd/pull/22918 - Move systemd-boot and all components managing (secure) UEFI boot into udev sub-package: they may deserve a dedicated sub-package in the future but for now move them to udev so they aren't installed in systemd based containers. - Move a bunch of components operating on (mainly block) devices into udev as without udev they're most likely useless. - spec: enable 'efi' support regardless of whether sd_boot is enabled or not We should support EFI systems even if systemd-boot is not enabled. OBS-URL: https://build.opensuse.org/request/show/966218 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=355 --- ...rnel-install-man-page-when-necessary.patch | 90 +++++++++ files.systemd | 178 ------------------ files.udev | 108 +++++++++++ files.uefi-boot | 43 +++++ systemd.changes | 30 +++ systemd.spec | 61 +++--- 6 files changed, 307 insertions(+), 203 deletions(-) create mode 100644 0001-meson-build-kernel-install-man-page-when-necessary.patch create mode 100644 files.uefi-boot diff --git a/0001-meson-build-kernel-install-man-page-when-necessary.patch b/0001-meson-build-kernel-install-man-page-when-necessary.patch new file mode 100644 index 00000000..8e601854 --- /dev/null +++ b/0001-meson-build-kernel-install-man-page-when-necessary.patch @@ -0,0 +1,90 @@ +From fecffebc9a0f4e2309e9d8d561c0b0c4b6678b0b Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Thu, 31 Mar 2022 11:17:10 +0200 +Subject: [PATCH 1/1] meson: build kernel-install man page when necessary + +--- + man/rules/meson.build | 2 +- + meson.build | 5 ++++- + shell-completion/bash/meson.build | 2 +- + shell-completion/zsh/meson.build | 2 +- + src/kernel-install/meson.build | 2 -- + 5 files changed, 7 insertions(+), 6 deletions(-) + +diff --git a/man/rules/meson.build b/man/rules/meson.build +index aaa69d3038..f10abdaf0d 100644 +--- a/man/rules/meson.build ++++ b/man/rules/meson.build +@@ -30,7 +30,7 @@ manpages = [ + ['journalctl', '1', [], ''], + ['journald.conf', '5', ['journald.conf.d', 'journald@.conf'], ''], + ['kernel-command-line', '7', [], ''], +- ['kernel-install', '8', [], ''], ++ ['kernel-install', '8', [], 'ENABLE_KERNEL_INSTALL'], + ['libudev', '3', [], ''], + ['loader.conf', '5', [], 'HAVE_GNU_EFI'], + ['locale.conf', '5', [], ''], +diff --git a/meson.build b/meson.build +index e68791b8b4..311895db5e 100644 +--- a/meson.build ++++ b/meson.build +@@ -1675,6 +1675,9 @@ else + endif + conf.set10('ENABLE_IMPORTD', have) + ++want_kernel_install = get_option('kernel-install') ++conf.set10('ENABLE_KERNEL_INSTALL', want_kernel_install) ++ + want_homed = get_option('homed') + if want_homed != 'false' + have = (conf.get('HAVE_OPENSSL') == 1 and +@@ -4143,7 +4146,7 @@ foreach tuple : [ + ['hwdb'], + ['importd'], + ['initrd'], +- ['kernel-install', get_option('kernel-install')], ++ ['kernel-install'], + ['localed'], + ['logind'], + ['machined'], +diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build +index 963a11b6ce..ae6a61e555 100644 +--- a/shell-completion/bash/meson.build ++++ b/shell-completion/bash/meson.build +@@ -31,7 +31,7 @@ items = [['busctl', ''], + ['systemd-path', ''], + ['systemd-run', ''], + ['udevadm', ''], +- ['kernel-install', ''], ++ ['kernel-install', 'ENABLE_KERNEL_INSTALL'], + ['bootctl', 'HAVE_GNU_EFI'], + ['coredumpctl', 'ENABLE_COREDUMP'], + ['homectl', 'ENABLE_HOMED'], +diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build +index 6dca9dd595..bac531798c 100644 +--- a/shell-completion/zsh/meson.build ++++ b/shell-completion/zsh/meson.build +@@ -22,7 +22,7 @@ items = [['_busctl', ''], + ['_systemd-path', ''], + ['_systemd-run', ''], + ['_udevadm', ''], +- ['_kernel-install', ''], ++ ['_kernel-install', 'ENABLE_KERNEL_INSTALL'], + ['_sd_hosts_or_user_at_host', ''], + ['_sd_outputmodes', ''], + ['_sd_unit_files', ''], +diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build +index 508058f1cf..abc3520b62 100644 +--- a/src/kernel-install/meson.build ++++ b/src/kernel-install/meson.build +@@ -1,7 +1,5 @@ + # SPDX-License-Identifier: LGPL-2.1-or-later + +-want_kernel_install = get_option('kernel-install') +- + if want_kernel_install + install_data('kernel-install', + install_mode : 'rwxr-xr-x', +-- +2.34.1 + diff --git a/files.systemd b/files.systemd index b919c2af..044ab793 100644 --- a/files.systemd +++ b/files.systemd @@ -27,18 +27,11 @@ %endif %dir %{_environmentdir} %dir %{_journalcatalogdir} -%if ! %{bootstrap} -%dir %{_libdir}/cryptsetup -%endif %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} -%dir %{_modulesloaddir} -%dir %{_prefix}/lib/kernel -%dir %{_prefix}/lib/kernel/install.d %dir %{_sysconfdir}/X11/xorg.conf.d %dir %{_sysconfdir}/binfmt.d -%dir %{_sysconfdir}/modules-load.d %dir %{_sysconfdir}/sysctl.d %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/systemd/system @@ -49,10 +42,6 @@ %dir %{_systemd_system_env_generator_dir} %dir %{_systemd_user_env_generator_dir} %dir %{_systemd_util_dir} -%if %{with sd_boot} -%dir %{_systemd_util_dir}/boot -%dir %{_systemd_util_dir}/boot/efi -%endif %dir %{_systemd_util_dir}/ntp-units.d %dir %{_systemd_util_dir}/scripts %dir %{_systemd_util_dir}/system-preset @@ -97,18 +86,13 @@ %ghost %config(noreplace) %{_sysconfdir}/machine-info %ghost %config(noreplace) %{_sysconfdir}/vconsole.conf %ghost %dir %attr(2755, root, systemd-journal) %{_localstatedir}/log/journal -%ghost %{_localstatedir}/lib/systemd/backlight %ghost %{_localstatedir}/lib/systemd/catalog/database %ghost %{_localstatedir}/lib/systemd/i18n-migrated %license LICENSE.GPL2 %license LICENSE.LGPL2.1 -%if %{with sd_boot} -%{_bindir}/bootctl -%endif %{_bindir}/busctl %{_bindir}/hostnamectl %{_bindir}/journalctl -%{_bindir}/kernel-install %{_bindir}/localectl %{_bindir}/loginctl %{_bindir}/systemctl @@ -118,9 +102,6 @@ %{_bindir}/systemd-cgls %{_bindir}/systemd-cgtop %{_bindir}/systemd-creds -%if ! %{bootstrap} -%{_bindir}/systemd-cryptenroll -%endif %{_bindir}/systemd-delta %{_bindir}/systemd-detect-virt %{_bindir}/systemd-dissect @@ -142,14 +123,10 @@ %{_bindir}/systemd-umount %{_bindir}/timedatectl %if ! %{bootstrap} -%if %{with sd_boot} -%{_datadir}/bash-completion/completions/bootctl -%endif %{_datadir}/bash-completion/completions/busctl %{_datadir}/bash-completion/completions/coredumpctl %{_datadir}/bash-completion/completions/hostnamectl %{_datadir}/bash-completion/completions/journalctl -%{_datadir}/bash-completion/completions/kernel-install %{_datadir}/bash-completion/completions/localectl %{_datadir}/bash-completion/completions/loginctl %{_datadir}/bash-completion/completions/portablectl @@ -210,14 +187,10 @@ %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map %if ! %{bootstrap} -%if %{with sd_boot} -%{_datadir}/zsh/site-functions/_bootctl -%endif %{_datadir}/zsh/site-functions/_busctl %{_datadir}/zsh/site-functions/_coredumpctl %{_datadir}/zsh/site-functions/_hostnamectl %{_datadir}/zsh/site-functions/_journalctl -%{_datadir}/zsh/site-functions/_kernel-install %{_datadir}/zsh/site-functions/_localectl %{_datadir}/zsh/site-functions/_loginctl %{_datadir}/zsh/site-functions/_sd_hosts_or_user_at_host @@ -247,14 +220,6 @@ %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if ! 0%{bootstrap} -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so -%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so -%endif -%if ! 0%{bootstrap} -%if %{with sd_boot} -%{_mandir}/man1/bootctl.1.gz -%endif %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz %{_mandir}/man1/init.1.gz @@ -268,7 +233,6 @@ %{_mandir}/man1/systemd-cgls.1.gz %{_mandir}/man1/systemd-cgtop.1.gz %{_mandir}/man1/systemd-creds.1.gz -%{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man1/systemd-delta.1.gz %{_mandir}/man1/systemd-detect-virt.1.gz %{_mandir}/man1/systemd-dissect.1.gz @@ -289,26 +253,20 @@ %{_mandir}/man1/systemd.1.gz %{_mandir}/man1/timedatectl.1.gz %{_mandir}/man5/binfmt.d.5.gz -%{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/dnssec-trust-anchors.d.5.gz %{_mandir}/man5/environment.d.5.gz %{_mandir}/man5/extension-release.5.gz %{_mandir}/man5/hostname.5.gz %{_mandir}/man5/initrd-release.5.gz -%{_mandir}/man5/integritytab.5.gz %{_mandir}/man5/journald.conf.5.gz %{_mandir}/man5/journald.conf.d.5.gz %{_mandir}/man5/journald@.conf.5.gz -%if %{with sd_boot} -%{_mandir}/man5/loader.conf.5.gz -%endif %{_mandir}/man5/locale.conf.5.gz %{_mandir}/man5/localtime.5.gz %{_mandir}/man5/logind.conf.5.gz %{_mandir}/man5/logind.conf.d.5.gz %{_mandir}/man5/machine-id.5.gz %{_mandir}/man5/machine-info.5.gz -%{_mandir}/man5/modules-load.d.5.gz %{_mandir}/man5/org.freedesktop.LogControl1.5.gz %{_mandir}/man5/org.freedesktop.hostname1.5.gz %{_mandir}/man5/org.freedesktop.locale1.5.gz @@ -353,19 +311,10 @@ %{_mandir}/man5/user.conf.d.5.gz %{_mandir}/man5/user@.service.5.gz %{_mandir}/man5/vconsole.conf.5.gz -%{_mandir}/man5/veritytab.5.gz %{_mandir}/man7/bootup.7.gz %{_mandir}/man7/daemon.7.gz %{_mandir}/man7/file-hierarchy.7.gz %{_mandir}/man7/kernel-command-line.7.gz -%if %{with sd_boot} -%{_mandir}/man7/linuxaa64.efi.stub.7.gz -%{_mandir}/man7/linuxia32.efi.stub.7.gz -%{_mandir}/man7/linuxx64.efi.stub.7.gz -%{_mandir}/man7/sd-boot.7.gz -%{_mandir}/man7/systemd-boot.7.gz -%{_mandir}/man7/systemd-stub.7.gz -%endif %{_mandir}/man7/systemd.directives.7.gz %{_mandir}/man7/systemd.environment-generator.7.gz %{_mandir}/man7/systemd.generator.7.gz @@ -378,7 +327,6 @@ %{_mandir}/man7/systemd.time.7.gz %{_mandir}/man8/30-systemd-environment-d-generator.8.gz %{_mandir}/man8/halt.8.gz -%{_mandir}/man8/kernel-install.8.gz %{_mandir}/man8/pam_systemd.8.gz %{_mandir}/man8/poweroff.8.gz %{_mandir}/man8/rc-local.service.8.gz @@ -388,33 +336,16 @@ %{_mandir}/man8/systemd-ask-password-console.service.8.gz %{_mandir}/man8/systemd-ask-password-wall.path.8.gz %{_mandir}/man8/systemd-ask-password-wall.service.8.gz -%{_mandir}/man8/systemd-backlight.8.gz -%{_mandir}/man8/systemd-backlight@.service.8.gz %{_mandir}/man8/systemd-binfmt.8.gz %{_mandir}/man8/systemd-binfmt.service.8.gz -%if %{with sd_boot} -%{_mandir}/man8/systemd-bless-boot-generator.8.gz -%{_mandir}/man8/systemd-bless-boot.8.gz -%{_mandir}/man8/systemd-bless-boot.service.8.gz -%endif %{_mandir}/man8/systemd-boot-check-no-failures.8.gz %{_mandir}/man8/systemd-boot-check-no-failures.service.8.gz -%if %{with sd_boot} -%{_mandir}/man8/systemd-boot-system-token.service.8.gz -%endif -%{_mandir}/man8/systemd-cryptsetup-generator.8.gz -%{_mandir}/man8/systemd-cryptsetup.8.gz -%{_mandir}/man8/systemd-cryptsetup@.service.8.gz %{_mandir}/man8/systemd-debug-generator.8.gz %{_mandir}/man8/systemd-environment-d-generator.8.gz %{_mandir}/man8/systemd-fsck-root.service.8.gz %{_mandir}/man8/systemd-fsck.8.gz %{_mandir}/man8/systemd-fsck@.service.8.gz -%{_mandir}/man8/systemd-fstab-generator.8.gz %{_mandir}/man8/systemd-getty-generator.8.gz -%{_mandir}/man8/systemd-gpt-auto-generator.8.gz -%{_mandir}/man8/systemd-growfs.8.gz -%{_mandir}/man8/systemd-growfs@.service.8.gz %{_mandir}/man8/systemd-halt.service.8.gz %{_mandir}/man8/systemd-hibernate-resume-generator.8.gz %{_mandir}/man8/systemd-hibernate-resume.8.gz @@ -423,9 +354,6 @@ %{_mandir}/man8/systemd-hostnamed.8.gz %{_mandir}/man8/systemd-hostnamed.service.8.gz %{_mandir}/man8/systemd-hybrid-sleep.service.8.gz -%{_mandir}/man8/systemd-integritysetup-generator.8.gz -%{_mandir}/man8/systemd-integritysetup.8.gz -%{_mandir}/man8/systemd-integritysetup@.service.8.gz %{_mandir}/man8/systemd-journald-audit.socket.8.gz %{_mandir}/man8/systemd-journald-dev-log.socket.8.gz %{_mandir}/man8/systemd-journald-varlink@.socket.8.gz @@ -440,11 +368,7 @@ %{_mandir}/man8/systemd-logind.8.gz %{_mandir}/man8/systemd-logind.service.8.gz %{_mandir}/man8/systemd-machine-id-commit.service.8.gz -%{_mandir}/man8/systemd-makefs.8.gz -%{_mandir}/man8/systemd-makefs@.service.8.gz %{_mandir}/man8/systemd-mkswap@.service.8.gz -%{_mandir}/man8/systemd-modules-load.8.gz -%{_mandir}/man8/systemd-modules-load.service.8.gz %{_mandir}/man8/systemd-poweroff.service.8.gz %{_mandir}/man8/systemd-quotacheck.8.gz %{_mandir}/man8/systemd-quotacheck.service.8.gz @@ -453,9 +377,6 @@ %{_mandir}/man8/systemd-reboot.service.8.gz %{_mandir}/man8/systemd-remount-fs.8.gz %{_mandir}/man8/systemd-remount-fs.service.8.gz -%{_mandir}/man8/systemd-rfkill.8.gz -%{_mandir}/man8/systemd-rfkill.service.8.gz -%{_mandir}/man8/systemd-rfkill.socket.8.gz %{_mandir}/man8/systemd-run-generator.8.gz %{_mandir}/man8/systemd-shutdown.8.gz %{_mandir}/man8/systemd-sleep.8.gz @@ -477,7 +398,6 @@ %{_mandir}/man8/systemd-timesyncd.service.8.gz %{_mandir}/man8/systemd-tmpfiles-clean.service.8.gz %{_mandir}/man8/systemd-tmpfiles-clean.timer.8.gz -%{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8.gz %{_mandir}/man8/systemd-tmpfiles-setup.service.8.gz %{_mandir}/man8/systemd-tmpfiles.8.gz %{_mandir}/man8/systemd-update-done.8.gz @@ -488,19 +408,11 @@ %{_mandir}/man8/systemd-user-sessions.service.8.gz %{_mandir}/man8/systemd-vconsole-setup.8.gz %{_mandir}/man8/systemd-vconsole-setup.service.8.gz -%{_mandir}/man8/systemd-veritysetup-generator.8.gz -%{_mandir}/man8/systemd-veritysetup.8.gz -%{_mandir}/man8/systemd-veritysetup@.service.8.gz -%{_mandir}/man8/systemd-volatile-root.8.gz -%{_mandir}/man8/systemd-volatile-root.service.8.gz %{_mandir}/man8/systemd-xdg-autostart-generator.8.gz %endif %{_modprobedir}/systemd.conf %{_pam_moduledir}/pam_systemd.so %{_pam_vendordir}/systemd-user -%{_prefix}/lib/kernel/install.conf -%{_prefix}/lib/kernel/install.d/50-depmod.install -%{_prefix}/lib/kernel/install.d/90-loaderentry.install %{_sbindir}/halt %{_sbindir}/init %{_sbindir}/poweroff @@ -509,12 +421,6 @@ %{_sysconfdir}/xdg/systemd/user %{_sysctldir}/99-sysctl.conf %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator -%if %{with sd_boot} -# These are part of the very few exceptions where glob pattern is allowd. -%{_systemd_util_dir}/boot/efi/linux*.efi.stub -%{_systemd_util_dir}/boot/efi/linux*.elf.stub -%{_systemd_util_dir}/boot/efi/systemd-boot*.efi -%endif %{_systemd_util_dir}/libsystemd-shared-250.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh @@ -522,33 +428,19 @@ %{_systemd_util_dir}/system-preset/99-default.preset %{_systemd_util_dir}/systemd %{_systemd_util_dir}/systemd-ac-power -%{_systemd_util_dir}/systemd-backlight %{_systemd_util_dir}/systemd-binfmt -%if %{with sd_boot} -%{_systemd_util_dir}/systemd-bless-boot -%endif %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent -%if ! %{bootstrap} -%{_systemd_util_dir}/systemd-cryptsetup -%endif %{_systemd_util_dir}/systemd-fsck -%{_systemd_util_dir}/systemd-growfs %{_systemd_util_dir}/systemd-hibernate-resume %{_systemd_util_dir}/systemd-hostnamed -%if ! %{bootstrap} -%{_systemd_util_dir}/systemd-integritysetup -%endif %{_systemd_util_dir}/systemd-journald %{_systemd_util_dir}/systemd-localed %{_systemd_util_dir}/systemd-logind -%{_systemd_util_dir}/systemd-makefs -%{_systemd_util_dir}/systemd-modules-load %{_systemd_util_dir}/systemd-quotacheck %{_systemd_util_dir}/systemd-random-seed %{_systemd_util_dir}/systemd-remount-fs %{_systemd_util_dir}/systemd-reply-password -%{_systemd_util_dir}/systemd-rfkill %{_systemd_util_dir}/systemd-shutdown %{_systemd_util_dir}/systemd-sleep %{_systemd_util_dir}/systemd-socket-proxyd @@ -562,10 +454,6 @@ %{_systemd_util_dir}/systemd-user-runtime-dir %{_systemd_util_dir}/systemd-user-sessions %{_systemd_util_dir}/systemd-vconsole-setup -%if ! %{bootstrap} -%{_systemd_util_dir}/systemd-veritysetup -%endif -%{_systemd_util_dir}/systemd-volatile-root %{_systemd_util_dir}/systemd-xdg-autostart-condition %{_systemd_util_dir}/user-generators/systemd-xdg-autostart-generator %{_systemd_util_dir}/user-preset/90-systemd.preset @@ -591,25 +479,11 @@ %{_systemd_util_dir}/user/systemd-tmpfiles-setup.service %{_systemd_util_dir}/user/timers.target %{_systemd_util_dir}/user/xdg-desktop-autostart.target -%if %{with sd_boot} -%{_systemdgeneratordir}/systemd-bless-boot-generator -%endif -%if ! %{bootstrap} -%{_systemdgeneratordir}/systemd-cryptsetup-generator -%endif %{_systemdgeneratordir}/systemd-debug-generator -%{_systemdgeneratordir}/systemd-fstab-generator %{_systemdgeneratordir}/systemd-getty-generator -%{_systemdgeneratordir}/systemd-gpt-auto-generator %{_systemdgeneratordir}/systemd-hibernate-resume-generator -%if ! %{bootstrap} -%{_systemdgeneratordir}/systemd-integritysetup-generator -%endif %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator -%if ! %{bootstrap} -%{_systemdgeneratordir}/systemd-veritysetup-generator -%endif %{_sysusersdir}/systemd-journal.conf %if %{with networkd} # Yes, systemd-network.conf really belongs here, see @@ -635,10 +509,6 @@ %{_unitdir}/boot-complete.target %{_unitdir}/console-getty.service %{_unitdir}/container-getty@.service -%if ! %{bootstrap} -%{_unitdir}/cryptsetup-pre.target -%{_unitdir}/cryptsetup.target -%endif %{_unitdir}/ctrl-alt-del.target %{_unitdir}/dbus-org.freedesktop.hostname1.service %{_unitdir}/dbus-org.freedesktop.locale1.service @@ -665,19 +535,11 @@ %{_unitdir}/initrd-fs.target %{_unitdir}/initrd-parse-etc.service %{_unitdir}/initrd-root-device.target -%if ! %{bootstrap} -%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target -%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target -%endif %{_unitdir}/initrd-root-fs.target %{_unitdir}/initrd-switch-root.service %{_unitdir}/initrd-switch-root.target %{_unitdir}/initrd-usr-fs.target %{_unitdir}/initrd.target -%if ! %{bootstrap} -%{_unitdir}/integritysetup-pre.target -%{_unitdir}/integritysetup.target -%endif %{_unitdir}/kexec.target %{_unitdir}/local-fs-pre.target %{_unitdir}/local-fs.target @@ -700,14 +562,8 @@ %{_unitdir}/proc-sys-fs-binfmt_misc.mount %{_unitdir}/quotaon.service %{_unitdir}/reboot.target -%if ! %{bootstrap} -%{_unitdir}/remote-cryptsetup.target -%endif %{_unitdir}/remote-fs-pre.target %{_unitdir}/remote-fs.target -%if ! %{bootstrap} -%{_unitdir}/remote-veritysetup.target -%endif %{_unitdir}/rescue.service %{_unitdir}/rescue.target %{_unitdir}/rpcbind.target @@ -729,14 +585,8 @@ %{_unitdir}/sys-kernel-debug.mount %{_unitdir}/sys-kernel-tracing.mount %{_unitdir}/sysinit.target -%if ! %{bootstrap} -%{_unitdir}/sysinit.target.wants/cryptsetup.target -%endif %{_unitdir}/sysinit.target.wants/dev-hugepages.mount %{_unitdir}/sysinit.target.wants/dev-mqueue.mount -%if ! %{bootstrap} -%{_unitdir}/sysinit.target.wants/integritysetup.target -%endif %{_unitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount %{_unitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{_unitdir}/sysinit.target.wants/sys-kernel-config.mount @@ -744,29 +594,18 @@ %{_unitdir}/sysinit.target.wants/sys-kernel-tracing.mount %{_unitdir}/sysinit.target.wants/systemd-ask-password-console.path %{_unitdir}/sysinit.target.wants/systemd-binfmt.service -%if %{with sd_boot} -%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service -%endif %{_unitdir}/sysinit.target.wants/systemd-firstboot.service %{_unitdir}/sysinit.target.wants/systemd-journal-catalog-update.service %{_unitdir}/sysinit.target.wants/systemd-journal-flush.service %{_unitdir}/sysinit.target.wants/systemd-journald.service %{_unitdir}/sysinit.target.wants/systemd-machine-id-commit.service -%{_unitdir}/sysinit.target.wants/systemd-modules-load.service %{_unitdir}/sysinit.target.wants/systemd-random-seed.service %{_unitdir}/sysinit.target.wants/systemd-sysctl.service %{_unitdir}/sysinit.target.wants/systemd-sysusers.service -%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup.service %{_unitdir}/sysinit.target.wants/systemd-update-done.service %{_unitdir}/sysinit.target.wants/systemd-update-utmp.service -%if ! %{bootstrap} -%{_unitdir}/sysinit.target.wants/veritysetup.target -%endif %{_unitdir}/syslog.socket -%if ! %{bootstrap} -%{_unitdir}/system-systemd\x2dcryptsetup.slice -%endif %{_unitdir}/system-update-cleanup.service %{_unitdir}/system-update-pre.target %{_unitdir}/system-update.target @@ -774,16 +613,8 @@ %{_unitdir}/systemd-ask-password-console.service %{_unitdir}/systemd-ask-password-wall.path %{_unitdir}/systemd-ask-password-wall.service -%{_unitdir}/systemd-backlight@.service %{_unitdir}/systemd-binfmt.service -%if %{with sd_boot} -%{_unitdir}/systemd-bless-boot.service -%endif %{_unitdir}/systemd-boot-check-no-failures.service -%if %{with sd_boot} -%{_unitdir}/systemd-boot-system-token.service -%{_unitdir}/systemd-boot-update.service -%endif %{_unitdir}/systemd-exit.service %{_unitdir}/systemd-firstboot.service %{_unitdir}/systemd-fsck-root.service @@ -805,14 +636,11 @@ %{_unitdir}/systemd-localed.service %{_unitdir}/systemd-logind.service %{_unitdir}/systemd-machine-id-commit.service -%{_unitdir}/systemd-modules-load.service %{_unitdir}/systemd-poweroff.service %{_unitdir}/systemd-quotacheck.service %{_unitdir}/systemd-random-seed.service %{_unitdir}/systemd-reboot.service %{_unitdir}/systemd-remount-fs.service -%{_unitdir}/systemd-rfkill.service -%{_unitdir}/systemd-rfkill.socket %{_unitdir}/systemd-suspend-then-hibernate.service %{_unitdir}/systemd-suspend.service %{_unitdir}/systemd-sysctl.service @@ -823,13 +651,11 @@ %{_unitdir}/systemd-timesyncd.service %{_unitdir}/systemd-tmpfiles-clean.service %{_unitdir}/systemd-tmpfiles-clean.timer -%{_unitdir}/systemd-tmpfiles-setup-dev.service %{_unitdir}/systemd-tmpfiles-setup.service %{_unitdir}/systemd-update-done.service %{_unitdir}/systemd-update-utmp.service %{_unitdir}/systemd-user-sessions.service %{_unitdir}/systemd-vconsole-setup.service -%{_unitdir}/systemd-volatile-root.service %{_unitdir}/time-set.target %{_unitdir}/time-sync.target %{_unitdir}/timers.target @@ -842,10 +668,6 @@ %{_unitdir}/user-runtime-dir@.service %{_unitdir}/user.slice %{_unitdir}/user@.service -%if ! %{bootstrap} -%{_unitdir}/veritysetup-pre.target -%{_unitdir}/veritysetup.target -%endif %{xinitconfdir}/xinitrc.d/50-systemd-user.sh %if %{with split_usr} /bin/systemctl diff --git a/files.udev b/files.udev index 52a309e6..273dd04f 100644 --- a/files.udev +++ b/files.udev @@ -2,7 +2,14 @@ # Please keep the list sorted (with `LC_ALL=C sort`). # %config(noreplace) %{_sysconfdir}/udev/udev.conf +%if ! %{bootstrap} +# %%dir %{_libdir}/cryptsetup +%dir %{_modulesloaddir} +%endif %dir %{_prefix}/lib/udev +%if ! %{bootstrap} +%dir %{_sysconfdir}/modules-load.d +%endif %dir %{_sysconfdir}/udev %dir %{_sysconfdir}/udev/rules.d %dir %{_systemd_util_dir}/network @@ -12,6 +19,10 @@ %doc %{_udevrulesdir}/README %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation +%ghost %{_localstatedir}/lib/systemd/backlight +%if ! %{bootstrap} +%{_bindir}/systemd-cryptenroll +%endif %{_bindir}/systemd-hwdb %{_bindir}/udevadm %if ! %{bootstrap} @@ -22,17 +33,50 @@ %{_datadir}/zsh/site-functions/_udevadm %endif %if ! %{bootstrap} +# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%{_mandir}/man1/systemd-cryptenroll.1.gz +%{_mandir}/man5/crypttab.5.gz +%{_mandir}/man5/integritytab.5.gz +%{_mandir}/man5/modules-load.d.5.gz %{_mandir}/man5/udev.conf.5.gz +%{_mandir}/man5/veritytab.5.gz %{_mandir}/man7/hwdb.7.gz %{_mandir}/man7/udev.7.gz +%{_mandir}/man8/systemd-backlight.8.gz +%{_mandir}/man8/systemd-backlight@.service.8.gz +%{_mandir}/man8/systemd-cryptsetup-generator.8.gz +%{_mandir}/man8/systemd-cryptsetup.8.gz +%{_mandir}/man8/systemd-cryptsetup@.service.8.gz +%{_mandir}/man8/systemd-fstab-generator.8.gz +%{_mandir}/man8/systemd-gpt-auto-generator.8.gz +%{_mandir}/man8/systemd-growfs.8.gz +%{_mandir}/man8/systemd-growfs@.service.8.gz %{_mandir}/man8/systemd-hwdb.8.gz +%{_mandir}/man8/systemd-integritysetup-generator.8.gz +%{_mandir}/man8/systemd-integritysetup.8.gz +%{_mandir}/man8/systemd-integritysetup@.service.8.gz +%{_mandir}/man8/systemd-makefs.8.gz +%{_mandir}/man8/systemd-makefs@.service.8.gz +%{_mandir}/man8/systemd-modules-load.8.gz +%{_mandir}/man8/systemd-modules-load.service.8.gz %{_mandir}/man8/systemd-network-generator.8.gz %{_mandir}/man8/systemd-network-generator.service.8.gz +%{_mandir}/man8/systemd-rfkill.8.gz +%{_mandir}/man8/systemd-rfkill.service.8.gz +%{_mandir}/man8/systemd-rfkill.socket.8.gz +%{_mandir}/man8/systemd-tmpfiles-setup-dev.service.8.gz %{_mandir}/man8/systemd-udev-settle.service.8.gz %{_mandir}/man8/systemd-udevd-control.socket.8.gz %{_mandir}/man8/systemd-udevd-kernel.socket.8.gz %{_mandir}/man8/systemd-udevd.8.gz %{_mandir}/man8/systemd-udevd.service.8.gz +%{_mandir}/man8/systemd-veritysetup-generator.8.gz +%{_mandir}/man8/systemd-veritysetup.8.gz +%{_mandir}/man8/systemd-veritysetup@.service.8.gz +%{_mandir}/man8/systemd-volatile-root.8.gz +%{_mandir}/man8/systemd-volatile-root.service.8.gz %{_mandir}/man8/udevadm.8.gz %endif %{_prefix}/lib/udev/ata_id @@ -47,8 +91,34 @@ %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_systemd_util_dir}/network/99-default.link +%{_systemd_util_dir}/systemd-backlight +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-cryptsetup +%endif +%{_systemd_util_dir}/systemd-growfs +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-integritysetup +%endif +%{_systemd_util_dir}/systemd-makefs +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-modules-load +%endif %{_systemd_util_dir}/systemd-network-generator +%{_systemd_util_dir}/systemd-rfkill %{_systemd_util_dir}/systemd-udevd +%if ! %{bootstrap} +%{_systemd_util_dir}/systemd-veritysetup +%endif +%{_systemd_util_dir}/systemd-volatile-root +%if ! %{bootstrap} +%{_systemdgeneratordir}/systemd-cryptsetup-generator +%endif +%{_systemdgeneratordir}/systemd-fstab-generator +%{_systemdgeneratordir}/systemd-gpt-auto-generator +%if ! %{bootstrap} +%{_systemdgeneratordir}/systemd-integritysetup-generator +%{_systemdgeneratordir}/systemd-veritysetup-generator +%endif %{_tmpfilesdir}/static-nodes-permissions.conf %{_udevhwdbdir}/20-OUI.hwdb %{_udevhwdbdir}/20-acpi-vendor.hwdb @@ -105,25 +175,63 @@ %{_udevrulesdir}/75-net-description.rules %{_udevrulesdir}/75-probe_mtd.rules %{_udevrulesdir}/78-sound-card.rules +%if ! %{bootstrap} %{_udevrulesdir}/80-drivers.rules +%endif %{_udevrulesdir}/80-net-setup-link.rules %{_udevrulesdir}/81-net-dhcp.rules %{_udevrulesdir}/90-vconsole.rules +%if ! %{bootstrap} +%{_unitdir}/cryptsetup-pre.target +%{_unitdir}/cryptsetup.target +%{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target +%{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target +%endif %{_unitdir}/initrd-udevadm-cleanup-db.service +%if ! %{bootstrap} +%{_unitdir}/integritysetup-pre.target +%{_unitdir}/integritysetup.target %{_unitdir}/kmod-static-nodes.service +%{_unitdir}/remote-cryptsetup.target +%{_unitdir}/remote-veritysetup.target +%endif %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/cryptsetup.target +%{_unitdir}/sysinit.target.wants/integritysetup.target %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service +%endif %{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/systemd-modules-load.service +%endif +%{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service %{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service %{_unitdir}/sysinit.target.wants/systemd-udevd.service +%if ! %{bootstrap} +%{_unitdir}/sysinit.target.wants/veritysetup.target +%{_unitdir}/system-systemd\x2dcryptsetup.slice +%endif +%{_unitdir}/systemd-backlight@.service %{_unitdir}/systemd-hwdb-update.service +%if ! %{bootstrap} +%{_unitdir}/systemd-modules-load.service +%endif %{_unitdir}/systemd-network-generator.service +%{_unitdir}/systemd-rfkill.service +%{_unitdir}/systemd-rfkill.socket +%{_unitdir}/systemd-tmpfiles-setup-dev.service %{_unitdir}/systemd-udev-settle.service %{_unitdir}/systemd-udev-trigger.service %{_unitdir}/systemd-udevd-control.socket %{_unitdir}/systemd-udevd-kernel.socket %{_unitdir}/systemd-udevd.service +%{_unitdir}/systemd-volatile-root.service +%if ! %{bootstrap} +%{_unitdir}/veritysetup-pre.target +%{_unitdir}/veritysetup.target +%endif %if %{with split_usr} /sbin/udevadm %endif diff --git a/files.uefi-boot b/files.uefi-boot new file mode 100644 index 00000000..49bcdfec --- /dev/null +++ b/files.uefi-boot @@ -0,0 +1,43 @@ +# +# Please keep the list sorted (with `LC_ALL=C sort`). +# +%if %{with sd_boot} +%dir %{_prefix}/lib/kernel +%dir %{_prefix}/lib/kernel/install.d +%dir %{_systemd_util_dir}/boot +%dir %{_systemd_util_dir}/boot/efi +%{_bindir}/bootctl +%{_bindir}/kernel-install +%if ! %{bootstrap} +%{_datadir}/bash-completion/completions/bootctl +%{_datadir}/bash-completion/completions/kernel-install +%{_datadir}/zsh/site-functions/_bootctl +%{_datadir}/zsh/site-functions/_kernel-install +%{_mandir}/man1/bootctl.1.gz +%{_mandir}/man5/loader.conf.5.gz +%{_mandir}/man7/linuxaa64.efi.stub.7.gz +%{_mandir}/man7/linuxia32.efi.stub.7.gz +%{_mandir}/man7/linuxx64.efi.stub.7.gz +%{_mandir}/man7/sd-boot.7.gz +%{_mandir}/man7/systemd-boot.7.gz +%{_mandir}/man7/systemd-stub.7.gz +%{_mandir}/man8/kernel-install.8.gz +%{_mandir}/man8/systemd-bless-boot-generator.8.gz +%{_mandir}/man8/systemd-bless-boot.8.gz +%{_mandir}/man8/systemd-bless-boot.service.8.gz +%{_mandir}/man8/systemd-boot-system-token.service.8.gz +%endif +%{_prefix}/lib/kernel/install.conf +%{_prefix}/lib/kernel/install.d/50-depmod.install +%{_prefix}/lib/kernel/install.d/90-loaderentry.install +# These are part of the very few exceptions where glob pattern is allowd. +%{_systemd_util_dir}/boot/efi/linux*.efi.stub +%{_systemd_util_dir}/boot/efi/linux*.elf.stub +%{_systemd_util_dir}/boot/efi/systemd-boot*.efi +%{_systemd_util_dir}/systemd-bless-boot +%{_systemdgeneratordir}/systemd-bless-boot-generator +%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service +%{_unitdir}/systemd-bless-boot.service +%{_unitdir}/systemd-boot-system-token.service +%{_unitdir}/systemd-boot-update.service +%endif diff --git a/systemd.changes b/systemd.changes index e8567d8a..05c8d8ec 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,33 @@ +------------------------------------------------------------------- +Thu Mar 31 12:03:19 UTC 2022 - Franck Bui + +- Temporarily disable 'libcryptsetup plugins until dracut 056 is merged in + Factory + +------------------------------------------------------------------- +Thu Mar 31 11:22:12 UTC 2022 - Franck Bui + +- Add 0001-meson-build-kernel-install-man-page-when-necessary.patch + + Submitted to upstream: https://github.com/systemd/systemd/pull/22918 + +------------------------------------------------------------------- +Mon Mar 28 18:36:39 UTC 2022 - Franck Bui + +- Move systemd-boot and all components managing (secure) UEFI boot into udev + sub-package: they may deserve a dedicated sub-package in the future but for + now move them to udev so they aren't installed in systemd based containers. + +- Move a bunch of components operating on (mainly block) devices into udev as + without udev they're most likely useless. + +------------------------------------------------------------------- +Mon Mar 28 17:02:04 UTC 2022 - Franck Bui + +- spec: enable 'efi' support regardless of whether sd_boot is enabled or not + + We should support EFI systems even if systemd-boot is not enabled. + ------------------------------------------------------------------- Wed Mar 23 15:17:40 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 464b6839..355fa44a 100644 --- a/systemd.spec +++ b/systemd.spec @@ -87,9 +87,7 @@ BuildRequires: polkit BuildRequires: python3-base BuildRequires: python3-lxml BuildRequires: pkgconfig(audit) -BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libdw) -BuildRequires: pkgconfig(libfido2) BuildRequires: pkgconfig(libiptc) BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) @@ -97,9 +95,6 @@ BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) -BuildRequires: pkgconfig(tss2-esys) -BuildRequires: pkgconfig(tss2-mu) -BuildRequires: pkgconfig(tss2-rc) %ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x BuildRequires: pkgconfig(libseccomp) >= 2.3.1 %endif @@ -117,20 +112,7 @@ BuildRequires: python3-jinja2 BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 -BuildRequires: pkgconfig(libkmod) >= 15 BuildRequires: pkgconfig(libpci) >= 3 -%if %{with importd} -BuildRequires: pkgconfig(bzip2) -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(zlib) -%endif -%if %{with journal_remote} -BuildRequires: pkgconfig(libcurl) -BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 -%endif -%if %{with sd_boot} -BuildRequires: gnu-efi -%endif %if %{bootstrap} #!BuildIgnore: dbus-1 @@ -156,11 +138,6 @@ 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 -# ditto but dlopen()ed by systemd-cryptenroll -Recommends: libfido2 -Recommends: libtss2-esys0 -Recommends: libtss2-mu0 -Recommends: libtss2-rc0 Requires(post): coreutils Requires(post): findutils Requires(post): systemd-presets-branding @@ -201,6 +178,7 @@ Source202: files.container Source203: files.network Source204: files.devel Source205: files.sysvcompat +Source206: files.uefi-boot # # All changes backported from upstream are tracked by the git repository, which @@ -231,6 +209,7 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. +Patch6000: 0001-meson-build-kernel-install-man-page-when-necessary.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -328,6 +307,9 @@ This library provides several of the systemd C APIs: Summary: A rule-based device node and kernel event manager License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +%if %{with sd_boot} +BuildRequires: gnu-efi +%endif Requires: %{name} = %{version}-%{release} %systemd_requires Requires: filesystem @@ -337,6 +319,22 @@ Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun):coreutils +%if ! %{bootstrap} +BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 +BuildRequires: pkgconfig(libkmod) >= 15 +# Enable fido2 and tpm supports in systemd-cryptsetup, systemd-enroll. However +# these tools are not linked against the libs directly but instead are +# dlopen()ed at runtime to avoid hard dependencies. Hence the use of soft +# dependencies. +BuildRequires: pkgconfig(libfido2) +BuildRequires: pkgconfig(tss2-esys) +BuildRequires: pkgconfig(tss2-mu) +BuildRequires: pkgconfig(tss2-rc) +Recommends: libfido2 +Recommends: libtss2-esys0 +Recommends: libtss2-mu0 +Recommends: libtss2-rc0 +%endif Conflicts: ConsoleKit < 0.4.1 Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 @@ -385,6 +383,11 @@ This package contains systemd-coredump, coredumpctl. %package container Summary: Systemd tools for container management License: LGPL-2.1-or-later +%if %{with importd} +BuildRequires: pkgconfig(bzip2) +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(zlib) +%endif Requires: %{name} = %{version}-%{release} %systemd_requires Obsoletes: nss-mymachines < %{version}-%{release} @@ -494,6 +497,8 @@ To activate this NSS module, you will need to include it in %package journal-remote Summary: Gateway for serving journal events over the network using HTTP License: LGPL-2.1-or-later +BuildRequires: pkgconfig(libcurl) +BuildRequires: pkgconfig(libmicrohttpd) >= 0.9.33 Requires: %{name} = %{version}-%{release} %systemd_requires @@ -675,16 +680,20 @@ Have fun with these services at your own risk. -Delfutils=auto \ -Doomd=false \ %if %{bootstrap} + -Defi=false \ -Dbashcompletiondir=no \ -Dzshcompletiondir=no \ -Dtranslations=false \ -Dnss-myhostname=false \ -Dnss-systemd=false \ %else + -Defi=true \ + -Dtpm=true \ -Dtpm2=true \ -Dman=true \ -Dhtml=true \ %endif + -Dlibcryptsetup-plugins=false \ -Dcoredump=%{when coredump} \ -Dimportd=%{when importd} \ -Dmachined=%{when machined} \ @@ -692,7 +701,7 @@ Have fun with these services at your own risk. -Dportabled=%{when portabled} \ -Dremote=%{when journal_remote} \ \ - -Defi=%{when sd_boot} \ + -Dkernel-install=%{when sd_boot} \ -Dgnu-efi=%{when sd_boot} \ -Dsbat-distro= \ \ @@ -994,7 +1003,6 @@ fi # Create default config in /etc at first install. # Later package updates should not overwrite these settings. -%systemd_post remote-cryptsetup.target %systemd_post getty@.service %systemd_post machines.target %systemd_post remote-fs.target @@ -1073,6 +1081,8 @@ fi %regenerate_initrd_post %udev_hwdb_update +%systemd_post remote-cryptsetup.target + # add KERNEL name match to existing persistent net rules sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ /etc/udev/rules.d/70-persistent-net.rules 2>/dev/null || : @@ -1255,6 +1265,7 @@ fi %files -n udev%{?mini} %defattr(-,root,root) %include %{SOURCE201} +%include %{SOURCE206} %files container %defattr(-,root,root) From 303f28f4c1f1a2c72c9fdcdc5c8616d0eaf6343061195f03447ff508beae4c5b Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 7 Apr 2022 22:27:23 +0000 Subject: [PATCH 098/124] Accepting request 967294 from Base:System - Import commit e43a1b018899266b764ab81afb9c30fb417675c6 1c229f8fc1 cryptsetup: fall back to traditional unlocking if any TPM2 operation fails 8881f21539 cryptsetup: fix typo 5882148902 journald: make use of CLAMP() in cache_space_refresh() 6ee0601f73 journald: make sure journal_file_open() doesn't leave a corrupted file around after failing (bsc#1198114) fe928f3d49 fs-util: make sure openat_report_new() initializes return param also on shortcut 3881af1806 fs-util: fix typos in comments 96060b73ba journal-file: port journal_file_open() to openat_report_new() 611d9955bb fs-util: add openat_report_new() wrapper around openat() f16edb41d4 network: ignore all errors in loading .network files (bsc#1197968) 5422730a7b meson: build kernel-install man page when necessary 45c627cfc2 build: include status of TPM2 in the feature string show by --version - Drop 0001-meson-build-kernel-install-man-page-when-necessary.patch It's been merged in the SUSE git repo. - spec: define %bootstrap with %bcond_with so it can be used with %when. Also re-order the meson options a bit. - spec: make sure /lib exists when installing conf files in /lib/modprobe.d This includes the following bug fixes: - upstream commit 34357545590d4791d1acbbeb07ae8f7636e187cb (bsc#1198093) OBS-URL: https://build.opensuse.org/request/show/967294 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=356 --- ...rnel-install-man-page-when-necessary.patch | 90 ------------- files.container | 2 +- files.devel | 2 +- files.systemd | 10 +- files.udev | 40 +++--- files.uefi-boot | 2 +- systemd-v250.4+suse.35.g8ef8dfd540.tar.xz | 3 - systemd-v250.4+suse.47.ge43a1b0188.tar.xz | 3 + systemd.changes | 36 ++++++ systemd.spec | 119 +++++++++--------- 10 files changed, 127 insertions(+), 180 deletions(-) delete mode 100644 0001-meson-build-kernel-install-man-page-when-necessary.patch delete mode 100644 systemd-v250.4+suse.35.g8ef8dfd540.tar.xz create mode 100644 systemd-v250.4+suse.47.ge43a1b0188.tar.xz diff --git a/0001-meson-build-kernel-install-man-page-when-necessary.patch b/0001-meson-build-kernel-install-man-page-when-necessary.patch deleted file mode 100644 index 8e601854..00000000 --- a/0001-meson-build-kernel-install-man-page-when-necessary.patch +++ /dev/null @@ -1,90 +0,0 @@ -From fecffebc9a0f4e2309e9d8d561c0b0c4b6678b0b Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 31 Mar 2022 11:17:10 +0200 -Subject: [PATCH 1/1] meson: build kernel-install man page when necessary - ---- - man/rules/meson.build | 2 +- - meson.build | 5 ++++- - shell-completion/bash/meson.build | 2 +- - shell-completion/zsh/meson.build | 2 +- - src/kernel-install/meson.build | 2 -- - 5 files changed, 7 insertions(+), 6 deletions(-) - -diff --git a/man/rules/meson.build b/man/rules/meson.build -index aaa69d3038..f10abdaf0d 100644 ---- a/man/rules/meson.build -+++ b/man/rules/meson.build -@@ -30,7 +30,7 @@ manpages = [ - ['journalctl', '1', [], ''], - ['journald.conf', '5', ['journald.conf.d', 'journald@.conf'], ''], - ['kernel-command-line', '7', [], ''], -- ['kernel-install', '8', [], ''], -+ ['kernel-install', '8', [], 'ENABLE_KERNEL_INSTALL'], - ['libudev', '3', [], ''], - ['loader.conf', '5', [], 'HAVE_GNU_EFI'], - ['locale.conf', '5', [], ''], -diff --git a/meson.build b/meson.build -index e68791b8b4..311895db5e 100644 ---- a/meson.build -+++ b/meson.build -@@ -1675,6 +1675,9 @@ else - endif - conf.set10('ENABLE_IMPORTD', have) - -+want_kernel_install = get_option('kernel-install') -+conf.set10('ENABLE_KERNEL_INSTALL', want_kernel_install) -+ - want_homed = get_option('homed') - if want_homed != 'false' - have = (conf.get('HAVE_OPENSSL') == 1 and -@@ -4143,7 +4146,7 @@ foreach tuple : [ - ['hwdb'], - ['importd'], - ['initrd'], -- ['kernel-install', get_option('kernel-install')], -+ ['kernel-install'], - ['localed'], - ['logind'], - ['machined'], -diff --git a/shell-completion/bash/meson.build b/shell-completion/bash/meson.build -index 963a11b6ce..ae6a61e555 100644 ---- a/shell-completion/bash/meson.build -+++ b/shell-completion/bash/meson.build -@@ -31,7 +31,7 @@ items = [['busctl', ''], - ['systemd-path', ''], - ['systemd-run', ''], - ['udevadm', ''], -- ['kernel-install', ''], -+ ['kernel-install', 'ENABLE_KERNEL_INSTALL'], - ['bootctl', 'HAVE_GNU_EFI'], - ['coredumpctl', 'ENABLE_COREDUMP'], - ['homectl', 'ENABLE_HOMED'], -diff --git a/shell-completion/zsh/meson.build b/shell-completion/zsh/meson.build -index 6dca9dd595..bac531798c 100644 ---- a/shell-completion/zsh/meson.build -+++ b/shell-completion/zsh/meson.build -@@ -22,7 +22,7 @@ items = [['_busctl', ''], - ['_systemd-path', ''], - ['_systemd-run', ''], - ['_udevadm', ''], -- ['_kernel-install', ''], -+ ['_kernel-install', 'ENABLE_KERNEL_INSTALL'], - ['_sd_hosts_or_user_at_host', ''], - ['_sd_outputmodes', ''], - ['_sd_unit_files', ''], -diff --git a/src/kernel-install/meson.build b/src/kernel-install/meson.build -index 508058f1cf..abc3520b62 100644 ---- a/src/kernel-install/meson.build -+++ b/src/kernel-install/meson.build -@@ -1,7 +1,5 @@ - # SPDX-License-Identifier: LGPL-2.1-or-later - --want_kernel_install = get_option('kernel-install') -- - if want_kernel_install - install_data('kernel-install', - install_mode : 'rwxr-xr-x', --- -2.34.1 - diff --git a/files.container b/files.container index cae9352f..181cd26c 100644 --- a/files.container +++ b/files.container @@ -3,7 +3,7 @@ # %dir %{_sysconfdir}/systemd/nspawn %{_bindir}/systemd-nspawn -%if ! %{bootstrap} +%if %{without bootstrap} %{_datadir}/bash-completion/completions/systemd-nspawn %{_datadir}/zsh/site-functions/_systemd-nspawn %{_mandir}/man1/systemd-nspawn.1.gz diff --git a/files.devel b/files.devel index 7cd0b082..c1a2301c 100644 --- a/files.devel +++ b/files.devel @@ -7,7 +7,7 @@ %{_libdir}/libudev.so %{_libdir}/pkgconfig/libsystemd.pc %{_libdir}/pkgconfig/libudev.pc -%if ! %{bootstrap} +%if %{without bootstrap} %{_mandir}/man3/SD_ALERT.3.gz %{_mandir}/man3/SD_BUS_ERROR_ACCESS_DENIED.3.gz %{_mandir}/man3/SD_BUS_ERROR_ADDRESS_IN_USE.3.gz diff --git a/files.systemd b/files.systemd index 044ab793..c9531766 100644 --- a/files.systemd +++ b/files.systemd @@ -8,7 +8,7 @@ %config(noreplace) %{_sysconfdir}/systemd/timesyncd.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf %dir %{_binfmtdir} -%if ! %{bootstrap} +%if %{without bootstrap} %dir %{_datadir}/bash-completion %dir %{_datadir}/bash-completion/completions %endif @@ -21,7 +21,7 @@ %dir %{_datadir}/polkit-1 %dir %{_datadir}/polkit-1/actions %dir %{_datadir}/systemd -%if ! %{bootstrap} +%if %{without bootstrap} %dir %{_datadir}/zsh %dir %{_datadir}/zsh/site-functions %endif @@ -122,7 +122,7 @@ %{_bindir}/systemd-tty-ask-password-agent %{_bindir}/systemd-umount %{_bindir}/timedatectl -%if ! %{bootstrap} +%if %{without bootstrap} %{_datadir}/bash-completion/completions/busctl %{_datadir}/bash-completion/completions/coredumpctl %{_datadir}/bash-completion/completions/hostnamectl @@ -186,7 +186,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map -%if ! %{bootstrap} +%if %{without bootstrap} %{_datadir}/zsh/site-functions/_busctl %{_datadir}/zsh/site-functions/_coredumpctl %{_datadir}/zsh/site-functions/_hostnamectl @@ -219,7 +219,7 @@ %{_journalcatalogdir}/systemd.ru.catalog %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog -%if ! 0%{bootstrap} +%if %{without bootstrap} %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz %{_mandir}/man1/init.1.gz diff --git a/files.udev b/files.udev index 273dd04f..cad13c0c 100644 --- a/files.udev +++ b/files.udev @@ -2,12 +2,12 @@ # Please keep the list sorted (with `LC_ALL=C sort`). # %config(noreplace) %{_sysconfdir}/udev/udev.conf -%if ! %{bootstrap} +%if %{without bootstrap} # %%dir %{_libdir}/cryptsetup %dir %{_modulesloaddir} %endif %dir %{_prefix}/lib/udev -%if ! %{bootstrap} +%if %{without bootstrap} %dir %{_sysconfdir}/modules-load.d %endif %dir %{_sysconfdir}/udev @@ -20,19 +20,19 @@ %ghost %attr(444, root, root) %{_sysconfdir}/udev/hwdb.bin %ghost %attr(644, root, root) %{_prefix}/lib/udev/compat-symlink-generation %ghost %{_localstatedir}/lib/systemd/backlight -%if ! %{bootstrap} +%if %{without bootstrap} %{_bindir}/systemd-cryptenroll %endif %{_bindir}/systemd-hwdb %{_bindir}/udevadm -%if ! %{bootstrap} +%if %{without bootstrap} %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc -%if ! %{bootstrap} +%if %{without bootstrap} %{_datadir}/zsh/site-functions/_udevadm %endif -%if ! %{bootstrap} +%if %{without bootstrap} # %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so # %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so # %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so @@ -92,30 +92,30 @@ %{_prefix}/lib/udev/v4l_id %{_systemd_util_dir}/network/99-default.link %{_systemd_util_dir}/systemd-backlight -%if ! %{bootstrap} +%if %{without bootstrap} %{_systemd_util_dir}/systemd-cryptsetup %endif %{_systemd_util_dir}/systemd-growfs -%if ! %{bootstrap} +%if %{without bootstrap} %{_systemd_util_dir}/systemd-integritysetup %endif %{_systemd_util_dir}/systemd-makefs -%if ! %{bootstrap} +%if %{without bootstrap} %{_systemd_util_dir}/systemd-modules-load %endif %{_systemd_util_dir}/systemd-network-generator %{_systemd_util_dir}/systemd-rfkill %{_systemd_util_dir}/systemd-udevd -%if ! %{bootstrap} +%if %{without bootstrap} %{_systemd_util_dir}/systemd-veritysetup %endif %{_systemd_util_dir}/systemd-volatile-root -%if ! %{bootstrap} +%if %{without bootstrap} %{_systemdgeneratordir}/systemd-cryptsetup-generator %endif %{_systemdgeneratordir}/systemd-fstab-generator %{_systemdgeneratordir}/systemd-gpt-auto-generator -%if ! %{bootstrap} +%if %{without bootstrap} %{_systemdgeneratordir}/systemd-integritysetup-generator %{_systemdgeneratordir}/systemd-veritysetup-generator %endif @@ -175,20 +175,20 @@ %{_udevrulesdir}/75-net-description.rules %{_udevrulesdir}/75-probe_mtd.rules %{_udevrulesdir}/78-sound-card.rules -%if ! %{bootstrap} +%if %{without bootstrap} %{_udevrulesdir}/80-drivers.rules %endif %{_udevrulesdir}/80-net-setup-link.rules %{_udevrulesdir}/81-net-dhcp.rules %{_udevrulesdir}/90-vconsole.rules -%if ! %{bootstrap} +%if %{without bootstrap} %{_unitdir}/cryptsetup-pre.target %{_unitdir}/cryptsetup.target %{_unitdir}/initrd-root-device.target.wants/remote-cryptsetup.target %{_unitdir}/initrd-root-device.target.wants/remote-veritysetup.target %endif %{_unitdir}/initrd-udevadm-cleanup-db.service -%if ! %{bootstrap} +%if %{without bootstrap} %{_unitdir}/integritysetup-pre.target %{_unitdir}/integritysetup.target %{_unitdir}/kmod-static-nodes.service @@ -197,25 +197,25 @@ %endif %{_unitdir}/sockets.target.wants/systemd-udevd-control.socket %{_unitdir}/sockets.target.wants/systemd-udevd-kernel.socket -%if ! %{bootstrap} +%if %{without bootstrap} %{_unitdir}/sysinit.target.wants/cryptsetup.target %{_unitdir}/sysinit.target.wants/integritysetup.target %{_unitdir}/sysinit.target.wants/kmod-static-nodes.service %endif %{_unitdir}/sysinit.target.wants/systemd-hwdb-update.service -%if ! %{bootstrap} +%if %{without bootstrap} %{_unitdir}/sysinit.target.wants/systemd-modules-load.service %endif %{_unitdir}/sysinit.target.wants/systemd-tmpfiles-setup-dev.service %{_unitdir}/sysinit.target.wants/systemd-udev-trigger.service %{_unitdir}/sysinit.target.wants/systemd-udevd.service -%if ! %{bootstrap} +%if %{without bootstrap} %{_unitdir}/sysinit.target.wants/veritysetup.target %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/systemd-backlight@.service %{_unitdir}/systemd-hwdb-update.service -%if ! %{bootstrap} +%if %{without bootstrap} %{_unitdir}/systemd-modules-load.service %endif %{_unitdir}/systemd-network-generator.service @@ -228,7 +228,7 @@ %{_unitdir}/systemd-udevd-kernel.socket %{_unitdir}/systemd-udevd.service %{_unitdir}/systemd-volatile-root.service -%if ! %{bootstrap} +%if %{without bootstrap} %{_unitdir}/veritysetup-pre.target %{_unitdir}/veritysetup.target %endif diff --git a/files.uefi-boot b/files.uefi-boot index 49bcdfec..70e46b69 100644 --- a/files.uefi-boot +++ b/files.uefi-boot @@ -8,7 +8,7 @@ %dir %{_systemd_util_dir}/boot/efi %{_bindir}/bootctl %{_bindir}/kernel-install -%if ! %{bootstrap} +%if %{without bootstrap} %{_datadir}/bash-completion/completions/bootctl %{_datadir}/bash-completion/completions/kernel-install %{_datadir}/zsh/site-functions/_bootctl diff --git a/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz b/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz deleted file mode 100644 index d2bee6fe..00000000 --- a/systemd-v250.4+suse.35.g8ef8dfd540.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ed75c74660149af8a8fe454169f9cd295aa329c2638d2de8474d8eed869112d5 -size 7626056 diff --git a/systemd-v250.4+suse.47.ge43a1b0188.tar.xz b/systemd-v250.4+suse.47.ge43a1b0188.tar.xz new file mode 100644 index 00000000..982a5ee2 --- /dev/null +++ b/systemd-v250.4+suse.47.ge43a1b0188.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6633132c53177f605c5744b6cc412c823e32249545ffd0520ac56ef33c270d9c +size 7626800 diff --git a/systemd.changes b/systemd.changes index 05c8d8ec..870cfb44 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed Apr 6 09:55:10 UTC 2022 - Franck Bui + +- Import commit e43a1b018899266b764ab81afb9c30fb417675c6 + + 1c229f8fc1 cryptsetup: fall back to traditional unlocking if any TPM2 operation fails + 8881f21539 cryptsetup: fix typo + 5882148902 journald: make use of CLAMP() in cache_space_refresh() + 6ee0601f73 journald: make sure journal_file_open() doesn't leave a corrupted file around after failing (bsc#1198114) + fe928f3d49 fs-util: make sure openat_report_new() initializes return param also on shortcut + 3881af1806 fs-util: fix typos in comments + 96060b73ba journal-file: port journal_file_open() to openat_report_new() + 611d9955bb fs-util: add openat_report_new() wrapper around openat() + f16edb41d4 network: ignore all errors in loading .network files (bsc#1197968) + 5422730a7b meson: build kernel-install man page when necessary + 45c627cfc2 build: include status of TPM2 in the feature string show by --version + +- Drop 0001-meson-build-kernel-install-man-page-when-necessary.patch + + It's been merged in the SUSE git repo. + +------------------------------------------------------------------- +Mon Apr 4 11:40:30 UTC 2022 - Franck Bui + +- spec: define %bootstrap with %bcond_with so it can be used with %when. Also + re-order the meson options a bit. + +------------------------------------------------------------------- +Mon Apr 4 08:49:40 UTC 2022 - Franck Bui + +- spec: make sure /lib exists when installing conf files in /lib/modprobe.d + ------------------------------------------------------------------- Thu Mar 31 12:03:19 UTC 2022 - Franck Bui @@ -95,6 +127,10 @@ Tue Mar 8 09:41:42 UTC 2022 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v250/NEWS for details. + This includes the following bug fixes: + + - upstream commit 34357545590d4791d1acbbeb07ae8f7636e187cb (bsc#1198093) + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch 0001-restore-var-run-and-var-lock-bind-mount-if-they-aren.patch diff --git a/systemd.spec b/systemd.spec index 355fa44a..de7564f1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -18,16 +18,8 @@ %global flavor @BUILD_FLAVOR@%{nil} -%if "%{flavor}" == "mini" -%define bootstrap 1 -%define mini -mini -%else -%define bootstrap 0 -%define mini %nil -%endif - %define min_kernel_version 4.5 -%define suse_version +suse.35.g8ef8dfd540 +%define suse_version +suse.47.ge43a1b0188 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -37,7 +29,13 @@ %define __when_2() %{expand:%%{?with_%{1}:%{2}}%%{!?with_%{1}:false}} %define when() %{expand:%%__when_%# %{*}} -%if %{bootstrap} +%define __when_not_1() %{expand:%%{?with_%{1}:false}%%{!?with_%{1}:true}} +%define __when_not_2() %{expand:%%{?with_%{1}:false}%%{!?with_%{1}:%{2}}} +%define when_not() %{expand:%%__when_not_%# %{*}} + +%if "%{flavor}" == "mini" +%define mini -mini +%bcond_without bootstrap %bcond_with coredump %bcond_with importd %bcond_with journal_remote @@ -50,6 +48,8 @@ %bcond_with experimental %bcond_with testsuite %else +%define mini %nil +%bcond_with bootstrap %bcond_without coredump %bcond_without importd %bcond_without journal_remote @@ -76,7 +76,7 @@ Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if ! %{bootstrap} +%if %{without bootstrap} BuildRequires: docbook-xsl-stylesheets BuildRequires: kbd BuildRequires: libapparmor-devel @@ -114,7 +114,7 @@ BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 BuildRequires: pkgconfig(libpci) >= 3 -%if %{bootstrap} +%if %{with bootstrap} #!BuildIgnore: dbus-1 Provides: systemd = %{version}-%{release} Conflicts: systemd @@ -209,7 +209,6 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch # upstream and need an urgent fix. Even in this case, the patches are # temporary and should be removed as soon as a fix is merged by # upstream. -Patch6000: 0001-meson-build-kernel-install-man-page-when-necessary.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -224,7 +223,7 @@ drop-in replacement for sysvinit. %package doc Summary: HTML documentation for systemd License: LGPL-2.1-or-later -%if %{bootstrap} +%if %{with bootstrap} Conflicts: systemd-doc Requires: this-is-only-for-build-envs %else @@ -242,7 +241,7 @@ Requires: libudev%{?mini}1 = %{version}-%{release} Requires: systemd-rpm-macros Provides: libudev%{?mini}-devel = %{version}-%{release} Obsoletes: libudev%{?mini}-devel < %{version}-%{release} -%if %{bootstrap} +%if %{with bootstrap} Provides: systemd-devel = %{version}-%{release} Conflicts: systemd-devel Provides: libudev-devel = %{version}-%{release} @@ -275,7 +274,7 @@ Please note that the content of this package is considered as deprecated. %package -n libsystemd0%{?mini} Summary: Component library for systemd License: LGPL-2.1-or-later -%if %{bootstrap} +%if %{with bootstrap} Conflicts: kiwi Conflicts: libsystemd0 Provides: libsystemd0 = %{version}-%{release} @@ -319,7 +318,7 @@ Requires: group(kvm) Requires(post): sed Requires(post): coreutils Requires(postun):coreutils -%if ! %{bootstrap} +%if %{without bootstrap} BuildRequires: pkgconfig(libcryptsetup) >= 1.6.0 BuildRequires: pkgconfig(libkmod) >= 15 # Enable fido2 and tpm supports in systemd-cryptsetup, systemd-enroll. However @@ -340,7 +339,7 @@ Conflicts: dracut < 044.1 Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 Conflicts: util-linux < 2.16 -%if %{bootstrap} +%if %{with bootstrap} Conflicts: udev Provides: udev = %{version}-%{release} %endif @@ -355,7 +354,7 @@ call tools to initialize a device, or load needed kernel modules. %package -n libudev%{?mini}1 Summary: Dynamic library to access udev device information License: LGPL-2.1-or-later -%if %{bootstrap} +%if %{with bootstrap} Conflicts: kiwi Conflicts: libudev1 Provides: libudev1 = %{version}-%{release} @@ -394,7 +393,7 @@ Obsoletes: nss-mymachines < %{version}-%{release} Provides: nss-mymachines = %{version}-%{release} Provides: systemd-container = %{version}-%{release} Provides: systemd:%{_bindir}/systemd-nspawn -%if %{bootstrap} +%if %{with bootstrap} Conflicts: systemd-container Provides: systemd-container = %{version}-%{release} %endif @@ -465,7 +464,7 @@ http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES %endif -%if ! %{bootstrap} +%if %{without bootstrap} %package -n nss-systemd Summary: Plugin for local virtual host name resolution License: LGPL-2.1-or-later @@ -634,7 +633,7 @@ The package contains: homed, pstore, repart, userdbd. Have fun with these services at your own risk. %endif -%if ! %{bootstrap} +%if %{without bootstrap} %lang_package %endif @@ -655,64 +654,65 @@ Have fun with these services at your own risk. -Dsystem-gid-max=499 \ -Dadm-group=false \ -Dwheel-group=false \ - -Dgshadow=false \ -Ddefault-hierarchy=unified \ -Ddefault-kill-user-processes=false \ - -Dldconfig=false \ -Dpamconfdir=no \ -Dpamlibdir=%{_pam_moduledir} \ -Dxinitrcdir=%{xinitconfdir}/xinitrc.d \ -Drpmmacrosdir=no \ -Dcertificate-root=%{_sysconfdir}/pki/systemd \ +%if %{with bootstrap} + -Dbashcompletiondir=no \ + -Dzshcompletiondir=no \ +%endif %if %{without sysvcompat} -Dsysvinit-path= \ -Dsysvrcnd-path= \ %endif -Drc-local=/etc/init.d/boot.local \ -Dcreate-log-dirs=false \ - -Dbump-proc-sys-fs-nr-open=false \ -Ddebug-shell=/bin/bash \ - -Dseccomp=auto \ - -Dselinux=auto \ - -Dapparmor=auto \ - -Dsmack=false \ + \ + -Dbump-proc-sys-fs-nr-open=false \ + -Dgshadow=false \ -Dima=false \ - -Delfutils=auto \ - -Doomd=false \ -%if %{bootstrap} - -Defi=false \ - -Dbashcompletiondir=no \ - -Dzshcompletiondir=no \ - -Dtranslations=false \ - -Dnss-myhostname=false \ - -Dnss-systemd=false \ -%else - -Defi=true \ - -Dtpm=true \ - -Dtpm2=true \ - -Dman=true \ - -Dhtml=true \ -%endif + -Dldconfig=false \ -Dlibcryptsetup-plugins=false \ + -Doomd=false \ + -Dsmack=false \ + \ + -Dapparmor=%{when_not bootstrap} \ + -Defi=%{when_not bootstrap} \ + -Delfutils=%{when_not bootstrap} \ + -Dhtml=%{when_not bootstrap} \ + -Dman=%{when_not bootstrap} \ + -Dnss-myhostname=%{when_not bootstrap} \ + -Dnss-systemd=%{when_not bootstrap} \ + -Dseccomp=%{when_not bootstrap} \ + -Dselinux=%{when_not bootstrap} \ + -Dtpm=%{when_not bootstrap} \ + -Dtpm2=%{when_not bootstrap} \ + -Dtranslations=%{when_not bootstrap} \ + \ -Dcoredump=%{when coredump} \ -Dimportd=%{when importd} \ -Dmachined=%{when machined} \ -Dnetworkd=%{when networkd} \ -Dportabled=%{when portabled} \ -Dremote=%{when journal_remote} \ - \ - -Dkernel-install=%{when sd_boot} \ + \ -Dgnu-efi=%{when sd_boot} \ + -Dkernel-install=%{when sd_boot} \ -Dsbat-distro= \ - \ - -Dresolve=%{when resolved} \ - -Ddns-servers='' \ + \ -Ddefault-dnssec=no \ + -Ddns-servers='' \ -Ddns-over-tls=%{when resolved openssl} \ - \ + -Dresolve=%{when resolved} \ + \ + -Dhomed=%{when experimental} \ -Dpstore=%{when experimental} \ -Drepart=%{when experimental} \ - -Dhomed=%{when experimental} \ -Duserdb=%{when experimental} \ \ -Dtests=%{when testsuite unsafe} \ @@ -774,8 +774,9 @@ rm -f %{buildroot}/etc/systemd/system/default.target install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2} # kmod keeps insisting on using /lib on SLE. -if [ "%{_modprobedir}" != /usr/lib/modprobe.d ]; then - mv %{buildroot}/usr/lib/modprobe.d %{buildroot}%{_modprobedir} +if [ "$(realpath %{_modprobedir})" != /usr/lib/modprobe.d ]; then + mkdir -p %{buildroot}%{_modprobedir} + mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/ fi # don't enable wall ask password service, it spams every console (bnc#747783) @@ -932,7 +933,7 @@ rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %endif -%if ! %{bootstrap} +%if %{without bootstrap} %find_lang systemd %endif @@ -961,7 +962,7 @@ if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then chmod 444 %{_sysconfdir}/machine-id fi -%if ! %{bootstrap} +%if %{without bootstrap} pam-config --add --systemd || : %endif @@ -1150,7 +1151,7 @@ fi %sysusers_create systemd-coredump.conf %endif -%if ! %{bootstrap} +%if %{without bootstrap} %ldconfig_scriptlets -n nss-myhostname %ldconfig_scriptlets -n nss-systemd %endif @@ -1315,14 +1316,14 @@ fi %{_sysusersdir}/systemd-coredump.conf %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump -%if ! %{bootstrap} +%if %{without bootstrap} %{_mandir}/man1/coredumpctl* %{_mandir}/man5/coredump.conf* %{_mandir}/man8/systemd-coredump* %endif %endif -%if ! %{bootstrap} +%if %{without bootstrap} %files lang -f systemd.lang %files -n nss-myhostname From 5c2e02040ab7fb5a995b480e7a1db3fc5e67b7d451d92beaae176156197098c0 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 22 Apr 2022 19:53:02 +0000 Subject: [PATCH 099/124] Accepting request 971023 from Base:System OBS-URL: https://build.opensuse.org/request/show/971023 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=357 --- ...sion-keyring-per-system-sevice-entir.patch | 45 ------------------- files.systemd | 2 - systemd-v250.4+suse.47.ge43a1b0188.tar.xz | 3 -- systemd-v250.4+suse.54.g736db5a59f.tar.xz | 3 ++ systemd.changes | 36 +++++++++++++++ systemd.spec | 16 ++++--- 6 files changed, 50 insertions(+), 55 deletions(-) delete mode 100644 0011-core-disable-session-keyring-per-system-sevice-entir.patch delete mode 100644 systemd-v250.4+suse.47.ge43a1b0188.tar.xz create mode 100644 systemd-v250.4+suse.54.g736db5a59f.tar.xz diff --git a/0011-core-disable-session-keyring-per-system-sevice-entir.patch b/0011-core-disable-session-keyring-per-system-sevice-entir.patch deleted file mode 100644 index 9d5bad80..00000000 --- a/0011-core-disable-session-keyring-per-system-sevice-entir.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 67f3fa5aa2781d42c809da9303f81b28544824d8 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 6 Jul 2017 15:48:10 +0200 -Subject: [PATCH 10/11] core: disable session keyring per system sevice - entirely for now - -Until PAM module "pam_keyinit" is fully integrated in SUSE's PAM stack, this -feature has to be disabled. - -openSUSE is still not ready for enabling the keyring stuff (see -bsc#1081947). Some services got fixed (sshd, getty@.service) but some still -haven't (xdm, login, ...) - -So leave it disabled again otherwise different users might end up using the -same session keyring - the one created for the service used for logging in -(sshd, getty@.service, xdm, etc...) - -The integration of pam_keyinit is tracked here: -https://bugzilla.opensuse.org/show_bug.cgi?id=1081947 - -See also: -https://github.com/systemd/systemd/pull/6286 - -[fbui: fixes boo#1045886] ---- - src/core/execute.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/core/execute.c b/src/core/execute.c -index 2a337b55a2..b5a1a3b6e5 100644 ---- a/src/core/execute.c -+++ b/src/core/execute.c -@@ -3356,6 +3356,9 @@ static int setup_keyring( - assert(context); - assert(p); - -+ /* SUSE: pam_keyinit is still not fully integrated to SUSE's PAM stack... */ -+ return 0; -+ - /* Let's set up a new per-service "session" kernel keyring for each system service. This has the benefit that - * each service runs with its own keyring shared among all processes of the service, but with no hook-up beyond - * that scope, and in particular no link to the per-UID keyring. If we don't do this the keyring will be --- -2.26.2 - diff --git a/files.systemd b/files.systemd index c9531766..8e3481a9 100644 --- a/files.systemd +++ b/files.systemd @@ -124,7 +124,6 @@ %{_bindir}/timedatectl %if %{without bootstrap} %{_datadir}/bash-completion/completions/busctl -%{_datadir}/bash-completion/completions/coredumpctl %{_datadir}/bash-completion/completions/hostnamectl %{_datadir}/bash-completion/completions/journalctl %{_datadir}/bash-completion/completions/localectl @@ -188,7 +187,6 @@ %{_datadir}/systemd/language-fallback-map %if %{without bootstrap} %{_datadir}/zsh/site-functions/_busctl -%{_datadir}/zsh/site-functions/_coredumpctl %{_datadir}/zsh/site-functions/_hostnamectl %{_datadir}/zsh/site-functions/_journalctl %{_datadir}/zsh/site-functions/_localectl diff --git a/systemd-v250.4+suse.47.ge43a1b0188.tar.xz b/systemd-v250.4+suse.47.ge43a1b0188.tar.xz deleted file mode 100644 index 982a5ee2..00000000 --- a/systemd-v250.4+suse.47.ge43a1b0188.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:6633132c53177f605c5744b6cc412c823e32249545ffd0520ac56ef33c270d9c -size 7626800 diff --git a/systemd-v250.4+suse.54.g736db5a59f.tar.xz b/systemd-v250.4+suse.54.g736db5a59f.tar.xz new file mode 100644 index 00000000..37bc7a4f --- /dev/null +++ b/systemd-v250.4+suse.54.g736db5a59f.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61dfe5c41409547e9e358593b0187e63955ec6229dd04f78e7e7398289a40350 +size 7626844 diff --git a/systemd.changes b/systemd.changes index 870cfb44..bd67d985 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Wed Apr 20 07:59:23 UTC 2022 - Ludwig Nussel + +- spec: sign the systemd-boot efi binary (boo#1198586) + +------------------------------------------------------------------- +Tue Apr 19 11:17:03 UTC 2022 - Franck Bui + +- Drop 0011-core-disable-session-keyring-per-system-sevice-entir.patch + + Since bsc#1081947 has been addressed, we can attempt to re-enable private + session kernel keyring for each system service hence each service gets a + session keyring that is specific to the service. + +------------------------------------------------------------------- +Tue Apr 19 07:30:31 UTC 2022 - Franck Bui + +- Import commit 736db5a59f1ab1317ef64ec6e7dc394250178146 + + 98bc28d824 tmpfiles: constify item_compatible() parameters + 3faf1a2648 test: adapt install_pam() for openSUSE + b7ca34fa28 test: add test checking tmpfiles conf file precedence + 2713693d93 test tmpfiles: add a test for 'w+' + ce2cbefe38 tmpfiles.d: only 'w+' can have multiple lines for the same path (bsc#1198090) + 769f5a0cbe Support -D_FORTIFY_SOURCE=3 by using __builtin_dynamic_object_size. + +------------------------------------------------------------------- +Sat Apr 9 12:54:30 UTC 2022 - Andreas Schwab + +- libseccomp is needed everywhere + +------------------------------------------------------------------- +Thu Apr 7 19:27:11 UTC 2022 - Franck Bui + +- Move coredumpctl completion files into systemd-coredump sub-package. + ------------------------------------------------------------------- Wed Apr 6 09:55:10 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index de7564f1..f9ed16fa 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define suse_version +suse.47.ge43a1b0188 +%define suse_version +suse.54.g736db5a59f %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -93,11 +93,9 @@ BuildRequires: pkgconfig(liblz4) BuildRequires: pkgconfig(liblzma) BuildRequires: pkgconfig(libpcre2-8) BuildRequires: pkgconfig(libqrencode) +BuildRequires: pkgconfig(libseccomp) >= 2.3.1 BuildRequires: pkgconfig(libselinux) >= 2.1.9 BuildRequires: pkgconfig(libzstd) -%ifarch aarch64 %ix86 x86_64 x32 %arm ppc64le s390x -BuildRequires: pkgconfig(libseccomp) >= 2.3.1 -%endif %endif BuildRequires: fdupes BuildRequires: gperf @@ -197,7 +195,6 @@ Patch5: 0005-udev-create-default-symlinks-for-primary-cd_dvd-driv.patch Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch %endif Patch10: 0001-conf-parser-introduce-early-drop-ins.patch -Patch11: 0011-core-disable-session-keyring-per-system-sevice-entir.patch Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # Temporary workaround until bsc#1197178 is addressed. @@ -308,6 +305,7 @@ License: GPL-2.0-only URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html %if %{with sd_boot} BuildRequires: gnu-efi +BuildRequires: pesign-obs-integration %endif Requires: %{name} = %{version}-%{release} %systemd_requires @@ -723,6 +721,12 @@ Have fun with these services at your own risk. %install %meson_install +%if %{with sd_boot} +%ifarch x86_64 +export BRP_PESIGN_FILES="/usr/lib/systemd/boot/efi/systemd-bootx64.efi" +%endif +%endif + # Don't ship resolvconf symlink for now as it conflicts with the # binary shipped by openresolv and provides limited compatibility # only @@ -1317,6 +1321,8 @@ fi %config(noreplace) %{_sysconfdir}/systemd/coredump.conf %dir %{_localstatedir}/lib/systemd/coredump %if %{without bootstrap} +%{_datadir}/bash-completion/completions/coredumpctl +%{_datadir}/zsh/site-functions/_coredumpctl %{_mandir}/man1/coredumpctl* %{_mandir}/man5/coredump.conf* %{_mandir}/man8/systemd-coredump* From 3b90df43535fb715839547dd38ffa64a1af5dbfc7c6d1b632f799666d8bb8652 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 10 May 2022 13:11:21 +0000 Subject: [PATCH 100/124] Accepting request 975732 from Base:System - Import commit 0d950479e58dd3af007eb3780d600a5446aac519 (merge of v250.5) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/736db5a59f1ab1317ef64ec6e7dc394250178146...0d950479e58dd3af007eb3780d600a5446aac519 - Call pam_loginuid when creating user@.service (bsc#1198507) It's a backport of upstream commit 1000522a60ceade446773c67031b47a566d4a70d. OBS-URL: https://build.opensuse.org/request/show/975732 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=358 --- files.udev | 1 + systemd-user | 1 + systemd-v250.4+suse.54.g736db5a59f.tar.xz | 3 --- systemd-v250.5+suse.56.g0d950479e5.tar.xz | 3 +++ systemd.changes | 15 +++++++++++++++ systemd.spec | 7 ++++--- 6 files changed, 24 insertions(+), 6 deletions(-) delete mode 100644 systemd-v250.4+suse.54.g736db5a59f.tar.xz create mode 100644 systemd-v250.5+suse.56.g0d950479e5.tar.xz diff --git a/files.udev b/files.udev index cad13c0c..5e9aa154 100644 --- a/files.udev +++ b/files.udev @@ -141,6 +141,7 @@ %{_udevhwdbdir}/60-seat.hwdb %{_udevhwdbdir}/60-sensor.hwdb %{_udevhwdbdir}/70-analyzers.hwdb +%{_udevhwdbdir}/70-av-production.hwdb %{_udevhwdbdir}/70-cameras.hwdb %{_udevhwdbdir}/70-joystick.hwdb %{_udevhwdbdir}/70-mouse.hwdb diff --git a/systemd-user b/systemd-user index 066515cd..2e1fb802 100644 --- a/systemd-user +++ b/systemd-user @@ -20,4 +20,5 @@ account include common-account session required pam_selinux.so close session required pam_selinux.so nottys open +session required pam_loginuid.so session include common-session diff --git a/systemd-v250.4+suse.54.g736db5a59f.tar.xz b/systemd-v250.4+suse.54.g736db5a59f.tar.xz deleted file mode 100644 index 37bc7a4f..00000000 --- a/systemd-v250.4+suse.54.g736db5a59f.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61dfe5c41409547e9e358593b0187e63955ec6229dd04f78e7e7398289a40350 -size 7626844 diff --git a/systemd-v250.5+suse.56.g0d950479e5.tar.xz b/systemd-v250.5+suse.56.g0d950479e5.tar.xz new file mode 100644 index 00000000..483b8357 --- /dev/null +++ b/systemd-v250.5+suse.56.g0d950479e5.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a5457eea796a3d988c72490f6a265620849a2baeca7a86e6b37fc4a18dfdf70 +size 7676372 diff --git a/systemd.changes b/systemd.changes index bd67d985..b7776e80 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Fri May 6 12:44:36 UTC 2022 - Franck Bui + +- Import commit 0d950479e58dd3af007eb3780d600a5446aac519 (merge of v250.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/736db5a59f1ab1317ef64ec6e7dc394250178146...0d950479e58dd3af007eb3780d600a5446aac519 + +------------------------------------------------------------------- +Fri Apr 29 12:37:00 UTC 2022 - Franck Bui + +- Call pam_loginuid when creating user@.service (bsc#1198507) + + It's a backport of upstream commit 1000522a60ceade446773c67031b47a566d4a70d. + ------------------------------------------------------------------- Wed Apr 20 07:59:23 UTC 2022 - Ludwig Nussel diff --git a/systemd.spec b/systemd.spec index f9ed16fa..8ad0972e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,5 +1,5 @@ # -# spec file +# spec file for package systemd # # Copyright (c) 2022 SUSE LLC # @@ -19,7 +19,8 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define suse_version +suse.54.g736db5a59f +%define suse_version +suse.56.g0d950479e5 + %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -71,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 250.4 +Version: 250.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 5491fccb05c5bc71a09a4b9b209b0741ff864e6bbacbbb2f5b0652fd82b54c6a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 31 May 2022 13:46:56 +0000 Subject: [PATCH 101/124] Accepting request 979799 from Base:System - Update rpmlintrc for shlib-policy-name-error/multibuild case. OBS-URL: https://build.opensuse.org/request/show/979799 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=359 --- systemd-rpmlintrc | 3 +++ systemd.changes | 5 +++++ systemd.spec | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index 86edf488..d381b82f 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -9,3 +9,6 @@ addFilter(".*files-duplicate /usr/lib/systemd/.*") addFilter(".*files-duplicated-waste.*") addFilter(".*explicit-lib-dependency .*") addFilter(".*tmpfile-not-in-filelist .*") + +# shlib policy does not cover multibuilds +addFilter("libsystemd0-mini.x86_64: E: shlib-policy-name-error SONAME: libsystemd.so.0.*") diff --git a/systemd.changes b/systemd.changes index b7776e80..a8ccb709 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri May 13 08:55:55 UTC 2022 - Jan Engelhardt + +- Update rpmlintrc for shlib-policy-name-error/multibuild case. + ------------------------------------------------------------------- Fri May 6 12:44:36 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 8ad0972e..608d1fd7 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,5 +1,5 @@ # -# spec file for package systemd +# spec file # # Copyright (c) 2022 SUSE LLC # From 2dec39947457567836fa219615d5b6a8961826064723bf9db14e50eb812fe30c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 1 Jun 2022 15:34:18 +0000 Subject: [PATCH 102/124] Accepting request 980104 from Base:System - Import commit 4dbc543953eabd4c578da67ce6e2970d6f96c406 (merge of v250.6) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/0d950479e58dd3af007eb3780d600a5446aac519...4dbc543953eabd4c578da67ce6e2970d6f96c406 OBS-URL: https://build.opensuse.org/request/show/980104 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=360 --- systemd-v250.5+suse.56.g0d950479e5.tar.xz | 3 --- systemd-v250.6+suse.58.g4dbc543953.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 systemd-v250.5+suse.56.g0d950479e5.tar.xz create mode 100644 systemd-v250.6+suse.58.g4dbc543953.tar.xz diff --git a/systemd-v250.5+suse.56.g0d950479e5.tar.xz b/systemd-v250.5+suse.56.g0d950479e5.tar.xz deleted file mode 100644 index 483b8357..00000000 --- a/systemd-v250.5+suse.56.g0d950479e5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a5457eea796a3d988c72490f6a265620849a2baeca7a86e6b37fc4a18dfdf70 -size 7676372 diff --git a/systemd-v250.6+suse.58.g4dbc543953.tar.xz b/systemd-v250.6+suse.58.g4dbc543953.tar.xz new file mode 100644 index 00000000..8d9d9222 --- /dev/null +++ b/systemd-v250.6+suse.58.g4dbc543953.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7c00bf0607ca3a8ad8d001808741277c600db2c446bb58ce347e445dec2ff20e +size 7677168 diff --git a/systemd.changes b/systemd.changes index a8ccb709..ba9c7421 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue May 31 13:26:38 UTC 2022 - Franck Bui + +- Import commit 4dbc543953eabd4c578da67ce6e2970d6f96c406 (merge of v250.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/0d950479e58dd3af007eb3780d600a5446aac519...4dbc543953eabd4c578da67ce6e2970d6f96c406 + ------------------------------------------------------------------- Fri May 13 08:55:55 UTC 2022 - Jan Engelhardt diff --git a/systemd.spec b/systemd.spec index 608d1fd7..e7d0df84 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define suse_version +suse.56.g0d950479e5 +%define suse_version +suse.58.g4dbc543953 %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: 250.5 +Version: 250.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 444d3c0a79237f0f1eacb0a66c48c7d705923b45af37bad54139488a80615f64 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 13 Jul 2022 12:55:53 +0000 Subject: [PATCH 103/124] Accepting request 985448 from Base:System Speaking with Dimstar, it should be safe doing one more SR which will be needed in Staging:I where we need rpmlintrc adjustement. OBS-URL: https://build.opensuse.org/request/show/985448 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=361 --- ...conf-parser-introduce-early-drop-ins.patch | 78 +++++++++++-------- files.devel | 18 +++++ files.network | 5 ++ files.systemd | 24 ++++-- files.udev | 9 +++ files.uefi-boot | 1 + systemd-rpmlintrc | 2 +- systemd-v250.6+suse.58.g4dbc543953.tar.xz | 3 - systemd-v251.2+suse.21.ge9fc337d97.tar.xz | 3 + systemd.changes | 53 +++++++++++++ systemd.spec | 61 +++++++++------ 11 files changed, 190 insertions(+), 67 deletions(-) delete mode 100644 systemd-v250.6+suse.58.g4dbc543953.tar.xz create mode 100644 systemd-v251.2+suse.21.ge9fc337d97.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index bcd96141..a63fa0f3 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,7 +1,7 @@ -From 079a6f89f9e42517cd14b488320b6302746bcf9b Mon Sep 17 00:00:00 2001 +From a1c88ab7f5e5ad127833168bbb38340d1b582a88 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 -Subject: [PATCH 01/11] conf-parser: introduce 'early' drop-ins +Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 48 +++++++++-- - src/test/test-conf-parser.c | 154 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 197 insertions(+), 5 deletions(-) + src/shared/conf-parser.c | 54 +++++++++++- + src/test/test-conf-parser.c | 163 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 213 insertions(+), 4 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 1e1967d7ea..eb81732dfa 100644 +index 6bd3ab38db..1722b90ca0 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -464,6 +464,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, +@@ -478,6 +478,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, static int config_parse_many_files( const char* const* conf_files, @@ -77,25 +77,32 @@ index 1e1967d7ea..eb81732dfa 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -481,6 +482,12 @@ static int config_parse_many_files( - stats_by_path = hashmap_new(&path_hash_ops_free_free); - if (!stats_by_path) +@@ -496,6 +497,20 @@ static int config_parse_many_files( return -ENOMEM; -+ } -+ + } + + STRV_FOREACH(fn, early_files) { + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); + if (r < 0) + return r; - } - ++ if (r == 0) ++ continue; ++ ++ if (ret_stats_by_path) { ++ r = hashmap_put_stats_by_path(&stats_by_path, *fn, &st); ++ if (r < 0) ++ return r; ++ } ++ } ++ /* First read the first found main config file. */ -@@ -521,6 +528,28 @@ static int config_parse_many_files( + STRV_FOREACH(fn, conf_files) { + r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); +@@ -534,6 +549,27 @@ static int config_parse_many_files( return 0; } +static int config_parse_split_conf_files(char **files, char ***early_files, char ***late_files) { -+ char **f; + + assert(files); + assert(early_files); @@ -119,7 +126,7 @@ index 1e1967d7ea..eb81732dfa 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -532,15 +561,19 @@ int config_parse_many_nulstr( +@@ -545,15 +581,19 @@ int config_parse_many_nulstr( void *userdata, Hashmap **ret_stats_by_path) { @@ -142,17 +149,15 @@ index 1e1967d7ea..eb81732dfa 100644 ret_stats_by_path); } -@@ -556,8 +589,8 @@ int config_parse_many( +@@ -590,6 +630,7 @@ int config_parse_many( void *userdata, Hashmap **ret_stats_by_path) { -+ _cleanup_strv_free_ char **files = NULL, **early_files = NULL, **late_files = NULL; - _cleanup_strv_free_ char **dropin_dirs = NULL; -- _cleanup_strv_free_ char **files = NULL; - const char *suffix; ++ _cleanup_strv_free_ char **early_files = NULL, **late_files = NULL; + _cleanup_strv_free_ char **files = NULL; int r; -@@ -570,7 +603,12 @@ int config_parse_many( +@@ -602,7 +643,12 @@ int config_parse_many( if (r < 0) return r; @@ -165,9 +170,9 @@ index 1e1967d7ea..eb81732dfa 100644 + sections, lookup, table, flags, userdata, ret_stats_by_path); } - #define DEFINE_PARSER(type, vartype, conv_func) \ + static int config_get_stats_by_path_one( diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index e61932ab16..de408272f0 100644 +index e61932ab16..5a5c0d73ff 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -180,12 +185,11 @@ index e61932ab16..de408272f0 100644 #include "string-util.h" #include "strv.h" #include "tests.h" -@@ -391,4 +394,155 @@ TEST(config_parse) { +@@ -391,4 +394,164 @@ TEST(config_parse) { test_config_parse_one(i, config_file[i]); } +static void setup_conf_files(const char *root, bool is_main, char **conf_files, char ***ret_conf_dirs) { -+ char **path; + + /* If 'is_main' is true then 'conf_files' should only contain an entry + * for the main conf file. */ @@ -264,8 +268,12 @@ index e61932ab16..de408272f0 100644 + NULL, + NULL); + } else { ++ /* sigh... since commit bdb2d3c6889408c7f26c2eeddbe9021ac53f962c, ++ * 'conf_file_dirs' parameter can't be NULL. */ ++ + r = config_parse_many(STRV_MAKE_CONST(conf_file), -+ (const char * const*) conf_dirs, "", ++ (const char * const*)(conf_dirs ?: STRV_MAKE_EMPTY), ++ "", + "Section\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, @@ -274,9 +282,15 @@ index e61932ab16..de408272f0 100644 + } + + assert_se(r == 0); -+ assert_se((!name && !parsed_name) || streq(name, parsed_name)); -+ assert_se((!late && !parsed_late) || streq(late, parsed_late)); -+ assert_se((!early && !parsed_early) || streq(early, parsed_early)); ++ ++ assert_se((!!name == !!parsed_name)); ++ assert_se(!name || streq(name, parsed_name)); ++ ++ assert_se((!!late == !!parsed_late)); ++ assert_se(!late || streq(late, parsed_late)); ++ ++ assert_se((!!early == !!parsed_early)); ++ assert_se(!early || streq(early, parsed_early)); + + assert_se(rm_rf(tmp_dir, REMOVE_ROOT|REMOVE_PHYSICAL) == 0); +} @@ -337,5 +351,5 @@ index e61932ab16..de408272f0 100644 + DEFINE_TEST_MAIN(LOG_INFO); -- -2.34.1 +2.35.3 diff --git a/files.devel b/files.devel index c1a2301c..fde7b6f7 100644 --- a/files.devel +++ b/files.devel @@ -87,7 +87,9 @@ %{_mandir}/man3/SD_ID128_NULL.3.gz %{_mandir}/man3/SD_ID128_STRING_MAX.3.gz %{_mandir}/man3/SD_ID128_TO_STRING.3.gz +%{_mandir}/man3/SD_ID128_TO_UUID_STRING.3.gz %{_mandir}/man3/SD_ID128_UUID_FORMAT_STR.3.gz +%{_mandir}/man3/SD_ID128_UUID_STRING_MAX.3.gz %{_mandir}/man3/SD_INFO.3.gz %{_mandir}/man3/SD_JOURNAL_ALL_NAMESPACES.3.gz %{_mandir}/man3/SD_JOURNAL_APPEND.3.gz @@ -112,6 +114,7 @@ %{_mandir}/man3/sd-bus-errors.3.gz %{_mandir}/man3/sd-bus.3.gz %{_mandir}/man3/sd-daemon.3.gz +%{_mandir}/man3/sd-device.3.gz %{_mandir}/man3/sd-event.3.gz %{_mandir}/man3/sd-hwdb.3.gz %{_mandir}/man3/sd-id128.3.gz @@ -423,6 +426,20 @@ %{_mandir}/man3/sd_bus_unref.3.gz %{_mandir}/man3/sd_bus_unrefp.3.gz %{_mandir}/man3/sd_bus_wait.3.gz +%{_mandir}/man3/sd_device_get_devname.3.gz +%{_mandir}/man3/sd_device_get_devnum.3.gz +%{_mandir}/man3/sd_device_get_devpath.3.gz +%{_mandir}/man3/sd_device_get_devtype.3.gz +%{_mandir}/man3/sd_device_get_diskseq.3.gz +%{_mandir}/man3/sd_device_get_driver.3.gz +%{_mandir}/man3/sd_device_get_ifindex.3.gz +%{_mandir}/man3/sd_device_get_subsystem.3.gz +%{_mandir}/man3/sd_device_get_sysname.3.gz +%{_mandir}/man3/sd_device_get_sysnum.3.gz +%{_mandir}/man3/sd_device_get_syspath.3.gz +%{_mandir}/man3/sd_device_ref.3.gz +%{_mandir}/man3/sd_device_unref.3.gz +%{_mandir}/man3/sd_device_unrefp.3.gz %{_mandir}/man3/sd_event.3.gz %{_mandir}/man3/sd_event_add_child.3.gz %{_mandir}/man3/sd_event_add_child_pidfd.3.gz @@ -535,6 +552,7 @@ %{_mandir}/man3/sd_id128_randomize.3.gz %{_mandir}/man3/sd_id128_t.3.gz %{_mandir}/man3/sd_id128_to_string.3.gz +%{_mandir}/man3/sd_id128_to_uuid_string.3.gz %{_mandir}/man3/sd_is_fifo.3.gz %{_mandir}/man3/sd_is_mq.3.gz %{_mandir}/man3/sd_is_socket.3.gz diff --git a/files.network b/files.network index 9e3f698c..d3c3715c 100644 --- a/files.network +++ b/files.network @@ -23,19 +23,24 @@ %{_mandir}/man5/systemd.network.5.gz %{_mandir}/man8/systemd-networkd-wait-online.8.gz %{_mandir}/man8/systemd-networkd-wait-online.service.8.gz +%{_mandir}/man8/systemd-networkd-wait-online@.service.8.gz %{_mandir}/man8/systemd-networkd.8.gz %{_mandir}/man8/systemd-networkd.service.8.gz %{_systemd_util_dir}/network/80-6rd-tunnel.network %{_systemd_util_dir}/network/80-container-host0.network %{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-vz.network +%{_systemd_util_dir}/network/80-ethernet.network.example %{_systemd_util_dir}/network/80-vm-vt.network %{_systemd_util_dir}/network/80-wifi-adhoc.network %{_systemd_util_dir}/network/80-wifi-ap.network.example %{_systemd_util_dir}/network/80-wifi-station.network.example %{_systemd_util_dir}/systemd-networkd %{_systemd_util_dir}/systemd-networkd-wait-online +%{_sysusersdir}/systemd-network.conf +%{_tmpfilesdir}/systemd-network.conf %{_unitdir}/systemd-networkd-wait-online.service +%{_unitdir}/systemd-networkd-wait-online@.service %{_unitdir}/systemd-networkd.service %{_unitdir}/systemd-networkd.socket %endif diff --git a/files.systemd b/files.systemd index 8e3481a9..482666b7 100644 --- a/files.systemd +++ b/files.systemd @@ -183,6 +183,7 @@ %{_datadir}/polkit-1/actions/org.freedesktop.login1.policy %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy +%{_datadir}/polkit-1/actions/org.freedesktop.timesync1.policy %{_datadir}/systemd/kbd-model-map %{_datadir}/systemd/language-fallback-map %if %{without bootstrap} @@ -301,6 +302,7 @@ %{_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 @@ -386,6 +388,11 @@ %{_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 @@ -419,7 +426,8 @@ %{_sysconfdir}/xdg/systemd/user %{_sysctldir}/99-sysctl.conf %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator -%{_systemd_util_dir}/libsystemd-shared-250.so +%{_systemd_util_dir}/libsystemd-core-251.so +%{_systemd_util_dir}/libsystemd-shared-251.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh @@ -444,6 +452,9 @@ %{_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 @@ -483,11 +494,6 @@ %{_systemdgeneratordir}/systemd-run-generator %{_systemdgeneratordir}/systemd-system-update-generator %{_sysusersdir}/systemd-journal.conf -%if %{with networkd} -# Yes, systemd-network.conf really belongs here, see -# https://github.com/systemd/systemd/pull/22416#issuecomment-1029828592 -%{_sysusersdir}/systemd-network.conf -%endif %{_sysusersdir}/systemd-timesync.conf %{_tmpfilesdir}/journal-nocow.conf %{_tmpfilesdir}/suse.conf @@ -643,6 +649,12 @@ %{_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/files.udev b/files.udev index 5e9aa154..b0034758 100644 --- a/files.udev +++ b/files.udev @@ -1,6 +1,7 @@ # # Please keep the list sorted (with `LC_ALL=C sort`). # +%config(noreplace) %{_sysconfdir}/systemd/pstore.conf %config(noreplace) %{_sysconfdir}/udev/udev.conf %if %{without bootstrap} # %%dir %{_libdir}/cryptsetup @@ -40,6 +41,8 @@ %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/integritytab.5.gz %{_mandir}/man5/modules-load.d.5.gz +%{_mandir}/man5/pstore.conf.5.gz +%{_mandir}/man5/pstore.conf.d.5.gz %{_mandir}/man5/udev.conf.5.gz %{_mandir}/man5/veritytab.5.gz %{_mandir}/man7/hwdb.7.gz @@ -63,6 +66,8 @@ %{_mandir}/man8/systemd-modules-load.service.8.gz %{_mandir}/man8/systemd-network-generator.8.gz %{_mandir}/man8/systemd-network-generator.service.8.gz +%{_mandir}/man8/systemd-pstore.8.gz +%{_mandir}/man8/systemd-pstore.service.8.gz %{_mandir}/man8/systemd-rfkill.8.gz %{_mandir}/man8/systemd-rfkill.service.8.gz %{_mandir}/man8/systemd-rfkill.socket.8.gz @@ -104,6 +109,7 @@ %{_systemd_util_dir}/systemd-modules-load %endif %{_systemd_util_dir}/systemd-network-generator +%{_systemd_util_dir}/systemd-pstore %{_systemd_util_dir}/systemd-rfkill %{_systemd_util_dir}/systemd-udevd %if %{without bootstrap} @@ -120,6 +126,7 @@ %{_systemdgeneratordir}/systemd-veritysetup-generator %endif %{_tmpfilesdir}/static-nodes-permissions.conf +%{_tmpfilesdir}/systemd-pstore.conf %{_udevhwdbdir}/20-OUI.hwdb %{_udevhwdbdir}/20-acpi-vendor.hwdb %{_udevhwdbdir}/20-bluetooth-vendor-product.hwdb @@ -145,6 +152,7 @@ %{_udevhwdbdir}/70-cameras.hwdb %{_udevhwdbdir}/70-joystick.hwdb %{_udevhwdbdir}/70-mouse.hwdb +%{_udevhwdbdir}/70-pda.hwdb %{_udevhwdbdir}/70-pointingstick.hwdb %{_udevhwdbdir}/70-touchpad.hwdb %{_udevhwdbdir}/80-ieee1394-unit-function.hwdb @@ -220,6 +228,7 @@ %{_unitdir}/systemd-modules-load.service %endif %{_unitdir}/systemd-network-generator.service +%{_unitdir}/systemd-pstore.service %{_unitdir}/systemd-rfkill.service %{_unitdir}/systemd-rfkill.socket %{_unitdir}/systemd-tmpfiles-setup-dev.service diff --git a/files.uefi-boot b/files.uefi-boot index 70e46b69..a50867c4 100644 --- a/files.uefi-boot +++ b/files.uefi-boot @@ -19,6 +19,7 @@ %{_mandir}/man7/linuxia32.efi.stub.7.gz %{_mandir}/man7/linuxx64.efi.stub.7.gz %{_mandir}/man7/sd-boot.7.gz +%{_mandir}/man7/sd-stub.7.gz %{_mandir}/man7/systemd-boot.7.gz %{_mandir}/man7/systemd-stub.7.gz %{_mandir}/man8/kernel-install.8.gz diff --git a/systemd-rpmlintrc b/systemd-rpmlintrc index d381b82f..717dd254 100644 --- a/systemd-rpmlintrc +++ b/systemd-rpmlintrc @@ -11,4 +11,4 @@ addFilter(".*explicit-lib-dependency .*") addFilter(".*tmpfile-not-in-filelist .*") # shlib policy does not cover multibuilds -addFilter("libsystemd0-mini.x86_64: E: shlib-policy-name-error SONAME: libsystemd.so.0.*") +addFilter("libsystemd0-mini\..*: E: shlib-policy-name-error SONAME: libsystemd.so.0.*") diff --git a/systemd-v250.6+suse.58.g4dbc543953.tar.xz b/systemd-v250.6+suse.58.g4dbc543953.tar.xz deleted file mode 100644 index 8d9d9222..00000000 --- a/systemd-v250.6+suse.58.g4dbc543953.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7c00bf0607ca3a8ad8d001808741277c600db2c446bb58ce347e445dec2ff20e -size 7677168 diff --git a/systemd-v251.2+suse.21.ge9fc337d97.tar.xz b/systemd-v251.2+suse.21.ge9fc337d97.tar.xz new file mode 100644 index 00000000..9edde956 --- /dev/null +++ b/systemd-v251.2+suse.21.ge9fc337d97.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b6b345714da705a4dd420ae4ebec9192b009d5d00c0186b7300894f961d3495c +size 7827816 diff --git a/systemd.changes b/systemd.changes index ba9c7421..25f7c3d3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,50 @@ +------------------------------------------------------------------- +Tue Jun 21 14:09:51 UTC 2022 - Franck Bui + +- pstore is no more considered as an experimental feature: move it to udev + package (bsc#1197802) + +------------------------------------------------------------------- +Tue Jun 21 13:20:39 UTC 2022 - Franck Bui + +- Adjust rpmlintrc for shlib-policy-name-error/multibuild case so that it's not + only for x86_64. + +------------------------------------------------------------------- +Tue Jun 21 13:15:12 UTC 2022 - Franck Bui + +- spec: %suse_version rpm macro is already reserved and has a special meaning in + openSUSE distros so rename it to %archive_version instead. + +------------------------------------------------------------------- +Wed Jun 8 10:11:12 UTC 2022 - Franck Bui + +- Import commit e9fc337d97539fcab23078ab3e06f6b2ce3a3c8d + + ca0b29521f sha256: fix compilation on efi-ia32 + 1bbbac6a7e test: enable virtio-rng device for QEMU guests + +------------------------------------------------------------------- +Wed Jun 1 07:20:05 UTC 2022 - Franck Bui + +- Upgrade to v251.2 (commit 949d6bb7201dd48167ee9716ed6278764d1f4c0f) + + See https://github.com/openSUSE/systemd/blob/SUSE/v251/NEWS for + details. + + This includes the following bug fixes: + + - upstream commit e6b169418369abbc88c8f622e02e1d704a23d4ef (bsc#1137373 bsc#1181658 bsc#1194708 bsc#1195157 bsc#1197570) + + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch + + * systemd-testsuite now requires python3-pexpect due to TEST-69-SHUTDOWN + relying on this module. + + * sysusers.d/systemd-network.conf has been moved to systemd-network + sub-package since the tmpfiles configuration snippets for networkd has also + been moved to this sub-package. + ------------------------------------------------------------------- Tue May 31 13:26:38 UTC 2022 - Franck Bui @@ -26,6 +73,11 @@ Fri Apr 29 12:37:00 UTC 2022 - Franck Bui It's a backport of upstream commit 1000522a60ceade446773c67031b47a566d4a70d. +------------------------------------------------------------------- +Wed Apr 20 08:25:27 UTC 2022 - Ludwig Nussel + +- spec: add sbat (boo#1198589) + ------------------------------------------------------------------- Wed Apr 20 07:59:23 UTC 2022 - Ludwig Nussel @@ -1065,6 +1117,7 @@ Mon Apr 26 16:25:38 UTC 2021 - Franck Bui - upstream commit 4327574fc1093513badc2177f71cede2fc88c13c (bsc#1166028) - upstream commit 3573e032f26724949e86626eace058d006b8bf70 (bsc#1186411) + - upstream commit 30927a24848c4d727f7619cc74b878f098cdd724 (bsc#1200170) - A couple runtime dependencies on libraries are now tracked manually (with Recommends:) due to the fact that some symbols of diff --git a/systemd.spec b/systemd.spec index e7d0df84..cfd91bc8 100644 --- a/systemd.spec +++ b/systemd.spec @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define suse_version +suse.58.g4dbc543953 +%define archive_version +suse.21.ge9fc337d97 %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: 250.6 +Version: 251.2 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -156,7 +156,7 @@ Provides: systemd-analyze = %{version}-%{release} Obsoletes: pm-utils <= 1.4.1 Obsoletes: suspend <= 1.0 Obsoletes: systemd-analyze < 201 -Source0: systemd-v%{version}%{suse_version}.tar.xz +Source0: systemd-v%{version}%{archive_version}.tar.xz Source1: systemd-rpmlintrc Source2: systemd-user %if %{with sysvcompat} @@ -547,6 +547,7 @@ Requires: libtss2-rc0 Requires: lz4 Requires: make Requires: netcat +Requires: python3-pexpect Requires: qemu-kvm Requires: quota Requires: socat @@ -627,7 +628,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, pstore, repart, userdbd. +The package contains: homed, repart, userdbd. Have fun with these services at your own risk. %endif @@ -637,12 +638,12 @@ Have fun with these services at your own risk. %endif %prep -%autosetup -p1 -n systemd-v%{version}%{suse_version} +%autosetup -p1 -n systemd-v%{version}%{archive_version} %build %meson \ -Dmode=release \ - -Dversion-tag=%{version}%{suse_version} \ + -Dversion-tag=%{version}%{archive_version} \ -Ddocdir=%{_docdir}/systemd \ %if %{with split_usr} -Drootprefix=/usr \ @@ -680,6 +681,8 @@ Have fun with these services at your own risk. -Doomd=false \ -Dsmack=false \ \ + -Dpstore=true \ + \ -Dapparmor=%{when_not bootstrap} \ -Defi=%{when_not bootstrap} \ -Delfutils=%{when_not bootstrap} \ @@ -689,6 +692,7 @@ 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} \ @@ -702,7 +706,13 @@ Have fun with these services at your own risk. \ -Dgnu-efi=%{when sd_boot} \ -Dkernel-install=%{when sd_boot} \ - -Dsbat-distro= \ + \ + -Dsbat-distro="%{?sbat_distro}" \ + -Dsbat-distro-summary="%{?sbat_distro_summary}" \ + -Dsbat-distro-url="%{?sbat_distro_url}" \ + \ + -Dsbat-distro-pkgname="%{name}" \ + -Dsbat-distro-version="%{version}-%{release}" \ \ -Ddefault-dnssec=no \ -Ddns-servers='' \ @@ -710,7 +720,6 @@ Have fun with these services at your own risk. -Dresolve=%{when resolved} \ \ -Dhomed=%{when experimental} \ - -Dpstore=%{when experimental} \ -Drepart=%{when experimental} \ -Duserdb=%{when experimental} \ \ @@ -975,7 +984,6 @@ pam-config --add --systemd || : # in %%post. However this shouldn't be an issue since all files the # main package ships are owned by root. %sysusers_create systemd-journal.conf -%sysusers_create systemd-network.conf %sysusers_create systemd-timesync.conf [ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : @@ -1000,8 +1008,8 @@ systemctl daemon-reexec || : # systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : if [ "$1" -eq 1 ]; then - # Persistent journal is the default - mkdir -p %{_localstatedir}/log/journal + # Persistent journal is the default + mkdir -p %{_localstatedir}/log/journal fi %journal_catalog_update @@ -1075,19 +1083,25 @@ fi # Avoid restarting logind until fixed upstream (issue #1163) %pre -n udev%{?mini} +%systemd_pre remote-cryptsetup.target +%systemd_pre systemd-pstore.service + # New installations uses the last compat symlink generation number # (currently at 2), which basically disables all compat symlinks. On # old systems, the file doesn't exist. This is equivalent to # generation #1, which enables the creation of all compat symlinks. if [ $1 -eq 1 ]; then - echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation + echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation fi %post -n udev%{?mini} %regenerate_initrd_post %udev_hwdb_update +%tmpfiles_create systemd-pstore.conf + %systemd_post remote-cryptsetup.target +%systemd_post systemd-pstore.service # add KERNEL name match to existing persistent net rules sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2"/}' \ @@ -1097,6 +1111,10 @@ sed -ri '/KERNEL/ ! { s/NAME="(eth|wlan|ath)([0-9]+)"/KERNEL=="\1*", NAME="\1\2" rm -f /etc/sysconfig/udev rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules +%preun -n udev%{?mini} +%systemd_preun systemd-udevd.service systemd-udevd-{control,kernel}.socket +%systemd_preun systemd-pstore.service + %postun -n udev%{?mini} %regenerate_initrd_post @@ -1113,7 +1131,8 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules # Note that when systemd-udevd is restarted, there will always be a short time # frame where no socket will be listening to the events sent by the kernel, no # matter if the socket unit is restarted in first or not. -%service_del_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket +%systemd_postun_with_restart systemd-udevd.service systemd-udevd-{control,kernel}.socket +%systemd_postun systemd-pstore.service %posttrans -n udev%{?mini} %regenerate_initrd_posttrans @@ -1197,6 +1216,8 @@ fi %post network %if %{with networkd} +%sysusers_create systemd-network.conf +%tmpfiles_create systemd-network.conf %service_add_post systemd-networkd.service %service_add_post systemd-networkd-wait-online.service %endif @@ -1243,23 +1264,18 @@ fi %if %{with experimental} %pre experimental -%service_add_pre systemd-pstore.service %service_add_pre systemd-userdbd.service systemd-userdbd.socket %service_add_pre systemd-homed.service %post experimental -%tmpfiles_create systemd-pstore.conf -%service_add_post systemd-pstore.service %service_add_post systemd-userdbd.service systemd-userdbd.socket %service_add_post systemd-homed.service %preun experimental -%service_del_preun systemd-pstore.service %service_del_preun systemd-userdbd.service systemd-userdbd.socket %service_del_preun systemd-homed.service %postun experimental -%service_del_postun systemd-pstore.service %service_del_postun systemd-userdbd.service systemd-userdbd.socket %service_del_postun systemd-homed.service %endif @@ -1302,13 +1318,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.33.0 +%{_libdir}/libsystemd.so.0.34.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.3 +%{_libdir}/libudev.so.1.7.4 %if %{with coredump} %files coredump @@ -1393,11 +1409,6 @@ fi %if %{with experimental} %files experimental %defattr(-,root,root) -%config(noreplace) %{_sysconfdir}/systemd/pstore.conf -%{_prefix}/lib/systemd/systemd-pstore -%{_unitdir}/systemd-pstore.service -%{_tmpfilesdir}/systemd-pstore.conf -%{_mandir}/man*/*pstore* %{_bindir}/systemd-repart %{_unitdir}/systemd-repart.service %{_mandir}/man*/*repart* From 65ac557c9c5444469cfee16e71d220cf7a3f1b4e5351906844adff5c33750a2d Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 20 Aug 2022 18:28:06 +0000 Subject: [PATCH 104/124] 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 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. - 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 - 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: https://github.com/openSUSE/systemd/compare/32912879062bb1595d8498b6f9c77d5acd1dc66a...8cd784e9250b38d20d8e14fccbfb211010283c79 - 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 --- files.experimental | 68 ++++++++++++++++++ files.systemd | 19 ++--- files.udev | 1 + systemd-v251.2+suse.21.ge9fc337d97.tar.xz | 3 - systemd-v251.4+suse.29.g532faa39eb.tar.xz | 3 + systemd.changes | 86 +++++++++++++++++++++++ systemd.spec | 65 +++++++---------- 7 files changed, 187 insertions(+), 58 deletions(-) create mode 100644 files.experimental delete mode 100644 systemd-v251.2+suse.21.ge9fc337d97.tar.xz create mode 100644 systemd-v251.4+suse.29.g532faa39eb.tar.xz diff --git a/files.experimental b/files.experimental new file mode 100644 index 00000000..ea0da120 --- /dev/null +++ b/files.experimental @@ -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 diff --git a/files.systemd b/files.systemd index 482666b7..a245c56f 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 @@ -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 diff --git a/files.udev b/files.udev index b0034758..0b7e58fe 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-v251.2+suse.21.ge9fc337d97.tar.xz b/systemd-v251.2+suse.21.ge9fc337d97.tar.xz deleted file mode 100644 index 9edde956..00000000 --- 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.4+suse.29.g532faa39eb.tar.xz b/systemd-v251.4+suse.29.g532faa39eb.tar.xz new file mode 100644 index 00000000..84e72c3e --- /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 25f7c3d3..fe438c37 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,89 @@ +------------------------------------------------------------------- +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) + - 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 + +- Drop 1001-statx.patch, it's no more needed. + +------------------------------------------------------------------- +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: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 + +- 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 + +- 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 + +- Enable bpf framework + +------------------------------------------------------------------- +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 + +- systemd.spec: add files.experimental + +------------------------------------------------------------------- +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 + +- 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 cfd91bc8..eea6b0ff 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.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 From 9277d8b3498b66ea97f038f99d6c3524581e8de1a83654eabea24fd39dfdbb50 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 13 Sep 2022 13:07:51 +0000 Subject: [PATCH 105/124] Accepting request 1002990 from Base:System - rc-local.service.8 belongs to the systemd-sysvcompat sub-package (bsc#1203053) - Enable building and include libcryptsetup-plugins provided by systemd Now that dracut 057 has been released we can enable building libcryptsetup plugins. These can be used by cryptsetup to extend functionality including fido2, pkcs11 and tpm2 support. - Let systemd trust the RTC for 30 years after the last update instead of 15 (bsc#1202356) To allow for our systems to be used in edge locations without systemd updates for a long time. OBS-URL: https://build.opensuse.org/request/show/1002990 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=363 --- files.systemd | 1 - files.sysvcompat | 1 + files.udev | 8 ++++---- systemd.changes | 22 ++++++++++++++++++++++ systemd.spec | 3 ++- 5 files changed, 29 insertions(+), 6 deletions(-) diff --git a/files.systemd b/files.systemd index a245c56f..a149243f 100644 --- a/files.systemd +++ b/files.systemd @@ -330,7 +330,6 @@ %{_mandir}/man8/halt.8.gz %{_mandir}/man8/pam_systemd.8.gz %{_mandir}/man8/poweroff.8.gz -%{_mandir}/man8/rc-local.service.8.gz %{_mandir}/man8/reboot.8.gz %{_mandir}/man8/shutdown.8.gz %{_mandir}/man8/systemd-ask-password-console.path.8.gz diff --git a/files.sysvcompat b/files.sysvcompat index 49e50a81..786a9b3c 100644 --- a/files.sysvcompat +++ b/files.sysvcompat @@ -6,6 +6,7 @@ %dir %{_unitdir}/runlevel3.target.wants %dir %{_unitdir}/runlevel4.target.wants %dir %{_unitdir}/runlevel5.target.wants +%{_mandir}/man8/rc-local.service.8.gz %{_mandir}/man8/runlevel.8.gz %{_mandir}/man8/systemd-initctl.8.gz %{_mandir}/man8/systemd-initctl.service.8.gz diff --git a/files.udev b/files.udev index 0b7e58fe..daf66aa9 100644 --- a/files.udev +++ b/files.udev @@ -4,7 +4,7 @@ %config(noreplace) %{_sysconfdir}/systemd/pstore.conf %config(noreplace) %{_sysconfdir}/udev/udev.conf %if %{without bootstrap} -# %%dir %{_libdir}/cryptsetup +%dir %{_libdir}/cryptsetup %dir %{_modulesloaddir} %endif %dir %{_prefix}/lib/udev @@ -35,9 +35,9 @@ %{_datadir}/zsh/site-functions/_udevadm %endif %if %{without bootstrap} -# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so -# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so -# %%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-fido2.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-pkcs11.so +%{_libdir}/cryptsetup/libcryptsetup-token-systemd-tpm2.so %{_mandir}/man1/systemd-cryptenroll.1.gz %{_mandir}/man5/crypttab.5.gz %{_mandir}/man5/integritytab.5.gz diff --git a/systemd.changes b/systemd.changes index fe438c37..64113e4f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Mon Sep 5 06:56:51 UTC 2022 - Franck Bui + +- rc-local.service.8 belongs to the systemd-sysvcompat sub-package (bsc#1203053) + +------------------------------------------------------------------- +Fri Sep 2 20:17:01 UTC 2022 - Bob Haley + +- Enable building and include libcryptsetup-plugins provided by systemd + + Now that dracut 057 has been released we can enable building libcryptsetup + plugins. These can be used by cryptsetup to extend functionality including + fido2, pkcs11 and tpm2 support. + +------------------------------------------------------------------- +Mon Aug 29 08:00:09 UTC 2022 - Bernhard Wiedemann + +- Let systemd trust the RTC for 30 years after the last update instead of 15 (bsc#1202356) + + To allow for our systems to be used in edge locations without systemd updates + for a long time. + ------------------------------------------------------------------- Tue Aug 16 15:55:26 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index eea6b0ff..0922fd48 100644 --- a/systemd.spec +++ b/systemd.spec @@ -661,6 +661,7 @@ Have fun with these services at your own risk. -Dsplit-bin=true \ -Dsystem-uid-max=499 \ -Dsystem-gid-max=499 \ + -Dclock-valid-range-usec-max=946728000000000 \ -Dadm-group=false \ -Dwheel-group=false \ -Ddefault-hierarchy=unified \ @@ -686,7 +687,6 @@ Have fun with these services at your own risk. -Dgshadow=false \ -Dima=false \ -Dldconfig=false \ - -Dlibcryptsetup-plugins=false \ -Dsmack=false \ \ -Dpstore=true \ @@ -696,6 +696,7 @@ Have fun with these services at your own risk. -Defi=%{when_not bootstrap} \ -Delfutils=%{when_not bootstrap} \ -Dhtml=%{when_not bootstrap} \ + -Dlibcryptsetup-plugins=%{when_not bootstrap} \ -Dman=%{when_not bootstrap} \ -Dnss-myhostname=%{when_not bootstrap} \ -Dnss-systemd=%{when_not bootstrap} \ From 05bd7fe51d003c14299b4bb9b9afe56081b8df0590806919ad3f6695b69233b9 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 22 Sep 2022 12:49:16 +0000 Subject: [PATCH 106/124] Accepting request 1005162 from Base:System - Drop the old band aid used during the breakage introduced by the switch of /tmp to tmpfs This was done to address the regression reported in boo#1175779 but shouldn't be necessary anymore since the (few) affected users should have updated systemd during the last 2 years. - Move nss-systemd and nss-myhostname NSS modules into the main package - Give the instructions to create a home directory with systemd-homed in the description of the systemd-experimental sub-package OBS-URL: https://build.opensuse.org/request/show/1005162 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=364 --- baselibs.conf | 1 - files.systemd | 6 +++ systemd.changes | 21 ++++++++ systemd.spec | 141 +++++++++++++++++------------------------------- 4 files changed, 76 insertions(+), 93 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index d8badad8..d277a558 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -9,4 +9,3 @@ systemd post "%{_sbindir}/pam-config -a --systemd || :" libsystemd0 libudev1 -nss-myhostname diff --git a/files.systemd b/files.systemd index a149243f..d9360a4e 100644 --- a/files.systemd +++ b/files.systemd @@ -221,6 +221,8 @@ %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if %{without bootstrap} +%{_libdir}/libnss_myhostname.so.2 +%{_libdir}/libnss_systemd.so.2 %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz %{_mandir}/man1/init.1.gz @@ -328,6 +330,10 @@ %{_mandir}/man7/systemd.time.7.gz %{_mandir}/man8/30-systemd-environment-d-generator.8.gz %{_mandir}/man8/halt.8.gz +%{_mandir}/man8/libnss_myhostname.so.2.8.gz +%{_mandir}/man8/libnss_systemd.so.2.8.gz +%{_mandir}/man8/nss-myhostname.8.gz +%{_mandir}/man8/nss-systemd.8.gz %{_mandir}/man8/pam_systemd.8.gz %{_mandir}/man8/poweroff.8.gz %{_mandir}/man8/reboot.8.gz diff --git a/systemd.changes b/systemd.changes index 64113e4f..cb7d59cf 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Wed Sep 21 09:18:34 UTC 2022 - Franck Bui + +- Drop the old band aid used during the breakage introduced by the switch of + /tmp to tmpfs + + This was done to address the regression reported in boo#1175779 but shouldn't + be necessary anymore since the (few) affected users should have updated + systemd during the last 2 years. + +------------------------------------------------------------------- +Wed Sep 21 07:48:58 UTC 2022 - Franck Bui + +- Move nss-systemd and nss-myhostname NSS modules into the main package + +------------------------------------------------------------------- +Tue Sep 20 15:07:58 UTC 2022 - Franck Bui + +- Give the instructions to create a home directory with systemd-homed in the + description of the systemd-experimental sub-package + ------------------------------------------------------------------- Mon Sep 5 06:56:51 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 0922fd48..436dac92 100644 --- a/systemd.spec +++ b/systemd.spec @@ -153,6 +153,10 @@ Provides: sbin_init Provides: sysvinit:/sbin/init Conflicts: sbin_init Conflicts: sysvinit +Obsoletes: nss-systemd < %{version}-%{release} +Provides: nss-systemd = %{version}-%{release} +Obsoletes: nss-myhostname < %{version}-%{release} +Provides: nss-myhostname = %{version}-%{release} Provides: systemd-logger = %{version}-%{release} Obsoletes: systemd-logger < %{version}-%{release} Provides: systemd-sysvinit = %{version}-%{release} @@ -472,34 +476,6 @@ http://0pointer.net/blog/walkthrough-for-portable-services.html https://systemd.io/PORTABLE_SERVICES %endif -%if %{without bootstrap} -%package -n nss-systemd -Summary: Plugin for local virtual host name resolution -License: LGPL-2.1-or-later - -%description -n nss-systemd -This package contains a plugin for the Name Service Switch (NSS), -which enables resolution of all dynamically allocated service -users. (See the DynamicUser= setting in unit files.) - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-systemd(8) manpage for more details. - -%package -n nss-myhostname -Summary: Plugin for local system host name resolution -License: LGPL-2.1-or-later - -%description -n nss-myhostname -This package contains a plug-in module for the Name Service Switch -(NSS), primarly providing hostname resolution for the locally -configured system hostname as returned by gethostname(2). For example, -it resolves the local hostname to locally configured IP addresses, as -well as "localhost" to 127.0.0.1/::1. - -To activate this NSS module, you will need to include it in -/etc/nsswitch.conf, see nss-hostname(8) manpage for more details. -%endif - %if %{with journal_remote} %package journal-remote Summary: Gateway for serving journal events over the network using HTTP @@ -623,23 +599,37 @@ BuildRequires: pkgconfig(fdisk) BuildRequires: pkgconfig(openssl) %description experimental -This package contains optional extra services that are considered as -previews and are provided so users can do early experiments with the -new features or technologies without waiting for them to be fully -supported by either upstream and openSUSE. +This package contains optional extra services that are considered as previews +and are provided so users can do early experiments with the new features or +technologies without waiting for them to be fully supported by either upstream +and openSUSE. -Please note that all services should be considered in development -phase and as such their behaviors details, unit files, option names, -etc... are subject to change without the usual backwards-compatibility -promises. +Please note that all services should be considered in development phase and as +such their behaviors details, unit files, option names, etc... are subject to +change without the usual backwards-compatibility promises. -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. +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, oomd. +Currently this package contains: homed, repart, userdbd, oomd. -Have fun with these services at your own risk. +In case you want to create a user with systemd-homed quickly, here are the steps +you can follow: + + - Make sure the nss-systemd package is installed and added into + /etc/nsswitch.conf, see nss-systemd(8) man page for details + + - Integrate pam_systemd_home.so in your PAM stack. You can do that either by + following the instructions in pam_systemd_home(8) man page or by executing + `pam-config --add --systemd_home` command + + - Enable and start systemd-homed with `systemctl enable --now systemd-homed` + + - Create a user with `homectl create ` + + - Verify the previous steps with `getent passwd ` + +Have fun (at your own risk). %endif %if %{without bootstrap} @@ -897,23 +887,21 @@ echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset # The tmpfiles dealing with the generic paths is pretty messy # currently because: # -# 1. filesystem package wants to define the generic paths and some of -# them conflict with the definition given by systemd in var.conf, -# see bsc#1078466. +# 1. filesystem package wants to define the generic paths and some of them +# conflict with the definition given by systemd in var.conf, see +# bsc#1078466. # -# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros -# (fate#314974) which conflict with tmp.conf. +# 2. /tmp and /var/tmp are not cleaned by default on SUSE distros (fate#314974) +# which conflict with tmp.conf. # -# 3. There're also legacy.conf which defines various legacy paths -# which either don't match the SUSE defaults or don't look needed -# at all. +# 3. There're also legacy.conf which defines various legacy paths which either +# don't match the SUSE defaults or don't look needed at all. # -# 4. And to finish, we don't want the part in etc.conf which imports -# default upstream files in empty /etc, see below. +# 4. We don't want the part in etc.conf which imports default upstream files in +# empty /etc, see below. # -# To keep things simple, we remove all these tmpfiles config files but -# still keep the remaining paths that still don't have a better home -# in suse.conf. +# To keep things simple, we remove all these tmpfiles config files but still +# keep the remaining paths that still don't have a better home in suse.conf. rm -f %{buildroot}%{_tmpfilesdir}/{etc,home,legacy,tmp,var}.conf install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir}/suse.conf @@ -989,6 +977,8 @@ fi %if %{without bootstrap} pam-config --add --systemd || : +# Run ldconfig for nss-systemd and nss-myhostname NSS modules. +%ldconfig %endif # systemd-sysusers is not available in %pre so this needs to be done @@ -1008,7 +998,7 @@ systemctl daemon-reexec || : # only understood by the latest version of the user manager and the # user service is started before the user manager get reexecuted. But # this case is very unlikely especially since we don't restart any -# user service for now on. +# user service for now. # # Before doing this, we unfortunately have to wait until users will # reexec their user manager (by either rebooting or restarting their @@ -1071,22 +1061,6 @@ fi # It's run only once. %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : -# During the migration to tmpfs for /tmp, a bug was introduced that -# affected users using tmpfs for /tmp and happened during the _second_ -# update following the one that introduced tmpfs on /tmp. It consisted -# in creating a dangling symlink /etc/systemd/system/tmp.mount -# pointing to the old copy that previous versions shipped in -# /usr/share/systemd, which doesn't exist anymore. So we migrate the -# link to the new location. -# -# Users have been exposed to this bug during a short period of time as -# it was present only in one release and was fixed shortly after by -# the next update. So we can assume that it's safe to drop it in 6 -# months (ie March 2021). -if [ "$(readlink -f %{_sysconfdir}/systemd/system/tmp.mount)" = "%{_datadir}/systemd/tmp.mount" ] ; then - ln -sf %{_unitdir}/tmp.mount %{_sysconfdir}/systemd/system/tmp.mount -fi - %postun # daemon-reload is implied by %%systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service @@ -1148,11 +1122,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %posttrans -n udev%{?mini} %regenerate_initrd_posttrans -%post -n libudev%{?mini}1 -p /sbin/ldconfig -%post -n libsystemd0%{?mini} -p /sbin/ldconfig +%post -n libudev%{?mini}1 -p %ldconfig +%post -n libsystemd0%{?mini} -p %ldconfig -%postun -n libudev%{?mini}1 -p /sbin/ldconfig -%postun -n libsystemd0%{?mini} -p /sbin/ldconfig +%postun -n libudev%{?mini}1 -p %ldconfig +%postun -n libsystemd0%{?mini} -p %ldconfig %post container %tmpfiles_create systemd-nspawn.conf @@ -1186,11 +1160,6 @@ fi %sysusers_create systemd-coredump.conf %endif -%if %{without bootstrap} -%ldconfig_scriptlets -n nss-myhostname -%ldconfig_scriptlets -n nss-systemd -%endif - %if %{with journal_remote} %pre journal-remote %service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service @@ -1364,18 +1333,6 @@ fi %if %{without bootstrap} %files lang -f systemd.lang - -%files -n nss-myhostname -%defattr(-, root, root) -%{_libdir}/*nss_myhostname* -%{_mandir}/man8/libnss_myhostname.* -%{_mandir}/man8/nss-myhostname.* - -%files -n nss-systemd -%defattr(-, root, root) -%{_libdir}/libnss_systemd.so* -%{_mandir}/man8/libnss_systemd.so.* -%{_mandir}/man8/nss-systemd.* %endif %if %{with journal_remote} From 31bf16d4f38b458baf01ae36aaae6dbdec0766dd193139b262b4e3b7e4a9735c Mon Sep 17 00:00:00 2001 From: Richard Brown Date: Fri, 7 Oct 2022 23:22:40 +0000 Subject: [PATCH 107/124] Accepting request 1007837 from Base:System - Import commit 07aa29e3942fb46b0aed5405c88e8d3179ca958f (merge of v251.5) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/532faa39ebaa6f56e493cc938a91a40df082b74f...07aa29e3942fb46b0aed5405c88e8d3179ca958f OBS-URL: https://build.opensuse.org/request/show/1007837 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=365 --- systemd-v251.4+suse.29.g532faa39eb.tar.xz | 3 --- systemd-v251.5+suse.31.g07aa29e394.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 4 ++-- 4 files changed, 13 insertions(+), 5 deletions(-) delete mode 100644 systemd-v251.4+suse.29.g532faa39eb.tar.xz create mode 100644 systemd-v251.5+suse.31.g07aa29e394.tar.xz diff --git a/systemd-v251.4+suse.29.g532faa39eb.tar.xz b/systemd-v251.4+suse.29.g532faa39eb.tar.xz deleted file mode 100644 index 84e72c3e..00000000 --- a/systemd-v251.4+suse.29.g532faa39eb.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:664d40000001006998ad05c7aa90093ee6f997f8d04fb0414dcecddf0670e583 -size 7831508 diff --git a/systemd-v251.5+suse.31.g07aa29e394.tar.xz b/systemd-v251.5+suse.31.g07aa29e394.tar.xz new file mode 100644 index 00000000..adadfbe3 --- /dev/null +++ b/systemd-v251.5+suse.31.g07aa29e394.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7ae6e8e70daf4297f4324f0a7776ed155f991dbfc29764443868f0f1edc727c1 +size 7835336 diff --git a/systemd.changes b/systemd.changes index cb7d59cf..fc992954 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Oct 4 08:51:48 UTC 2022 - Franck Bui + +- Import commit 07aa29e3942fb46b0aed5405c88e8d3179ca958f (merge of v251.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/532faa39ebaa6f56e493cc938a91a40df082b74f...07aa29e3942fb46b0aed5405c88e8d3179ca958f + ------------------------------------------------------------------- Wed Sep 21 09:18:34 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 436dac92..7c1240f5 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.29.g532faa39eb +%define archive_version +suse.31.g07aa29e394 %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.4 +Version: 251.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 371ec6bcf0362a08dc6e9436ff50035e7ccb30f0c1a5149ef6a3ddafc9dcbe3f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 22 Oct 2022 12:12:42 +0000 Subject: [PATCH 108/124] Accepting request 1030349 from Base:System - Import commit f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 (merge of v251.6) Beside the merge of v251.6, it also includes the following backport: - 07aaa898bd pstore: do not try to load all known pstore modules For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/07aa29e3942fb46b0aed5405c88e8d3179ca958f...f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 - Don't create /var/lib/systemd/random-seed in %post (bsc#1181458) To make sure that the same seed is not replicated when installing from a 'golden' image. For regular installations the random seed file is initialized by the installer itself (bsc#1174964). Even if it didn't, the random seed file would be created on first boot anyway. - Avoid expanding of macro in comment which leads to an error on installation (workaround for bsc#1203847) OBS-URL: https://build.opensuse.org/request/show/1030349 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=366 --- systemd-v251.5+suse.31.g07aa29e394.tar.xz | 3 --- systemd-v251.6+suse.34.gf78bba8d03.tar.xz | 3 +++ systemd.changes | 31 +++++++++++++++++++++++ systemd.spec | 9 +++---- 4 files changed, 37 insertions(+), 9 deletions(-) delete mode 100644 systemd-v251.5+suse.31.g07aa29e394.tar.xz create mode 100644 systemd-v251.6+suse.34.gf78bba8d03.tar.xz diff --git a/systemd-v251.5+suse.31.g07aa29e394.tar.xz b/systemd-v251.5+suse.31.g07aa29e394.tar.xz deleted file mode 100644 index adadfbe3..00000000 --- a/systemd-v251.5+suse.31.g07aa29e394.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ae6e8e70daf4297f4324f0a7776ed155f991dbfc29764443868f0f1edc727c1 -size 7835336 diff --git a/systemd-v251.6+suse.34.gf78bba8d03.tar.xz b/systemd-v251.6+suse.34.gf78bba8d03.tar.xz new file mode 100644 index 00000000..64986137 --- /dev/null +++ b/systemd-v251.6+suse.34.gf78bba8d03.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1f820714e952b74f90cdfff0df2de83e6e415bfc3f9f45b8225168912571465c +size 7837344 diff --git a/systemd.changes b/systemd.changes index fc992954..524f4e38 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,34 @@ +------------------------------------------------------------------- +Fri Oct 21 09:07:05 UTC 2022 - Franck Bui + +- Import commit f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 (merge of v251.6) + + Beside the merge of v251.6, it also includes the following backport: + + - 07aaa898bd pstore: do not try to load all known pstore modules + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/07aa29e3942fb46b0aed5405c88e8d3179ca958f...f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 + + +------------------------------------------------------------------- +Wed Oct 19 07:23:51 UTC 2022 - Franck Bui + +- Don't create /var/lib/systemd/random-seed in %post (bsc#1181458) + + To make sure that the same seed is not replicated when installing from a + 'golden' image. + + For regular installations the random seed file is initialized by the installer + itself (bsc#1174964). Even if it didn't, the random seed file would be created + on first boot anyway. + +------------------------------------------------------------------- +Wed Oct 12 18:35:47 UTC 2022 - Dirk Müller + +- Avoid expanding of macro in comment which leads to an error on installation + (workaround for bsc#1203847) + ------------------------------------------------------------------- Tue Oct 4 08:51:48 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 7c1240f5..d3a673c4 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.31.g07aa29e394 +%define archive_version +suse.34.gf78bba8d03 %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.5 +Version: 251.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -987,9 +987,6 @@ pam-config --add --systemd || : %sysusers_create systemd-journal.conf %sysusers_create systemd-timesync.conf -[ -e %{_localstatedir}/lib/random-seed ] && mv %{_localstatedir}/lib/random-seed %{_localstatedir}/lib/systemd/ || : -/usr/lib/systemd/systemd-random-seed save || : - systemctl daemon-reexec || : # Reexecute user manager instances (if any). It is asynchronous but it @@ -1062,7 +1059,7 @@ fi %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : %postun -# daemon-reload is implied by %%systemd_postun_with_restart +# daemon-reload is implied by systemd_postun_with_restart %systemd_postun_with_restart systemd-journald.service %systemd_postun_with_restart systemd-timesyncd.service # Avoid restarting logind until fixed upstream (issue #1163) From bf1d5bd8bef8facf47db316d178242a89b8b5c058a62100066d3b6f521e5642f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 27 Oct 2022 11:53:27 +0000 Subject: [PATCH 109/124] Accepting request 1031048 from Base:System - Import commit c212388f7de8d22a3f7c22b19553548ccc0cdd15 (merge of v251.7) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/f78bba8d037cc26c09bbdd167625b2d7fe1f5a30...c212388f7de8d22a3f7c22b19553548ccc0cdd15 - specfile: reindent comments OBS-URL: https://build.opensuse.org/request/show/1031048 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=367 --- systemd-v251.6+suse.34.gf78bba8d03.tar.xz | 3 - systemd-v251.7+suse.36.gc212388f7d.tar.xz | 3 + systemd.changes | 14 +- systemd.spec | 201 +++++++++++----------- 4 files changed, 112 insertions(+), 109 deletions(-) delete mode 100644 systemd-v251.6+suse.34.gf78bba8d03.tar.xz create mode 100644 systemd-v251.7+suse.36.gc212388f7d.tar.xz diff --git a/systemd-v251.6+suse.34.gf78bba8d03.tar.xz b/systemd-v251.6+suse.34.gf78bba8d03.tar.xz deleted file mode 100644 index 64986137..00000000 --- a/systemd-v251.6+suse.34.gf78bba8d03.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f820714e952b74f90cdfff0df2de83e6e415bfc3f9f45b8225168912571465c -size 7837344 diff --git a/systemd-v251.7+suse.36.gc212388f7d.tar.xz b/systemd-v251.7+suse.36.gc212388f7d.tar.xz new file mode 100644 index 00000000..0045d70f --- /dev/null +++ b/systemd-v251.7+suse.36.gc212388f7d.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8117034a438ce90af5534a3bd40736b29823c71936c061db831a919ca9c17663 +size 7839088 diff --git a/systemd.changes b/systemd.changes index 524f4e38..7db52fbc 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Tue Oct 25 07:19:15 UTC 2022 - Franck Bui + +- Import commit c212388f7de8d22a3f7c22b19553548ccc0cdd15 (merge of v251.7) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/f78bba8d037cc26c09bbdd167625b2d7fe1f5a30...c212388f7de8d22a3f7c22b19553548ccc0cdd15 + +------------------------------------------------------------------- +Tue Oct 25 07:12:11 UTC 2022 - Franck Bui + +- specfile: reindent comments + ------------------------------------------------------------------- Fri Oct 21 09:07:05 UTC 2022 - Franck Bui @@ -10,7 +23,6 @@ Fri Oct 21 09:07:05 UTC 2022 - Franck Bui For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/07aa29e3942fb46b0aed5405c88e8d3179ca958f...f78bba8d037cc26c09bbdd167625b2d7fe1f5a30 - ------------------------------------------------------------------- Wed Oct 19 07:23:51 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index d3a673c4..ce9046de 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.34.gf78bba8d03 +%define archive_version +suse.36.gc212388f7d %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.6 +Version: 251.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -109,8 +109,8 @@ BuildRequires: libmount-devel >= 2.27.1 BuildRequires: meson >= 0.43 BuildRequires: pam-devel BuildRequires: python3-jinja2 -# regenerate_initrd_post macro is expanded during build, hence this -# BR. Also this macro was introduced since version 12.4. +# regenerate_initrd_post macro is expanded during build, hence this BR. Also +# this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 @@ -504,10 +504,9 @@ Recommends: python3 Recommends: python3-colorama # Optional dep for mkfs.vfat needed by test-loop-block (otherwise skipped) Recommends: dosfstools -# The following deps on libs are for test-dlopen-so whereas the -# pkgconfig ones are used by test-funtions to find the libs on the -# host and install them in the image, see install_missing_libraries() -# for details. +# The following deps on libs are for test-dlopen-so whereas the pkgconfig ones +# are used by test-funtions to find the libs on the host and install them in the +# image, see install_missing_libraries() for details. %if %{with resolved} Requires: libidn2 Requires: pkgconfig(libidn2) @@ -738,9 +737,8 @@ export BRP_PESIGN_FILES="/usr/lib/systemd/boot/efi/systemd-bootx64.efi" %endif %endif -# Don't ship resolvconf symlink for now as it conflicts with the -# binary shipped by openresolv and provides limited compatibility -# only +# Don't ship resolvconf symlink for now as it conflicts with the binary shipped +# by openresolv and provides limited compatibility only. %if %{with resolved} rm %{buildroot}%{_sbindir}/resolvconf rm %{buildroot}%{_mandir}/man1/resolvconf.1* @@ -754,8 +752,8 @@ mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network mkdir -p % %{buildroot}%{_sysconfdir}/systemd/nspawn # Package the scripts used to fix all packaging issues. Also drop the -# "scripts-{systemd/udev}" prefix which is used because osc doesn't -# allow directories in the workspace... +# "scripts-{systemd/udev}" prefix which is used because osc doesn't allow +# directories in the workspace... %if %{with machined} install -m0755 -D %{SOURCE100} %{buildroot}%{_systemd_util_dir}/scripts/fix-machines-btrfs-subvol.sh %endif @@ -794,23 +792,23 @@ if [ "$(realpath %{_modprobedir})" != /usr/lib/modprobe.d ]; then mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/ fi -# don't enable wall ask password service, it spams every console (bnc#747783) +# Don't enable wall ask password service, it spams every console (bnc#747783). rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path -# do not ship sysctl defaults in systemd package, will be part of -# aaa_base (in procps for now) +# do not ship sysctl defaults in systemd package, will be part of aaa_base (in +# procps for now). rm -f %{buildroot}%{_sysctldir}/50-default.conf rm -f %{buildroot}%{_sysctldir}/50-pid-max.conf -# Make sure systemd-network polkit rules file starts with a suitable -# number prefix so it takes precedence over our polkit-default-privs. +# Make sure systemd-network polkit rules file starts with a suitable number +# prefix so it takes precedence over our polkit-default-privs. %if %{with networkd} mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ %{buildroot}%{_datadir}/polkit-1/rules.d/60-systemd-networkd.rules %endif -# since v207 /etc/sysctl.conf is no longer parsed (commit -# 04bf3c1a60d82791), however backward compatibility is provided by +# Since v207 /etc/sysctl.conf is no longer parsed (commit 04bf3c1a60d82791), +# however backward compatibility is provided by # /usr/lib/sysctl.d/99-sysctl.conf. ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf @@ -818,27 +816,26 @@ ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf # SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf -# Remove README file in init.d as (SUSE) rpm requires executable files -# in this directory... oh well. +# Remove README file in init.d as (SUSE) rpm requires executable files in this +# directory... oh well. rm -f %{buildroot}/etc/init.d/README -# This dir must be owned (and thus created) by systemd otherwise the -# build system will complain. This is odd since we simply own a ghost -# file in it... +# This dir must be owned (and thus created) by systemd otherwise the build +# system will complain. This is odd since we simply own a ghost file in it... mkdir -p %{buildroot}%{_sysconfdir}/X11/xorg.conf.d -# Make sure directories in /var exist +# Make sure directories in /var exist. mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/coredump mkdir -p %{buildroot}%{_localstatedir}/lib/systemd/catalog -# Make sure the NTP units dir exists +# Make sure the NTP units dir exists. mkdir -p %{buildroot}%{_ntpunitsdir} -# Make sure the shutdown/sleep drop-in dirs exist +# Make sure the shutdown/sleep drop-in dirs exist. mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-shutdown/ mkdir -p %{buildroot}%{_prefix}/lib/systemd/system-sleep/ -# Make sure these directories are properly owned +# Make sure these directories are properly owned. mkdir -p %{buildroot}%{_unitdir}/basic.target.wants mkdir -p %{buildroot}%{_unitdir}/default.target.wants mkdir -p %{buildroot}%{_unitdir}/dbus.target.wants @@ -861,7 +858,7 @@ mkdir -p %{buildroot}%{_userpresetdir} mkdir -p %{buildroot}%{_systemd_system_env_generator_dir} mkdir -p %{buildroot}%{_systemd_user_env_generator_dir} -# ensure after.local wrapper is called +# Ensure after.local wrapper is called. install -m 644 %{SOURCE11} %{buildroot}%{_unitdir}/ ln -s ../after-local.service %{buildroot}%{_unitdir}/multi-user.target.wants/ @@ -878,8 +875,8 @@ touch %{buildroot}%{_localstatedir}/lib/systemd/i18n-migrated %fdupes -s %{buildroot}%{_mandir} -# Make sure to disable all services by default. The Suse branding -# presets package takes care of defining the right policies. +# Make sure to disable all services by default. The Suse branding presets +# package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset @@ -925,21 +922,21 @@ if [ -f /usr/share/systemd/kbd-model-map.xkb-generated ]; then >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map fi -# kbd-model-map.legacy is used to provide mapping for legacy keymaps, -# which may still be used by yast. +# kbd-model-map.legacy is used to provide mapping for legacy keymaps, which may +# still be used by yast. cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map -# Don't ship systemd-journald-audit.socket as there's no other way for -# us to prevent journald from recording audit messages in the journal -# by default (bsc#1109252). +# Don't ship systemd-journald-audit.socket as there's no other way for us to +# prevent journald from recording audit messages in the journal by default +# (bsc#1109252). rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} cp -a test %{buildroot}%{_testsuitedir}/ # When the tests are installed, the effective testdata directory is in -# %{_testsuitedir}, the other one, which is actually a symlink, is -# only useful when the tests are run directly from the source. +# %{_testsuitedir}, the other one, which is actually a symlink, is only useful +# when the tests are run directly from the source. rm %{buildroot}%{_testsuitedir}/test/testdata # kbd-model-map became a dangling symlink, drop it. rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map @@ -950,26 +947,24 @@ find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %find_lang systemd %endif -# Build of installation images uses a hard coded list of packages with -# a %%pre that needs to be run during the build. systemd is one of them -# so keep the section even if it's empty. +# Build of installation images uses a hard coded list of packages with a %%pre +# that needs to be run during the build. systemd is one of them so keep the +# section even if it's empty. %pre : %post -# Make /etc/machine-id an empty file during package installation. On -# the first boot, machine-id is initialized and either committed (if -# /etc/ is writable) or the system/image runs with a transient machine -# ID, that changes on each boot (if the image is read-only). This is -# especially important for appliance builds to avoid an identical -# machine ID in all images. +# Make /etc/machine-id an empty file during package installation. On the first +# boot, machine-id is initialized and either committed (if /etc/ is writable) or +# the system/image runs with a transient machine ID, that changes on each boot +# (if the image is read-only). This is especially important for appliance builds +# to avoid an identical machine ID in all images. if [ $1 -eq 1 ]; then touch %{_sysconfdir}/machine-id chmod 444 %{_sysconfdir}/machine-id fi -# /etc/machine-id might have been created writeable incorrectly -# (boo#1092269). +# /etc/machine-id might have been created writeable incorrectly (boo#1092269). if [ "$(stat -c%a %{_sysconfdir}/machine-id)" != 444 ]; then echo "Incorrect file mode bits for /etc/machine-id which should be 0444, fixing..." chmod 444 %{_sysconfdir}/machine-id @@ -981,27 +976,25 @@ pam-config --add --systemd || : %ldconfig %endif -# systemd-sysusers is not available in %pre so this needs to be done -# in %%post. However this shouldn't be an issue since all files the -# main package ships are owned by root. +# systemd-sysusers is not available in %pre so this needs to be done in +# %%post. However this shouldn't be an issue since all files the main package +# ships are owned by root. %sysusers_create systemd-journal.conf %sysusers_create systemd-timesync.conf systemctl daemon-reexec || : -# Reexecute user manager instances (if any). It is asynchronous but it -# shouldn't be a problem in practice: a problem would arise only if -# the new version of a user service has a brand new option that is -# only understood by the latest version of the user manager and the -# user service is started before the user manager get reexecuted. But -# this case is very unlikely especially since we don't restart any -# user service for now. +# Reexecute user manager instances (if any). It is asynchronous but it shouldn't +# be a problem in practice: a problem would arise only if the new version of a +# user service has a brand new option that is only understood by the latest +# version of the user manager and the user service is started before the user +# manager get reexecuted. But this case is very unlikely especially since we +# don't restart any user service for now. # -# Before doing this, we unfortunately have to wait until users will -# reexec their user manager (by either rebooting or restarting their -# session) to a version that supports SIGRTMIN+25 otherwise sending -# the signal to an old version will kill the manager which means -# tearing down the user session. +# Before doing this, we unfortunately have to wait until users will reexec their +# user manager (by either rebooting or restarting their session) to a version +# that supports SIGRTMIN+25 otherwise sending the signal to an old version will +# kill the manager which means tearing down the user session. # # systemctl kill --kill-who=main --signal=SIGRTMIN+25 "user@*.service" || : @@ -1020,9 +1013,9 @@ fi %systemd_post remote-fs.target %systemd_post systemd-timesyncd.service -# v228 wrongly set world writable suid root permissions on timestamp -# files used by permanent timers. Fix the timestamps that might have -# been created by the affected versions of systemd (bsc#1020601). +# v228 wrongly set world writable suid root permissions on timestamp files used +# by permanent timers. Fix the timestamps that might have been created by the +# affected versions of systemd (bsc#1020601). for stamp in $(ls /var/lib/systemd/timers/stamp-*.timer 2>/dev/null); do chmod 0644 $stamp done @@ -1032,12 +1025,12 @@ for username in $(ls /var/lib/systemd/linger/* 2>/dev/null); do chmod 0644 $username done -# Due to the fact that DynamicUser= was turned ON during v235 and then -# switched back to off in v240, /var/lib/systemd/timesync might be a -# symlink pointing to /var/lib/private/systemd/timesync, which is -# inaccessible for systemd-timesync user as /var/lib/private is 0700 -# root:root, see https://github.com/systemd/systemd/issues/11329 for -# details. Note: only TW users might be affected by this bug. +# Due to the fact that DynamicUser= was turned ON during v235 and then switched +# back to off in v240, /var/lib/systemd/timesync might be a symlink pointing to +# /var/lib/private/systemd/timesync, which is inaccessible for systemd-timesync +# user as /var/lib/private is 0700 root:root, see +# https://github.com/systemd/systemd/issues/11329 for details. Note: only TW +# users might be affected by this bug. if [ -L %{_localstatedir}/lib/systemd/timesync ]; then rm %{_localstatedir}/lib/systemd/timesync mv %{_localstatedir}/lib/private/systemd/timesync %{_localstatedir}/lib/systemd/timesync @@ -1046,14 +1039,13 @@ fi # This includes all hacks needed when upgrading from SysV. %{_prefix}/lib/systemd/scripts/upgrade-from-pre-210.sh || : -# Migrate old i18n settings previously configured in /etc/sysconfig to -# the new locations used by systemd (/etc/locale.conf, -# /etc/vconsole.conf, ...). Recent versions of systemd parse the new -# locations only. +# Migrate old i18n settings previously configured in /etc/sysconfig to the new +# locations used by systemd (/etc/locale.conf, /etc/vconsole.conf, ...). Recent +# versions of systemd parse the new locations only. # -# This is needed both at package updates and package installations -# because we might be upgrading from a system which was running SysV -# init (systemd package is being installed). +# This is needed both at package updates and package installations because we +# might be upgrading from a system which was running SysV init (systemd package +# is being installed). # # It's run only once. %{_prefix}/lib/systemd/scripts/migrate-sysconfig-i18n.sh || : @@ -1068,10 +1060,10 @@ fi %systemd_pre remote-cryptsetup.target %systemd_pre systemd-pstore.service -# New installations uses the last compat symlink generation number -# (currently at 2), which basically disables all compat symlinks. On -# old systems, the file doesn't exist. This is equivalent to -# generation #1, which enables the creation of all compat symlinks. +# New installations uses the last compat symlink generation number (currently at +# 2), which basically disables all compat symlinks. On old systems, the file +# doesn't exist. This is equivalent to generation #1, which enables the creation +# of all compat symlinks. if [ $1 -eq 1 ]; then echo "COMPAT_SYMLINK_GENERATION=2" >/usr/lib/udev/compat-symlink-generation fi @@ -1100,15 +1092,16 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n udev%{?mini} %regenerate_initrd_post -# The order of the units being restarted is important here because there's currently no -# way to queue multiple jobs into a single transaction atomically. Therefore systemctl -# will create 3 restart jobs that can be handled by PID1 separately and if the jobs for -# the sockets are being handled first then starting them again will fail as the service -# is still active hence the sockets held by udevd. However if the restart job for udevd -# is handled first, there should be enough time to queue the socket jobs before the stop -# job for udevd is processed. Hence PID1 will automatically sort the restart jobs -# correctly by stopping the service then the sockets and then by starting the sockets and -# the unit. +# The order of the units being restarted is important here because there's +# currently no way to queue multiple jobs into a single transaction +# atomically. Therefore systemctl will create 3 restart jobs that can be handled +# by PID1 separately and if the jobs for the sockets are being handled first +# then starting them again will fail as the service is still active hence the +# sockets held by udevd. However if the restart job for udevd is handled first, +# there should be enough time to queue the socket jobs before the stop job for +# udevd is processed. Hence PID1 will automatically sort the restart jobs +# correctly by stopping the service then the sockets and then by starting the +# sockets and the unit. # # Note that when systemd-udevd is restarted, there will always be a short time # frame where no socket will be listening to the events sent by the kernel, no @@ -1130,21 +1123,19 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %if %{with machined} %ldconfig if [ $1 -gt 1 ]; then - # Convert /var/lib/machines subvolume to make it suitable for - # rollbacks, if needed. See bsc#992573. The installer has been fixed - # to create it at installation time. + # Convert /var/lib/machines subvolume to make it suitable for rollbacks, + # if needed. See bsc#992573. The installer has been fixed to create it + # at installation time. # # The convertion might only be problematic for openSUSE distros - # (TW/Factory) where previous versions had already created the - # subvolume at the wrong place (via tmpfiles for example) and user - # started to populate and use it. In this case we'll let the user fix - # it manually. + # (TW/Factory) where previous versions had already created the subvolume + # at the wrong place (via tmpfiles for example) and user started to + # populate and use it. In this case we'll let the user fix it manually. # # For SLE12 this subvolume was only introduced during the upgrade from - # v210 to v228 when we added this workaround. Note that the subvolume - # is still created at the wrong place due to the call to - # tmpfiles_create macro previously however it's empty so there - # shouldn't be any issues. + # v210 to v228 when we added this workaround. Note that the subvolume is + # still created at the wrong place due to the call to tmpfiles_create + # macro previously however it's empty so there shouldn't be any issues. %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi From 7b7e52e4d200868cc6e3cdd35279c3777b1464b5e237b39a7f769bc0da8144ae Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 10 Nov 2022 13:21:14 +0000 Subject: [PATCH 110/124] Accepting request 1034593 from Base:System - Import commit 9cdd78585069b133bebcd479f3a204057ad25d76 (merge of v251.8) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/c212388f7de8d22a3f7c22b19553548ccc0cdd15...9cdd78585069b133bebcd479f3a204057ad25d76 OBS-URL: https://build.opensuse.org/request/show/1034593 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=368 --- systemd-v251.7+suse.36.gc212388f7d.tar.xz | 3 --- systemd-v251.8+suse.38.g9cdd785850.tar.xz | 3 +++ systemd.changes | 8 ++++++++ systemd.spec | 9 +++++++-- 4 files changed, 18 insertions(+), 5 deletions(-) delete mode 100644 systemd-v251.7+suse.36.gc212388f7d.tar.xz create mode 100644 systemd-v251.8+suse.38.g9cdd785850.tar.xz diff --git a/systemd-v251.7+suse.36.gc212388f7d.tar.xz b/systemd-v251.7+suse.36.gc212388f7d.tar.xz deleted file mode 100644 index 0045d70f..00000000 --- a/systemd-v251.7+suse.36.gc212388f7d.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8117034a438ce90af5534a3bd40736b29823c71936c061db831a919ca9c17663 -size 7839088 diff --git a/systemd-v251.8+suse.38.g9cdd785850.tar.xz b/systemd-v251.8+suse.38.g9cdd785850.tar.xz new file mode 100644 index 00000000..c6e92a6a --- /dev/null +++ b/systemd-v251.8+suse.38.g9cdd785850.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e21e408a70aef50bbba4a5e39b1c728a7ef48105d226f516b51d36a18cc24d0f +size 7844584 diff --git a/systemd.changes b/systemd.changes index 7db52fbc..73e866a8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 8 16:33:26 UTC 2022 - Franck Bui + +- Import commit 9cdd78585069b133bebcd479f3a204057ad25d76 (merge of v251.8) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/c212388f7de8d22a3f7c22b19553548ccc0cdd15...9cdd78585069b133bebcd479f3a204057ad25d76 + ------------------------------------------------------------------- Tue Oct 25 07:19:15 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ce9046de..4c912853 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.36.gc212388f7d +%define archive_version +suse.38.g9cdd785850 %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.7 +Version: 251.8 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -639,6 +639,11 @@ Have fun (at your own risk). %autosetup -p1 -n systemd-v%{version}%{archive_version} %build +# Disable _FORTIFY_SOURCE=3 as it get confused by the use of +# malloc_usable_size() (bsc#1200819). There used to be a workaround but it was +# reverted, see 2cfb790391958ada34284290af1f9ab863a515c7 for the details. +export CFLAGS="%{optflags} -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2" + %meson \ -Dmode=release \ -Dversion-tag=%{version}%{archive_version} \ From 2ae1dfaaae695e10a6ae4cdc322323178f7a30357ddb9cfe40d6c7f68388c4da Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 17 Nov 2022 16:23:33 +0000 Subject: [PATCH 111/124] Accepting request 1036151 from Base:System - Upgrade to v252.1 (commit 64dc546913525e33e734500055a62ed0e963c227) See https://github.com/openSUSE/systemd/blob/SUSE/v252/NEWS for details. * Rebased 0001-conf-parser-introduce-early-drop-ins.patch 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch * The new tools systemd-measure and systemd-pcrphase have been added to the experimental sub-package for now. * Add temporarly 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch until this patch is mainstreamed. OBS-URL: https://build.opensuse.org/request/show/1036151 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=369 --- ...conf-parser-introduce-early-drop-ins.patch | 58 ++++++++++--------- ...-Pass-tty-to-use-by-agetty-via-stdin.patch | 30 +++++----- ...st-kernel-install-only-when-Dkernel-.patch | 29 ++++++++++ files.devel | 6 ++ files.experimental | 28 +++++++++ files.systemd | 11 +++- systemd-v251.8+suse.38.g9cdd785850.tar.xz | 3 - systemd-v252.1+suse.21.g64dc546913.tar.xz | 3 + systemd.changes | 17 ++++++ systemd.spec | 32 +++++----- 10 files changed, 156 insertions(+), 61 deletions(-) create mode 100644 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch delete mode 100644 systemd-v251.8+suse.38.g9cdd785850.tar.xz create mode 100644 systemd-v252.1+suse.21.g64dc546913.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index a63fa0f3..0d06f860 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,7 +1,7 @@ -From a1c88ab7f5e5ad127833168bbb38340d1b582a88 Mon Sep 17 00:00:00 2001 +From 288be40eb94ddc1d549a98556baea71d20df224f Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 -Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins +Subject: [PATCH 1/8] conf-parser: introduce 'early' drop-ins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -61,15 +61,15 @@ drop this feature at any time. Fixes: #2121 --- - src/shared/conf-parser.c | 54 +++++++++++- - src/test/test-conf-parser.c | 163 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 213 insertions(+), 4 deletions(-) + src/shared/conf-parser.c | 55 ++++++++++-- + src/test/test-conf-parser.c | 164 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 214 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 6bd3ab38db..1722b90ca0 100644 +index 5cb41a39da..86dc1c95f6 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -478,6 +478,7 @@ static int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, +@@ -478,6 +478,7 @@ int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, const s static int config_parse_many_files( const char* const* conf_files, @@ -149,30 +149,35 @@ index 6bd3ab38db..1722b90ca0 100644 ret_stats_by_path); } -@@ -590,6 +630,7 @@ int config_parse_many( - void *userdata, - Hashmap **ret_stats_by_path) { +@@ -591,6 +631,7 @@ int config_parse_many( + Hashmap **ret_stats_by_path, + char ***ret_dropin_files) { + _cleanup_strv_free_ char **early_files = NULL, **late_files = NULL; _cleanup_strv_free_ char **files = NULL; int r; -@@ -602,7 +643,12 @@ int config_parse_many( +@@ -603,12 +644,16 @@ int config_parse_many( if (r < 0) return r; -- return config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); +- r = config_parse_many_files(conf_files, files, sections, lookup, table, flags, userdata, ret_stats_by_path); + r = config_parse_split_conf_files(files, &early_files, &late_files); -+ if (r < 0) -+ return r; -+ -+ return config_parse_many_files(conf_files, early_files, late_files, -+ sections, lookup, table, flags, userdata, ret_stats_by_path); - } + if (r < 0) + return r; - static int config_get_stats_by_path_one( ++ r = config_parse_many_files(conf_files, early_files, late_files, ++ sections, lookup, table, flags, userdata, ret_stats_by_path); ++ ++ + if (ret_dropin_files) +- *ret_dropin_files = TAKE_PTR(files); ++ *ret_dropin_files = TAKE_PTR(late_files); + + return 0; + } diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index e61932ab16..5a5c0d73ff 100644 +index 8c27dcac3f..745e4a127a 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c @@ -5,6 +5,9 @@ @@ -185,7 +190,7 @@ index e61932ab16..5a5c0d73ff 100644 #include "string-util.h" #include "strv.h" #include "tests.h" -@@ -391,4 +394,164 @@ TEST(config_parse) { +@@ -391,4 +394,165 @@ TEST(config_parse) { test_config_parse_one(i, config_file[i]); } @@ -219,10 +224,10 @@ index e61932ab16..5a5c0d73ff 100644 + *path); + + if (ret_conf_dirs) { -+ char *d; ++ _cleanup_free_ char *d = NULL; + -+ assert_se((d = dirname_malloc(abspath))); -+ assert_se(strv_push(ret_conf_dirs, d) == 0); ++ assert_se(path_extract_directory(abspath, &d) >= 0); ++ assert_se(strv_consume(ret_conf_dirs, TAKE_PTR(d)) == 0); + } + } + @@ -277,8 +282,9 @@ index e61932ab16..5a5c0d73ff 100644 + "Section\0", + config_item_table_lookup, items, + CONFIG_PARSE_WARN, -+ NULL, -+ NULL); ++ NULL, /* userdata= */ ++ NULL, /* ret_stats_by_path= */ ++ NULL); /* ret_dropin_files= */ + } + + assert_se(r == 0); diff --git a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch index 107b6553..9100a4e9 100644 --- a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch +++ b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch @@ -1,7 +1,7 @@ -From 8f2cc8089304b769c25f871f28503fa1af7a468f Mon Sep 17 00:00:00 2001 +From 9e41b33e4e0d0fcc1dba654b485d6f5238e71ea8 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Thu, 17 Mar 2022 11:35:33 +0100 -Subject: [PATCH 1/1] Revert "getty: Pass tty to use by agetty via stdin" +Subject: [PATCH 8/8] Revert "getty: Pass tty to use by agetty via stdin" This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. --- @@ -12,13 +12,13 @@ This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/units/console-getty.service.in b/units/console-getty.service.in -index 73871d6f50..bb67541dce 100644 +index 606b7dbe16..54fd7c292d 100644 --- a/units/console-getty.service.in +++ b/units/console-getty.service.in -@@ -23,12 +23,10 @@ ConditionPathExists=/dev/console - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. +@@ -22,12 +22,10 @@ ConditionPathExists=/dev/console + [Service] + # The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), + # followed by '--' for safety, and then the entered username. -ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM +ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM Type=idle @@ -30,15 +30,15 @@ index 73871d6f50..bb67541dce 100644 TTYReset=yes TTYVHangup=yes diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in -index a6e3f94e2a..ed1eb7bde1 100644 +index 8d7e20d5ec..5dc75f769e 100644 --- a/units/container-getty@.service.in +++ b/units/container-getty@.service.in -@@ -28,13 +28,11 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud pts/%I 115200,38400,9600 $TERM +@@ -27,13 +27,11 @@ Before=rescue.service + [Service] + # The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), + # followed by '--' for safety, and then the entered username. +-ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM ++ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear pts/%I $TERM Type=idle Restart=always RestartSec=0 @@ -86,5 +86,5 @@ index 2433124c55..bb7af3105d 100644 TTYReset=yes TTYVHangup=yes -- -2.34.1 +2.35.3 diff --git a/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch b/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch new file mode 100644 index 00000000..3217bafa --- /dev/null +++ b/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch @@ -0,0 +1,29 @@ +From c34a72017fe66998f7bd40b5e90d27accd69376c Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Tue, 15 Nov 2022 09:04:42 +0100 +Subject: [PATCH 6000/6000] meson: install test-kernel-install only when + -Dkernel-install=true + +This patch fixes the following build failure: + + meson.build:3853:8: ERROR: Unknown variable "test_kernel_install_sh". +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 00daeac1b6..0fd0129820 100644 +--- a/meson.build ++++ b/meson.build +@@ -3968,7 +3968,7 @@ exe = custom_target( + install_dir : bindir) + public_programs += exe + +-if want_tests != 'false' ++if want_tests != 'false' and want_kernel_install + test('test-kernel-install', + test_kernel_install_sh, + args : [exe.full_path(), loaderentry_install]) +-- +2.35.3 + diff --git a/files.devel b/files.devel index fde7b6f7..2bd1c670 100644 --- a/files.devel +++ b/files.devel @@ -76,6 +76,7 @@ %{_mandir}/man3/SD_EVENT_PRIORITY_IMPORTANT.3.gz %{_mandir}/man3/SD_EVENT_PRIORITY_NORMAL.3.gz %{_mandir}/man3/SD_EVENT_RUNNING.3.gz +%{_mandir}/man3/SD_EVENT_SIGNAL_PROCMASK.3.gz %{_mandir}/man3/SD_HWDB_FOREACH_PROPERTY.3.gz %{_mandir}/man3/SD_ID128_ALLF.3.gz %{_mandir}/man3/SD_ID128_CONST_STR.3.gz @@ -215,6 +216,7 @@ %{_mandir}/man3/sd_bus_error_set_errnof.3.gz %{_mandir}/man3/sd_bus_error_set_errnofv.3.gz %{_mandir}/man3/sd_bus_error_setf.3.gz +%{_mandir}/man3/sd_bus_error_setfv.3.gz %{_mandir}/man3/sd_bus_flush.3.gz %{_mandir}/man3/sd_bus_flush_close_unref.3.gz %{_mandir}/man3/sd_bus_flush_close_unrefp.3.gz @@ -316,6 +318,7 @@ %{_mandir}/man3/sd_bus_message_read_array.3.gz %{_mandir}/man3/sd_bus_message_read_basic.3.gz %{_mandir}/man3/sd_bus_message_read_strv.3.gz +%{_mandir}/man3/sd_bus_message_read_strv_extend.3.gz %{_mandir}/man3/sd_bus_message_readv.3.gz %{_mandir}/man3/sd_bus_message_ref.3.gz %{_mandir}/man3/sd_bus_message_rewind.3.gz @@ -472,6 +475,7 @@ %{_mandir}/man3/sd_event_prepare.3.gz %{_mandir}/man3/sd_event_ref.3.gz %{_mandir}/man3/sd_event_run.3.gz +%{_mandir}/man3/sd_event_set_signal_exit.3.gz %{_mandir}/man3/sd_event_set_watchdog.3.gz %{_mandir}/man3/sd_event_signal_handler_t.3.gz %{_mandir}/man3/sd_event_source.3.gz @@ -534,6 +538,7 @@ %{_mandir}/man3/sd_hwdb_enumerate.3.gz %{_mandir}/man3/sd_hwdb_get.3.gz %{_mandir}/man3/sd_hwdb_new.3.gz +%{_mandir}/man3/sd_hwdb_new_from_path.3.gz %{_mandir}/man3/sd_hwdb_ref.3.gz %{_mandir}/man3/sd_hwdb_seek.3.gz %{_mandir}/man3/sd_hwdb_unref.3.gz @@ -550,6 +555,7 @@ %{_mandir}/man3/sd_id128_is_allf.3.gz %{_mandir}/man3/sd_id128_is_null.3.gz %{_mandir}/man3/sd_id128_randomize.3.gz +%{_mandir}/man3/sd_id128_string_equal.3.gz %{_mandir}/man3/sd_id128_t.3.gz %{_mandir}/man3/sd_id128_to_string.3.gz %{_mandir}/man3/sd_id128_to_uuid_string.3.gz diff --git a/files.experimental b/files.experimental index ea0da120..6bc23ede 100644 --- a/files.experimental +++ b/files.experimental @@ -3,6 +3,9 @@ # %config(noreplace) %{_sysconfdir}/systemd/homed.conf %config(noreplace) %{_sysconfdir}/systemd/oomd.conf +%if %{with sd_boot} +%dir %{_unitdir}/initrd.target.wants +%endif %{_bindir}/homectl %{_bindir}/oomctl %{_bindir}/systemd-repart @@ -22,6 +25,9 @@ %{_datadir}/zsh/site-functions/_oomctl %{_mandir}/man1/homectl.1.gz %{_mandir}/man1/oomctl.1.gz +%if %{with sd_boot} +%{_mandir}/man1/systemd-measure.1.gz +%endif %{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/homed.conf.5.gz %{_mandir}/man5/homed.conf.d.5.gz @@ -36,6 +42,12 @@ %{_mandir}/man8/systemd-homed.service.8.gz %{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz +%if %{with sd_boot} +%{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz +%{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz +%{_mandir}/man8/systemd-pcrphase.8.gz +%{_mandir}/man8/systemd-pcrphase.service.8.gz +%endif %{_mandir}/man8/systemd-repart.8.gz %{_mandir}/man8/systemd-repart.service.8.gz %{_mandir}/man8/systemd-sysupdate-reboot.service.8.gz @@ -50,15 +62,31 @@ %{_systemd_util_dir}/system/sysinit.target.wants/systemd-repart.service %{_systemd_util_dir}/systemd-homed %{_systemd_util_dir}/systemd-homework +%if %{with sd_boot} +%{_systemd_util_dir}/systemd-measure +%endif %{_systemd_util_dir}/systemd-oomd +%if %{with sd_boot} +%{_systemd_util_dir}/systemd-pcrphase +%endif %{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork %{_sysusersdir}/systemd-oom.conf +%if %{with sd_boot} +%{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service +%{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service +%{_unitdir}/sysinit.target.wants/systemd-pcrphase.service +%endif %{_unitdir}/systemd-homed-activate.service %{_unitdir}/systemd-homed.service %{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.socket +%if %{with sd_boot} +%{_unitdir}/systemd-pcrphase-initrd.service +%{_unitdir}/systemd-pcrphase-sysinit.service +%{_unitdir}/systemd-pcrphase.service +%endif %{_unitdir}/systemd-repart.service %{_unitdir}/systemd-sysupdate-reboot.service %{_unitdir}/systemd-sysupdate-reboot.timer diff --git a/files.systemd b/files.systemd index d9360a4e..e4b0d920 100644 --- a/files.systemd +++ b/files.systemd @@ -27,6 +27,7 @@ %endif %dir %{_environmentdir} %dir %{_journalcatalogdir} +%dir %{_libdir}/systemd %dir %{_localstatedir}/lib/systemd %dir %{_localstatedir}/lib/systemd/catalog %dir %{_modprobedir} @@ -136,6 +137,7 @@ %{_datadir}/bash-completion/completions/systemd-cat %{_datadir}/bash-completion/completions/systemd-cgls %{_datadir}/bash-completion/completions/systemd-cgtop +%{_datadir}/bash-completion/completions/systemd-cryptenroll %{_datadir}/bash-completion/completions/systemd-delta %{_datadir}/bash-completion/completions/systemd-detect-virt %{_datadir}/bash-completion/completions/systemd-id128 @@ -223,6 +225,10 @@ %if %{without bootstrap} %{_libdir}/libnss_myhostname.so.2 %{_libdir}/libnss_systemd.so.2 +%endif +%{_libdir}/systemd/libsystemd-core-252.so +%{_libdir}/systemd/libsystemd-shared-252.so +%if %{without bootstrap} %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz %{_mandir}/man1/init.1.gz @@ -327,6 +333,7 @@ %{_mandir}/man7/systemd.offline-updates.7.gz %{_mandir}/man7/systemd.special.7.gz %{_mandir}/man7/systemd.syntax.7.gz +%{_mandir}/man7/systemd.system-credentials.7.gz %{_mandir}/man7/systemd.time.7.gz %{_mandir}/man8/30-systemd-environment-d-generator.8.gz %{_mandir}/man8/halt.8.gz @@ -427,8 +434,6 @@ %{_sysconfdir}/xdg/systemd/user %{_sysctldir}/99-sysctl.conf %{_systemd_user_env_generator_dir}/30-systemd-environment-d-generator -%{_systemd_util_dir}/libsystemd-core-251.so -%{_systemd_util_dir}/libsystemd-shared-251.so %{_systemd_util_dir}/ntp-units.d/80-systemd-timesync.list %{_systemd_util_dir}/scripts/migrate-sysconfig-i18n.sh %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh @@ -453,6 +458,7 @@ %{_systemd_util_dir}/systemd-socket-proxyd %{_systemd_util_dir}/systemd-sulogin-shell %{_systemd_util_dir}/systemd-sysctl +%{_systemd_util_dir}/systemd-sysroot-fstab-check %{_systemd_util_dir}/systemd-time-wait-sync %{_systemd_util_dir}/systemd-timedated %{_systemd_util_dir}/systemd-timesyncd @@ -494,6 +500,7 @@ %{_sysusersdir}/systemd-journal.conf %{_sysusersdir}/systemd-timesync.conf %{_tmpfilesdir}/journal-nocow.conf +%{_tmpfilesdir}/provision.conf %{_tmpfilesdir}/suse.conf %{_tmpfilesdir}/systemd-nologin.conf %{_tmpfilesdir}/systemd-tmp.conf diff --git a/systemd-v251.8+suse.38.g9cdd785850.tar.xz b/systemd-v251.8+suse.38.g9cdd785850.tar.xz deleted file mode 100644 index c6e92a6a..00000000 --- a/systemd-v251.8+suse.38.g9cdd785850.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e21e408a70aef50bbba4a5e39b1c728a7ef48105d226f516b51d36a18cc24d0f -size 7844584 diff --git a/systemd-v252.1+suse.21.g64dc546913.tar.xz b/systemd-v252.1+suse.21.g64dc546913.tar.xz new file mode 100644 index 00000000..53405b75 --- /dev/null +++ b/systemd-v252.1+suse.21.g64dc546913.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:61e92987f1ac3c83d3b3be029497159b683c84869e259d904d0422c4691432e9 +size 8034368 diff --git a/systemd.changes b/systemd.changes index 73e866a8..29d0fb98 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Nov 14 11:15:06 UTC 2022 - Franck Bui + +- Upgrade to v252.1 (commit 64dc546913525e33e734500055a62ed0e963c227) + + See https://github.com/openSUSE/systemd/blob/SUSE/v252/NEWS for details. + + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch + 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch + + * The new tools systemd-measure and systemd-pcrphase have been added to the + experimental sub-package for now. + + * Add temporarly + 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch until this + patch is mainstreamed. + ------------------------------------------------------------------- Tue Nov 8 16:33:26 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 4c912853..3c033c27 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.38.g9cdd785850 +%define archive_version +suse.21.g64dc546913 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -59,7 +59,7 @@ %bcond_without portabled %bcond_without resolved %ifarch %{ix86} x86_64 aarch64 -%bcond_without sd_boot +%bcond_with sd_boot %else %bcond_with sd_boot %endif @@ -72,7 +72,7 @@ Name: systemd%{?mini} URL: http://www.freedesktop.org/wiki/Software/systemd -Version: 251.8 +Version: 252.1 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -106,7 +106,7 @@ BuildRequires: gperf BuildRequires: libacl-devel BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 -BuildRequires: meson >= 0.43 +BuildRequires: meson >= 0.53.2 BuildRequires: pam-devel BuildRequires: python3-jinja2 # regenerate_initrd_post macro is expanded during build, hence this BR. Also @@ -211,12 +211,12 @@ 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 -# Patches listed below are put in quarantine. Normally all changes -# must go to upstream first and then are cherry-picked in the SUSE git -# repository. But in very few cases, some stuff might be broken in -# upstream and need an urgent fix. Even in this case, the patches are -# temporary and should be removed as soon as a fix is merged by -# upstream. +# Patches listed below are put in quarantine. Normally all changes must go to +# upstream first and then are cherry-picked in the SUSE git repository. But for +# very few cases, some stuff might be broken in upstream and need to be fixed +# quickly. But even in these cases, the patches are temporary and should be +# removed as soon as a fix is merged by upstream. +Patch6000: 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -523,6 +523,7 @@ Requires: binutils Requires: busybox-static Requires: cryptsetup Requires: dosfstools +Requires: jq Requires: libcap-progs Requires: libfido2 Requires: libtss2-esys0 @@ -570,10 +571,10 @@ Run the following python script to run all unit tests at once: $ %{_testsuitedir}/run-unit-tests.py To run the full extended testsuite do the following: -$ NO_BUILD=1 %{_testsuitedir}/test/run-integration-tests.sh +$ NO_BUILD=1 TEST_NESTED_VM=1 %{_testsuitedir}/test/run-integration-tests.sh Or to run one specific integration test: -$ NO_BUILD=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run +$ NO_BUILD=1 TEST_NESTED_VM=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run For more details on the available options to run the extended testsuite, please refer to %{_testsuitedir}/test/README.testsuite. @@ -610,7 +611,8 @@ change without the usual backwards-compatibility promises. 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. -Currently this package contains: homed, repart, userdbd, oomd. +Currently this package contains: homed, repart, userdbd, oomd, measure and +pcrphase. In case you want to create a user with systemd-homed quickly, here are the steps you can follow: @@ -1296,13 +1298,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.34.0 +%{_libdir}/libsystemd.so.0.35.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.4 +%{_libdir}/libudev.so.1.7.5 %if %{with coredump} %files coredump From 709924c9fa77efaefff275c418489f0bab65cc6c0c0764daa76b69898f985ee8 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 19 Nov 2022 17:08:44 +0000 Subject: [PATCH 112/124] Accepting request 1036605 from Base:System - Reenable build of sd_boot, it was mistakenly disabled during the integration of v252. OBS-URL: https://build.opensuse.org/request/show/1036605 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=370 --- systemd.changes | 6 ++++++ systemd.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/systemd.changes b/systemd.changes index 29d0fb98..f6fbb553 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Nov 18 08:07:33 UTC 2022 - Franck Bui + +- Reenable build of sd_boot, it was mistakenly disabled during the integration + of v252. + ------------------------------------------------------------------- Mon Nov 14 11:15:06 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 3c033c27..e44bd068 100644 --- a/systemd.spec +++ b/systemd.spec @@ -59,7 +59,7 @@ %bcond_without portabled %bcond_without resolved %ifarch %{ix86} x86_64 aarch64 -%bcond_with sd_boot +%bcond_without sd_boot %else %bcond_with sd_boot %endif From 2eea2ae3cc3ae79a62bdfc0f37f01edc8b14a24b675107096200c8b1f60a9b24 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Fri, 25 Nov 2022 12:11:28 +0000 Subject: [PATCH 113/124] Accepting request 1037909 from Base:System - Import commit 3bd3e4e6c1efe0d6df776107efde47e15e58fe96 d28e81d65c test: fix the default timeout values described in README.testsuite d921c83f53 meson: install test-kernel-install only when -Dkernel-install=true c3b6c4b584 tests: update install_suse_systemd() 3c77335b19 tests: install dmi-sysfs module on openSUSE df632130cd tests: install systemd-resolved on openSUSE - Add 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch until upstream issue #25468 is fixed. - Drop 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch, the patch has been merged in the SUSE git repo. This includes the following bug fixes: - upstream commit 67c3e1f63a5221b47a8fea85ae421671f29f3b7e (bsc#1200723) OBS-URL: https://build.opensuse.org/request/show/1037909 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=371 --- ...whenever-creating-an-inode-immediate.patch | 474 ++++++++++++++++++ ...st-kernel-install-only-when-Dkernel-.patch | 29 -- systemd-v252.1+suse.21.g64dc546913.tar.xz | 3 - systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz | 3 + systemd.changes | 21 + systemd.spec | 4 +- 6 files changed, 500 insertions(+), 34 deletions(-) create mode 100644 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch delete mode 100644 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch delete mode 100644 systemd-v252.1+suse.21.g64dc546913.tar.xz create mode 100644 systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz diff --git a/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch b/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch new file mode 100644 index 00000000..209ed181 --- /dev/null +++ b/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch @@ -0,0 +1,474 @@ +From 9420aaad2680981323b0786c479b14891444f5cb Mon Sep 17 00:00:00 2001 +From: Franck Bui +Date: Tue, 22 Nov 2022 14:45:56 +0100 +Subject: [PATCH 6000/6000] Revert "tmpfiles: whenever creating an inode, + immediately O_PATH open it to pin it" + +This reverts commit 8f6fb95cd069884f4ce0a24eb20efc821ae3bc5e. +--- + src/tmpfiles/tmpfiles.c | 283 +++++++++++++++++----------------------- + 1 file changed, 118 insertions(+), 165 deletions(-) + +diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c +index 784b895577..2c44856c3a 100644 +--- a/src/tmpfiles/tmpfiles.c ++++ b/src/tmpfiles/tmpfiles.c +@@ -31,7 +31,6 @@ + #include "dirent-util.h" + #include "dissect-image.h" + #include "env-util.h" +-#include "errno-util.h" + #include "escape.h" + #include "fd-util.h" + #include "fileio.h" +@@ -1515,9 +1514,11 @@ static int create_file(Item *i, const char *path) { + st = &stbuf; + creation = CREATION_EXISTING; + } else { +- r = write_argument_data(i, fd, path); +- if (r < 0) +- return r; ++ if (item_binary_argument(i)) { ++ r = write_argument_data(i, fd, path); ++ if (r < 0) ++ return r; ++ } + + creation = CREATION_NORMAL; + } +@@ -1617,7 +1618,6 @@ static int truncate_file(Item *i, const char *path) { + static int copy_files(Item *i) { + _cleanup_close_ int dfd = -1, fd = -1; + _cleanup_free_ char *bn = NULL; +- struct stat st, a; + int r; + + log_debug("Copying tree \"%s\" to \"%s\".", i->argument, i->path); +@@ -1637,40 +1637,46 @@ static int copy_files(Item *i) { + i->uid_set ? i->uid : UID_INVALID, + i->gid_set ? i->gid : GID_INVALID, + COPY_REFLINK | COPY_MERGE_EMPTY | COPY_MAC_CREATE | COPY_HARDLINKS); ++ if (r < 0) { ++ struct stat a, b; + +- fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) { +- if (r < 0) /* Look at original error first */ +- return log_error_errno(r, "Failed to copy files to %s: %m", i->path); ++ /* If the target already exists on read-only filesystems, trying ++ * to create the target will not fail with EEXIST but with ++ * EROFS. */ ++ if (r == -EROFS && faccessat(dfd, bn, F_OK, AT_SYMLINK_NOFOLLOW) == 0) ++ r = -EEXIST; + +- return log_error_errno(errno, "Failed to openat(%s): %m", i->path); +- } ++ if (r != -EEXIST) ++ return log_error_errno(r, "Failed to copy files to %s: %m", i->path); + +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); ++ if (stat(i->argument, &a) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", i->argument); + +- if (stat(i->argument, &a) < 0) +- return log_error_errno(errno, "Failed to stat(%s): %m", i->argument); ++ if (fstatat(dfd, bn, &b, AT_SYMLINK_NOFOLLOW) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", i->path); + +- if (((st.st_mode ^ a.st_mode) & S_IFMT) != 0) { +- log_debug("Can't copy to %s, file exists already and is of different type", i->path); +- return 0; ++ if ((a.st_mode ^ b.st_mode) & S_IFMT) { ++ log_debug("Can't copy to %s, file exists already and is of different type", i->path); ++ return 0; ++ } + } + +- return fd_set_perms(i, fd, i->path, &st, _CREATION_MODE_INVALID); ++ fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Failed to openat(%s): %m", i->path); ++ ++ return fd_set_perms(i, fd, i->path, /* st = */ NULL, _CREATION_MODE_INVALID); + } + + static int create_directory_or_subvolume( + const char *path, + mode_t mode, + bool subvol, +- struct stat *ret_st, + CreationMode *ret_creation) { + + _cleanup_free_ char *bn = NULL; + _cleanup_close_ int pfd = -1; +- CreationMode creation; +- struct stat st; ++ CreationMode c; + int r, fd; + + assert(path); +@@ -1690,7 +1696,7 @@ static int create_directory_or_subvolume( + log_warning_errno(r, "Cannot parse value of $SYSTEMD_TMPFILES_FORCE_SUBVOL, ignoring."); + r = btrfs_is_subvol(empty_to_root(arg_root)) > 0; + } +- if (r == 0) ++ if (!r) + /* Don't create a subvolume unless the root directory is one, too. We do this under + * the assumption that if the root directory is just a plain directory (i.e. very + * light-weight), we shouldn't try to split it up into subvolumes (i.e. more +@@ -1706,36 +1712,37 @@ static int create_directory_or_subvolume( + } else + r = 0; + +- if (!subvol || ERRNO_IS_NOT_SUPPORTED(r)) ++ if (!subvol || r == -ENOTTY) + RUN_WITH_UMASK(0000) + r = mkdirat_label(pfd, bn, mode); + +- creation = r >= 0 ? CREATION_NORMAL : CREATION_EXISTING; +- +- fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_DIRECTORY|O_PATH); +- if (fd < 0) { +- /* We couldn't open it because it is not actually a directory? */ +- if (errno == ENOTDIR) +- return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "\"%s\" already exists and is not a directory.", path); ++ if (r < 0) { ++ int k; + +- /* Then look at the original error */ +- if (r < 0) ++ if (!IN_SET(r, -EEXIST, -EROFS)) + return log_error_errno(r, "Failed to create directory or subvolume \"%s\": %m", path); + +- return log_error_errno(errno, "Failed to open directory/subvolume we just created '%s': %m", path); +- } ++ k = is_dir_full(pfd, bn, /* follow= */ false); ++ if (k == -ENOENT && r == -EROFS) ++ return log_error_errno(r, "%s does not exist and cannot be created as the file system is read-only.", path); ++ if (k < 0) ++ return log_error_errno(k, "Failed to check if %s exists: %m", path); ++ if (!k) ++ return log_warning_errno(SYNTHETIC_ERRNO(EEXIST), ++ "\"%s\" already exists and is not a directory.", path); + +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat(%s): %m", path); ++ c = CREATION_EXISTING; ++ } else ++ c = CREATION_NORMAL; + +- assert(S_ISDIR(st.st_mode)); /* we used O_DIRECTORY above */ ++ log_debug("%s directory \"%s\".", creation_mode_verb_to_string(c), path); + +- log_debug("%s directory \"%s\".", creation_mode_verb_to_string(creation), path); ++ fd = openat(pfd, bn, O_NOCTTY|O_CLOEXEC|O_DIRECTORY); ++ if (fd < 0) ++ return log_error_errno(errno, "Failed to open directory '%s': %m", bn); + +- if (ret_st) +- *ret_st = st; + if (ret_creation) +- *ret_creation = creation; ++ *ret_creation = c; + + return fd; + } +@@ -1743,30 +1750,28 @@ static int create_directory_or_subvolume( + static int create_directory(Item *i, const char *path) { + _cleanup_close_ int fd = -1; + CreationMode creation; +- struct stat st; + + assert(i); + assert(IN_SET(i->type, CREATE_DIRECTORY, TRUNCATE_DIRECTORY)); + +- fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, &st, &creation); ++ fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, &creation); + if (fd == -EEXIST) + return 0; + if (fd < 0) + return fd; + +- return fd_set_perms(i, fd, path, &st, creation); ++ return fd_set_perms(i, fd, path, /* st= */ NULL, creation); + } + + static int create_subvolume(Item *i, const char *path) { + _cleanup_close_ int fd = -1; + CreationMode creation; +- struct stat st; + int r, q = 0; + + assert(i); + assert(IN_SET(i->type, CREATE_SUBVOLUME, CREATE_SUBVOLUME_NEW_QUOTA, CREATE_SUBVOLUME_INHERIT_QUOTA)); + +- fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, &st, &creation); ++ fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, &creation); + if (fd == -EEXIST) + return 0; + if (fd < 0) +@@ -1789,7 +1794,7 @@ static int create_subvolume(Item *i, const char *path) { + log_debug("Quota for subvolume \"%s\" already in place, no change made.", i->path); + } + +- r = fd_set_perms(i, fd, path, &st, creation); ++ r = fd_set_perms(i, fd, path, /* st= */ NULL, creation); + if (q < 0) /* prefer the quota change error from above */ + return q; + +@@ -1830,11 +1835,9 @@ static int create_device(Item *i, mode_t file_type) { + _cleanup_close_ int dfd = -1, fd = -1; + _cleanup_free_ char *bn = NULL; + CreationMode creation; +- struct stat st; + int r; + + assert(i); +- assert(IN_SET(i->type, CREATE_BLOCK_DEVICE, CREATE_CHAR_DEVICE)); + assert(IN_SET(file_type, S_IFBLK, S_IFCHR)); + + r = path_extract_filename(i->path, &bn); +@@ -1854,166 +1857,116 @@ static int create_device(Item *i, mode_t file_type) { + r = RET_NERRNO(mknodat(dfd, bn, i->mode | file_type, i->major_minor)); + mac_selinux_create_file_clear(); + } +- creation = r >= 0 ? CREATION_NORMAL : CREATION_EXISTING; +- +- /* Try to open the inode via O_PATH, regardless if we could create it or not. Maybe everything is in +- * order anyway and we hence can ignore the error to create the device node */ +- fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) { +- /* OK, so opening the inode failed, let's look at the original error then. */ + +- if (r < 0) { +- if (ERRNO_IS_PRIVILEGE(r)) +- goto handle_privilege; ++ if (r < 0) { ++ struct stat st; + +- return log_error_errno(r, "Failed to create device node '%s': %m", i->path); ++ if (r == -EPERM) { ++ log_debug_errno(r, ++ "We lack permissions, possibly because of cgroup configuration; " ++ "skipping creation of device node %s.", i->path); ++ return 0; + } + +- return log_error_errno(errno, "Failed to open device node '%s' we just created: %m", i->path); +- } ++ if (r != -EEXIST) ++ return log_error_errno(r, "Failed to create device node %s: %m", i->path); + +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); ++ if (fstatat(dfd, bn, &st, 0) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", i->path); + +- if (((st.st_mode ^ file_type) & S_IFMT) != 0) { ++ if ((st.st_mode & S_IFMT) != file_type) { + +- if (i->append_or_force) { +- fd = safe_close(fd); ++ if (i->append_or_force) { + +- RUN_WITH_UMASK(0000) { +- mac_selinux_create_file_prepare(i->path, file_type); +- r = mknodat_atomic(dfd, bn, i->mode | file_type, i->major_minor); +- mac_selinux_create_file_clear(); +- } +- if (ERRNO_IS_PRIVILEGE(r)) +- goto handle_privilege; +- if (IN_SET(r, -EISDIR, -EEXIST, -ENOTEMPTY)) { +- r = rm_rf_child(dfd, bn, REMOVE_PHYSICAL); +- if (r < 0) +- return log_error_errno(r, "rm -rf %s failed: %m", i->path); ++ RUN_WITH_UMASK(0000) { ++ mac_selinux_create_file_prepare(i->path, file_type); ++ /* FIXME: need to introduce mknodat_atomic() */ ++ r = mknod_atomic(i->path, i->mode | file_type, i->major_minor); ++ mac_selinux_create_file_clear(); ++ } + +- mac_selinux_create_file_prepare(i->path, file_type); +- r = RET_NERRNO(mknodat(dfd, bn, i->mode | file_type, i->major_minor)); +- mac_selinux_create_file_clear(); ++ if (r < 0) ++ return log_error_errno(r, "Failed to create device node \"%s\": %m", i->path); ++ creation = CREATION_FORCE; ++ } else { ++ log_warning("\"%s\" already exists is not a device node.", i->path); ++ return 0; + } +- if (r < 0) +- return log_error_errno(r, "Failed to create device node '%s': %m", i->path); +- +- fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) +- return log_error_errno(errno, "Failed to open device node we just created '%s': %m", i->path); +- +- /* Validate type before change ownership below */ +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); +- +- if (((st.st_mode ^ file_type) & S_IFMT) != 0) +- return log_error_errno(SYNTHETIC_ERRNO(EBADF), "Device node we just created is not a device node, refusing."); +- +- creation = CREATION_FORCE; +- } else { +- log_warning("\"%s\" already exists and is not a device node.", i->path); +- return 0; +- } +- } ++ } else ++ creation = CREATION_EXISTING; ++ } else ++ creation = CREATION_NORMAL; + + log_debug("%s %s device node \"%s\" %u:%u.", + creation_mode_verb_to_string(creation), + i->type == CREATE_BLOCK_DEVICE ? "block" : "char", + i->path, major(i->mode), minor(i->mode)); + +- return fd_set_perms(i, fd, i->path, &st, creation); ++ fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Failed to openat(%s): %m", i->path); + +-handle_privilege: +- log_debug_errno(r, +- "We lack permissions, possibly because of cgroup configuration; " +- "skipping creation of device node '%s'.", i->path); +- return 0; ++ return fd_set_perms(i, fd, i->path, /* st = */ NULL, creation); + } + +-static int create_fifo(Item *i) { ++static int create_fifo(Item *i, const char *path) { + _cleanup_close_ int pfd = -1, fd = -1; + _cleanup_free_ char *bn = NULL; + CreationMode creation; + struct stat st; + int r; + +- assert(i); +- assert(i->type == CREATE_FIFO); +- + r = path_extract_filename(i->path, &bn); + if (r < 0) +- return log_error_errno(r, "Failed to extract filename from path '%s': %m", i->path); ++ return log_error_errno(r, "Failed to extract filename from path '%s': %m", path); + if (r == O_DIRECTORY) +- return log_error_errno(SYNTHETIC_ERRNO(EISDIR), "Cannot open path '%s' for creating FIFO, is a directory.", i->path); ++ return log_error_errno(SYNTHETIC_ERRNO(EISDIR), "Cannot open path '%s' for creating FIFO, is a directory.", path); + +- pfd = path_open_parent_safe(i->path); ++ pfd = path_open_parent_safe(path); + if (pfd < 0) + return pfd; + + RUN_WITH_UMASK(0000) { +- mac_selinux_create_file_prepare(i->path, S_IFIFO); ++ mac_selinux_create_file_prepare(path, S_IFIFO); + r = RET_NERRNO(mkfifoat(pfd, bn, i->mode)); + mac_selinux_create_file_clear(); + } + +- creation = r >= 0 ? CREATION_NORMAL : CREATION_EXISTING; +- +- /* Open the inode via O_PATH, regardless if we managed to create it or not. Maybe it is is already the FIFO we want */ +- fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) { +- if (r < 0) +- return log_error_errno(r, "Failed to create FIFO %s: %m", i->path); /* original error! */ +- +- return log_error_errno(errno, "Failed to open FIFO we just created %s: %m", i->path); +- } ++ if (r < 0) { ++ if (r != -EEXIST) ++ return log_error_errno(r, "Failed to create fifo %s: %m", path); + +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); ++ if (fstatat(pfd, bn, &st, AT_SYMLINK_NOFOLLOW) < 0) ++ return log_error_errno(errno, "stat(%s) failed: %m", path); + +- if (!S_ISFIFO(st.st_mode)) { ++ if (!S_ISFIFO(st.st_mode)) { + +- if (i->append_or_force) { +- fd = safe_close(fd); ++ if (i->append_or_force) { ++ RUN_WITH_UMASK(0000) { ++ mac_selinux_create_file_prepare(path, S_IFIFO); ++ r = mkfifoat_atomic(pfd, bn, i->mode); ++ mac_selinux_create_file_clear(); ++ } + +- RUN_WITH_UMASK(0000) { +- mac_selinux_create_file_prepare(i->path, S_IFIFO); +- r = mkfifoat_atomic(pfd, bn, i->mode); +- mac_selinux_create_file_clear(); +- } +- if (IN_SET(r, -EISDIR, -EEXIST, -ENOTEMPTY)) { +- r = rm_rf_child(pfd, bn, REMOVE_PHYSICAL); + if (r < 0) +- return log_error_errno(r, "rm -rf %s failed: %m", i->path); +- +- mac_selinux_create_file_prepare(i->path, S_IFIFO); +- r = RET_NERRNO(mkfifoat(pfd, bn, i->mode)); +- mac_selinux_create_file_clear(); ++ return log_error_errno(r, "Failed to create fifo %s: %m", path); ++ creation = CREATION_FORCE; ++ } else { ++ log_warning("\"%s\" already exists and is not a fifo.", path); ++ return 0; + } +- if (r < 0) +- return log_error_errno(r, "Failed to create FIFO %s: %m", i->path); +- +- fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); +- if (fd < 0) +- return log_error_errno(errno, "Failed to open FIFO we just created '%s': %m", i->path); +- +- /* Validate type before change ownership below */ +- if (fstat(fd, &st) < 0) +- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); ++ } else ++ creation = CREATION_EXISTING; ++ } else ++ creation = CREATION_NORMAL; + +- if (!S_ISFIFO(st.st_mode)) +- return log_error_errno(SYNTHETIC_ERRNO(EBADF), "FIFO inode we just created is not a FIFO, refusing."); ++ log_debug("%s fifo \"%s\".", creation_mode_verb_to_string(creation), path); + +- creation = CREATION_FORCE; +- } else { +- log_warning("\"%s\" already exists and is not a FIFO.", i->path); +- return 0; +- } +- } +- +- log_debug("%s fifo \"%s\".", creation_mode_verb_to_string(creation), i->path); ++ fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); ++ if (fd < 0) ++ return log_error_errno(errno, "Failed to openat(%s): %m", path); + +- return fd_set_perms(i, fd, i->path, &st, creation); ++ return fd_set_perms(i, fd, i->path, /* st = */ NULL, creation); + } + + static int create_symlink(Item *i) { +@@ -2482,7 +2435,7 @@ static int create_item(Item *i) { + if (r < 0) + return r; + +- r = create_fifo(i); ++ r = create_fifo(i, i->path); + if (r < 0) + return r; + break; +-- +2.35.3 + diff --git a/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch b/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch deleted file mode 100644 index 3217bafa..00000000 --- a/6000-meson-install-test-kernel-install-only-when-Dkernel-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c34a72017fe66998f7bd40b5e90d27accd69376c Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Tue, 15 Nov 2022 09:04:42 +0100 -Subject: [PATCH 6000/6000] meson: install test-kernel-install only when - -Dkernel-install=true - -This patch fixes the following build failure: - - meson.build:3853:8: ERROR: Unknown variable "test_kernel_install_sh". ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 00daeac1b6..0fd0129820 100644 ---- a/meson.build -+++ b/meson.build -@@ -3968,7 +3968,7 @@ exe = custom_target( - install_dir : bindir) - public_programs += exe - --if want_tests != 'false' -+if want_tests != 'false' and want_kernel_install - test('test-kernel-install', - test_kernel_install_sh, - args : [exe.full_path(), loaderentry_install]) --- -2.35.3 - diff --git a/systemd-v252.1+suse.21.g64dc546913.tar.xz b/systemd-v252.1+suse.21.g64dc546913.tar.xz deleted file mode 100644 index 53405b75..00000000 --- a/systemd-v252.1+suse.21.g64dc546913.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:61e92987f1ac3c83d3b3be029497159b683c84869e259d904d0422c4691432e9 -size 8034368 diff --git a/systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz b/systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz new file mode 100644 index 00000000..b2fb19b4 --- /dev/null +++ b/systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f361fb4824b21acec02b87b4c209b1a5ad864dff7753baf575ee358d12022d43 +size 8035180 diff --git a/systemd.changes b/systemd.changes index f6fbb553..4f36b706 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Tue Nov 22 13:52:07 UTC 2022 - Franck Bui + +- Import commit 3bd3e4e6c1efe0d6df776107efde47e15e58fe96 + + d28e81d65c test: fix the default timeout values described in README.testsuite + d921c83f53 meson: install test-kernel-install only when -Dkernel-install=true + c3b6c4b584 tests: update install_suse_systemd() + 3c77335b19 tests: install dmi-sysfs module on openSUSE + df632130cd tests: install systemd-resolved on openSUSE + +- Add 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch until + upstream issue #25468 is fixed. + +- Drop 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch, the + patch has been merged in the SUSE git repo. + ------------------------------------------------------------------- Fri Nov 18 08:07:33 UTC 2022 - Franck Bui @@ -11,6 +28,10 @@ Mon Nov 14 11:15:06 UTC 2022 - Franck Bui See https://github.com/openSUSE/systemd/blob/SUSE/v252/NEWS for details. + This includes the following bug fixes: + + - upstream commit 67c3e1f63a5221b47a8fea85ae421671f29f3b7e (bsc#1200723) + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch diff --git a/systemd.spec b/systemd.spec index e44bd068..909d0ecd 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.g64dc546913 +%define archive_version +suse.27.g3bd3e4e6c1 %define _testsuitedir /usr/lib/systemd/tests %define xinitconfdir %{?_distconfdir}%{!?_distconfdir:%{_sysconfdir}}/X11/xinit @@ -216,7 +216,7 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch # very few cases, some stuff might be broken in upstream and need to be fixed # quickly. But even in these cases, the patches are temporary and should be # removed as soon as a fix is merged by upstream. -Patch6000: 6000-meson-install-test-kernel-install-only-when-Dkernel-.patch +Patch6000: 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 52490fab54df7612f5c25157970d4be3342a0bacf1e89019882b40f80508e97f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 29 Nov 2022 09:52:27 +0000 Subject: [PATCH 114/124] Accepting request 1038709 from Base:System - Import commit e7e931b07edd786dc6ca1dae6c23ff7b785f8efd (merge of v252.2) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/64dc546913525e33e734500055a62ed0e963c227...e7e931b07edd786dc6ca1dae6c23ff7b785f8efd - Rebase 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch OBS-URL: https://build.opensuse.org/request/show/1038709 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=372 --- ...whenever-creating-an-inode-immediate.patch | 45 ++++++++++--------- systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz | 3 -- systemd-v252.2+suse.29.ge7e931b07e.tar.xz | 3 ++ systemd.changes | 10 +++++ systemd.spec | 4 +- 5 files changed, 40 insertions(+), 25 deletions(-) delete mode 100644 systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz create mode 100644 systemd-v252.2+suse.29.ge7e931b07e.tar.xz diff --git a/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch b/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch index 209ed181..cdc9200e 100644 --- a/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch +++ b/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch @@ -1,4 +1,4 @@ -From 9420aaad2680981323b0786c479b14891444f5cb Mon Sep 17 00:00:00 2001 +From 3aabdad41fecf8004a1e0e4ca4bfc7b2f935404c Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Tue, 22 Nov 2022 14:45:56 +0100 Subject: [PATCH 6000/6000] Revert "tmpfiles: whenever creating an inode, @@ -10,7 +10,7 @@ This reverts commit 8f6fb95cd069884f4ce0a24eb20efc821ae3bc5e. 1 file changed, 118 insertions(+), 165 deletions(-) diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 784b895577..2c44856c3a 100644 +index 18bb75715b..9c2740f6ce 100644 --- a/src/tmpfiles/tmpfiles.c +++ b/src/tmpfiles/tmpfiles.c @@ -31,7 +31,6 @@ @@ -21,7 +21,7 @@ index 784b895577..2c44856c3a 100644 #include "escape.h" #include "fd-util.h" #include "fileio.h" -@@ -1515,9 +1514,11 @@ static int create_file(Item *i, const char *path) { +@@ -1527,9 +1526,11 @@ static int create_file(Item *i, const char *path) { st = &stbuf; creation = CREATION_EXISTING; } else { @@ -36,7 +36,7 @@ index 784b895577..2c44856c3a 100644 creation = CREATION_NORMAL; } -@@ -1617,7 +1618,6 @@ static int truncate_file(Item *i, const char *path) { +@@ -1629,7 +1630,6 @@ static int truncate_file(Item *i, const char *path) { static int copy_files(Item *i) { _cleanup_close_ int dfd = -1, fd = -1; _cleanup_free_ char *bn = NULL; @@ -44,7 +44,7 @@ index 784b895577..2c44856c3a 100644 int r; log_debug("Copying tree \"%s\" to \"%s\".", i->argument, i->path); -@@ -1637,40 +1637,46 @@ static int copy_files(Item *i) { +@@ -1649,27 +1649,35 @@ static int copy_files(Item *i) { i->uid_set ? i->uid : UID_INVALID, i->gid_set ? i->gid : GID_INVALID, COPY_REFLINK | COPY_MERGE_EMPTY | COPY_MAC_CREATE | COPY_HARDLINKS); @@ -94,9 +94,10 @@ index 784b895577..2c44856c3a 100644 } static int create_directory_or_subvolume( - const char *path, +@@ -1677,13 +1685,11 @@ static int create_directory_or_subvolume( mode_t mode, bool subvol, + bool allow_failure, - struct stat *ret_st, CreationMode *ret_creation) { @@ -108,7 +109,7 @@ index 784b895577..2c44856c3a 100644 int r, fd; assert(path); -@@ -1690,7 +1696,7 @@ static int create_directory_or_subvolume( +@@ -1703,7 +1709,7 @@ static int create_directory_or_subvolume( log_warning_errno(r, "Cannot parse value of $SYSTEMD_TMPFILES_FORCE_SUBVOL, ignoring."); r = btrfs_is_subvol(empty_to_root(arg_root)) > 0; } @@ -117,7 +118,7 @@ index 784b895577..2c44856c3a 100644 /* Don't create a subvolume unless the root directory is one, too. We do this under * the assumption that if the root directory is just a plain directory (i.e. very * light-weight), we shouldn't try to split it up into subvolumes (i.e. more -@@ -1706,36 +1712,37 @@ static int create_directory_or_subvolume( +@@ -1719,40 +1725,41 @@ static int create_directory_or_subvolume( } else r = 0; @@ -139,7 +140,11 @@ index 784b895577..2c44856c3a 100644 - /* Then look at the original error */ - if (r < 0) + if (!IN_SET(r, -EEXIST, -EROFS)) - return log_error_errno(r, "Failed to create directory or subvolume \"%s\": %m", path); + return log_full_errno(allow_failure ? LOG_INFO : LOG_ERR, + r, + "Failed to create directory or subvolume \"%s\"%s: %m", + path, + allow_failure ? ", ignoring" : ""); - return log_error_errno(errno, "Failed to open directory/subvolume we just created '%s': %m", path); - } @@ -174,7 +179,7 @@ index 784b895577..2c44856c3a 100644 return fd; } -@@ -1743,30 +1750,28 @@ static int create_directory_or_subvolume( +@@ -1760,30 +1767,28 @@ static int create_directory_or_subvolume( static int create_directory(Item *i, const char *path) { _cleanup_close_ int fd = -1; CreationMode creation; @@ -183,8 +188,8 @@ index 784b895577..2c44856c3a 100644 assert(i); assert(IN_SET(i->type, CREATE_DIRECTORY, TRUNCATE_DIRECTORY)); -- fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, &st, &creation); -+ fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, &creation); +- fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, i->allow_failure, &st, &creation); ++ fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, i->allow_failure, &creation); if (fd == -EEXIST) return 0; if (fd < 0) @@ -203,12 +208,12 @@ index 784b895577..2c44856c3a 100644 assert(i); assert(IN_SET(i->type, CREATE_SUBVOLUME, CREATE_SUBVOLUME_NEW_QUOTA, CREATE_SUBVOLUME_INHERIT_QUOTA)); -- fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, &st, &creation); -+ fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, &creation); +- fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, i->allow_failure, &st, &creation); ++ fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, i->allow_failure, &creation); if (fd == -EEXIST) return 0; if (fd < 0) -@@ -1789,7 +1794,7 @@ static int create_subvolume(Item *i, const char *path) { +@@ -1806,7 +1811,7 @@ static int create_subvolume(Item *i, const char *path) { log_debug("Quota for subvolume \"%s\" already in place, no change made.", i->path); } @@ -217,7 +222,7 @@ index 784b895577..2c44856c3a 100644 if (q < 0) /* prefer the quota change error from above */ return q; -@@ -1830,11 +1835,9 @@ static int create_device(Item *i, mode_t file_type) { +@@ -1847,11 +1852,9 @@ static int create_device(Item *i, mode_t file_type) { _cleanup_close_ int dfd = -1, fd = -1; _cleanup_free_ char *bn = NULL; CreationMode creation; @@ -229,7 +234,7 @@ index 784b895577..2c44856c3a 100644 assert(IN_SET(file_type, S_IFBLK, S_IFCHR)); r = path_extract_filename(i->path, &bn); -@@ -1854,166 +1857,116 @@ static int create_device(Item *i, mode_t file_type) { +@@ -1871,166 +1874,116 @@ static int create_device(Item *i, mode_t file_type) { r = RET_NERRNO(mknodat(dfd, bn, i->mode | file_type, i->major_minor)); mac_selinux_create_file_clear(); } @@ -362,8 +367,8 @@ index 784b895577..2c44856c3a 100644 - return log_error_errno(SYNTHETIC_ERRNO(EISDIR), "Cannot open path '%s' for creating FIFO, is a directory.", i->path); + return log_error_errno(SYNTHETIC_ERRNO(EISDIR), "Cannot open path '%s' for creating FIFO, is a directory.", path); -- pfd = path_open_parent_safe(i->path); -+ pfd = path_open_parent_safe(path); +- pfd = path_open_parent_safe(i->path, i->allow_failure); ++ pfd = path_open_parent_safe(path, i->allow_failure); if (pfd < 0) return pfd; @@ -460,7 +465,7 @@ index 784b895577..2c44856c3a 100644 } static int create_symlink(Item *i) { -@@ -2482,7 +2435,7 @@ static int create_item(Item *i) { +@@ -2499,7 +2452,7 @@ static int create_item(Item *i) { if (r < 0) return r; diff --git a/systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz b/systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz deleted file mode 100644 index b2fb19b4..00000000 --- a/systemd-v252.1+suse.27.g3bd3e4e6c1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f361fb4824b21acec02b87b4c209b1a5ad864dff7753baf575ee358d12022d43 -size 8035180 diff --git a/systemd-v252.2+suse.29.ge7e931b07e.tar.xz b/systemd-v252.2+suse.29.ge7e931b07e.tar.xz new file mode 100644 index 00000000..e67235d2 --- /dev/null +++ b/systemd-v252.2+suse.29.ge7e931b07e.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:981382ec6df9b609d8ecd5cb7e570064567840e1f618c205df9d0fc67d803dca +size 8035936 diff --git a/systemd.changes b/systemd.changes index 4f36b706..02b7de36 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Nov 25 16:37:18 UTC 2022 - Franck Bui + +- Import commit e7e931b07edd786dc6ca1dae6c23ff7b785f8efd (merge of v252.2) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/64dc546913525e33e734500055a62ed0e963c227...e7e931b07edd786dc6ca1dae6c23ff7b785f8efd + +- Rebase 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch + ------------------------------------------------------------------- Tue Nov 22 13:52:07 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 909d0ecd..a6fc152c 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.g3bd3e4e6c1 +%define archive_version +suse.29.ge7e931b07e %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: 252.1 +Version: 252.2 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later From 6b65722cc18ba797a85482108ec08e99bb7a8f1a839e6f7e0d738706cdce5cdf Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 6 Dec 2022 13:22:42 +0000 Subject: [PATCH 115/124] Accepting request 1040361 from Base:System - Don't ship symlink /usr/lib/environment.d/99-environment.conf anymore. /etc/environment is owned and parsed (among other config files) by pam_env(8), which is included by 'systemd-user' PAM service anyway. OBS-URL: https://build.opensuse.org/request/show/1040361 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=373 --- files.systemd | 1 - systemd.changes | 7 +++++++ systemd.spec | 5 +++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/files.systemd b/files.systemd index e4b0d920..36178f84 100644 --- a/files.systemd +++ b/files.systemd @@ -209,7 +209,6 @@ %{_datadir}/zsh/site-functions/_systemd-tmpfiles %{_datadir}/zsh/site-functions/_timedatectl %endif -%{_environmentdir}/99-environment.conf %{_journalcatalogdir}/systemd.be.catalog %{_journalcatalogdir}/systemd.be@latin.catalog %{_journalcatalogdir}/systemd.bg.catalog diff --git a/systemd.changes b/systemd.changes index 02b7de36..c29812f8 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Dec 2 14:06:08 UTC 2022 - Franck Bui + +- Don't ship symlink /usr/lib/environment.d/99-environment.conf + anymore. /etc/environment is owned and parsed (among other config files) by + pam_env(8), which is included by 'systemd-user' PAM service anyway. + ------------------------------------------------------------------- Fri Nov 25 16:37:18 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a6fc152c..ca60b72b 100644 --- a/systemd.spec +++ b/systemd.spec @@ -823,6 +823,11 @@ ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf # SUSE (bsc#1006978). rm -f %{buildroot}%{_sysusersdir}/basic.conf +# systemd-user PAM module relies on pam_env(8) to import the environment defined +# in /etc/environment (which is part of the environment configuration files of +# pam_env(8) anyways). +rm -f %{buildroot}%{_environmentdir}/99-environment.conf + # Remove README file in init.d as (SUSE) rpm requires executable files in this # directory... oh well. rm -f %{buildroot}/etc/init.d/README From 8f8565794534c8e0a5c471e5e250abbb12c9f122a066555f95dbd9f0ce9b3dba Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 10 Dec 2022 20:17:36 +0000 Subject: [PATCH 116/124] Accepting request 1041834 from Base:System - Import commit bf3fef99886bd977a1c7a51d20087bc8977fff44 6372fb0cc4 btrfs-util: convert O_PATH if necessary, in btrfs quota call (bsc#1205560) 12e68eb0e5 blockdev-util: move O_PATH fd conversion into btrfs_get_block_device_fd() to shorten things bb2bafdc9d btrfs-util: convert to fd_reopen_condition() 1323232948 fd-util: add new helper fd_reopen_conditional() - Drop 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch It's no more needed as a fix for bsc#1205560 has been queued, see above. - Import commit 82898a14f5b0a965ba9c1efc1913fcdf29d446a8 (merge of v252.3) It includes the following fixes: 9410eb20eb cryptsetup: retry TPM2 unseal operation if it fails with TPM2_RC_PCR_CHANGED (bsc#1204944) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/e7e931b07edd786dc6ca1dae6c23ff7b785f8efd...82898a14f5b0a965ba9c1efc1913fcdf29d446a8 Additionally, it also includes the following backports: - 17b2f9f196 utmp-wtmp: fix error in case isatty() fails - 8d5c487c87 sd-bus: handle -EINTR return from bus_poll() (bsc#1201982) - 2dd217c8b5 tree-wide: modernizations with RET_NERRNO() OBS-URL: https://build.opensuse.org/request/show/1041834 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=374 --- ...whenever-creating-an-inode-immediate.patch | 479 ------------------ systemd-v252.2+suse.29.ge7e931b07e.tar.xz | 3 - systemd-v252.3+suse.40.gbf3fef9988.tar.xz | 3 + systemd.changes | 32 ++ systemd.spec | 5 +- 5 files changed, 37 insertions(+), 485 deletions(-) delete mode 100644 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch delete mode 100644 systemd-v252.2+suse.29.ge7e931b07e.tar.xz create mode 100644 systemd-v252.3+suse.40.gbf3fef9988.tar.xz diff --git a/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch b/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch deleted file mode 100644 index cdc9200e..00000000 --- a/6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch +++ /dev/null @@ -1,479 +0,0 @@ -From 3aabdad41fecf8004a1e0e4ca4bfc7b2f935404c Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Tue, 22 Nov 2022 14:45:56 +0100 -Subject: [PATCH 6000/6000] Revert "tmpfiles: whenever creating an inode, - immediately O_PATH open it to pin it" - -This reverts commit 8f6fb95cd069884f4ce0a24eb20efc821ae3bc5e. ---- - src/tmpfiles/tmpfiles.c | 283 +++++++++++++++++----------------------- - 1 file changed, 118 insertions(+), 165 deletions(-) - -diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c -index 18bb75715b..9c2740f6ce 100644 ---- a/src/tmpfiles/tmpfiles.c -+++ b/src/tmpfiles/tmpfiles.c -@@ -31,7 +31,6 @@ - #include "dirent-util.h" - #include "dissect-image.h" - #include "env-util.h" --#include "errno-util.h" - #include "escape.h" - #include "fd-util.h" - #include "fileio.h" -@@ -1527,9 +1526,11 @@ static int create_file(Item *i, const char *path) { - st = &stbuf; - creation = CREATION_EXISTING; - } else { -- r = write_argument_data(i, fd, path); -- if (r < 0) -- return r; -+ if (item_binary_argument(i)) { -+ r = write_argument_data(i, fd, path); -+ if (r < 0) -+ return r; -+ } - - creation = CREATION_NORMAL; - } -@@ -1629,7 +1630,6 @@ static int truncate_file(Item *i, const char *path) { - static int copy_files(Item *i) { - _cleanup_close_ int dfd = -1, fd = -1; - _cleanup_free_ char *bn = NULL; -- struct stat st, a; - int r; - - log_debug("Copying tree \"%s\" to \"%s\".", i->argument, i->path); -@@ -1649,27 +1649,35 @@ static int copy_files(Item *i) { - i->uid_set ? i->uid : UID_INVALID, - i->gid_set ? i->gid : GID_INVALID, - COPY_REFLINK | COPY_MERGE_EMPTY | COPY_MAC_CREATE | COPY_HARDLINKS); -+ if (r < 0) { -+ struct stat a, b; - -- fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -- if (fd < 0) { -- if (r < 0) /* Look at original error first */ -- return log_error_errno(r, "Failed to copy files to %s: %m", i->path); -+ /* If the target already exists on read-only filesystems, trying -+ * to create the target will not fail with EEXIST but with -+ * EROFS. */ -+ if (r == -EROFS && faccessat(dfd, bn, F_OK, AT_SYMLINK_NOFOLLOW) == 0) -+ r = -EEXIST; - -- return log_error_errno(errno, "Failed to openat(%s): %m", i->path); -- } -+ if (r != -EEXIST) -+ return log_error_errno(r, "Failed to copy files to %s: %m", i->path); - -- if (fstat(fd, &st) < 0) -- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); -+ if (stat(i->argument, &a) < 0) -+ return log_error_errno(errno, "stat(%s) failed: %m", i->argument); - -- if (stat(i->argument, &a) < 0) -- return log_error_errno(errno, "Failed to stat(%s): %m", i->argument); -+ if (fstatat(dfd, bn, &b, AT_SYMLINK_NOFOLLOW) < 0) -+ return log_error_errno(errno, "stat(%s) failed: %m", i->path); - -- if (((st.st_mode ^ a.st_mode) & S_IFMT) != 0) { -- log_debug("Can't copy to %s, file exists already and is of different type", i->path); -- return 0; -+ if ((a.st_mode ^ b.st_mode) & S_IFMT) { -+ log_debug("Can't copy to %s, file exists already and is of different type", i->path); -+ return 0; -+ } - } - -- return fd_set_perms(i, fd, i->path, &st, _CREATION_MODE_INVALID); -+ fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -+ if (fd < 0) -+ return log_error_errno(errno, "Failed to openat(%s): %m", i->path); -+ -+ return fd_set_perms(i, fd, i->path, /* st = */ NULL, _CREATION_MODE_INVALID); - } - - static int create_directory_or_subvolume( -@@ -1677,13 +1685,11 @@ static int create_directory_or_subvolume( - mode_t mode, - bool subvol, - bool allow_failure, -- struct stat *ret_st, - CreationMode *ret_creation) { - - _cleanup_free_ char *bn = NULL; - _cleanup_close_ int pfd = -1; -- CreationMode creation; -- struct stat st; -+ CreationMode c; - int r, fd; - - assert(path); -@@ -1703,7 +1709,7 @@ static int create_directory_or_subvolume( - log_warning_errno(r, "Cannot parse value of $SYSTEMD_TMPFILES_FORCE_SUBVOL, ignoring."); - r = btrfs_is_subvol(empty_to_root(arg_root)) > 0; - } -- if (r == 0) -+ if (!r) - /* Don't create a subvolume unless the root directory is one, too. We do this under - * the assumption that if the root directory is just a plain directory (i.e. very - * light-weight), we shouldn't try to split it up into subvolumes (i.e. more -@@ -1719,40 +1725,41 @@ static int create_directory_or_subvolume( - } else - r = 0; - -- if (!subvol || ERRNO_IS_NOT_SUPPORTED(r)) -+ if (!subvol || r == -ENOTTY) - RUN_WITH_UMASK(0000) - r = mkdirat_label(pfd, bn, mode); - -- creation = r >= 0 ? CREATION_NORMAL : CREATION_EXISTING; -- -- fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_DIRECTORY|O_PATH); -- if (fd < 0) { -- /* We couldn't open it because it is not actually a directory? */ -- if (errno == ENOTDIR) -- return log_error_errno(SYNTHETIC_ERRNO(EEXIST), "\"%s\" already exists and is not a directory.", path); -+ if (r < 0) { -+ int k; - -- /* Then look at the original error */ -- if (r < 0) -+ if (!IN_SET(r, -EEXIST, -EROFS)) - return log_full_errno(allow_failure ? LOG_INFO : LOG_ERR, - r, - "Failed to create directory or subvolume \"%s\"%s: %m", - path, - allow_failure ? ", ignoring" : ""); - -- return log_error_errno(errno, "Failed to open directory/subvolume we just created '%s': %m", path); -- } -+ k = is_dir_full(pfd, bn, /* follow= */ false); -+ if (k == -ENOENT && r == -EROFS) -+ return log_error_errno(r, "%s does not exist and cannot be created as the file system is read-only.", path); -+ if (k < 0) -+ return log_error_errno(k, "Failed to check if %s exists: %m", path); -+ if (!k) -+ return log_warning_errno(SYNTHETIC_ERRNO(EEXIST), -+ "\"%s\" already exists and is not a directory.", path); - -- if (fstat(fd, &st) < 0) -- return log_error_errno(errno, "Failed to fstat(%s): %m", path); -+ c = CREATION_EXISTING; -+ } else -+ c = CREATION_NORMAL; - -- assert(S_ISDIR(st.st_mode)); /* we used O_DIRECTORY above */ -+ log_debug("%s directory \"%s\".", creation_mode_verb_to_string(c), path); - -- log_debug("%s directory \"%s\".", creation_mode_verb_to_string(creation), path); -+ fd = openat(pfd, bn, O_NOCTTY|O_CLOEXEC|O_DIRECTORY); -+ if (fd < 0) -+ return log_error_errno(errno, "Failed to open directory '%s': %m", bn); - -- if (ret_st) -- *ret_st = st; - if (ret_creation) -- *ret_creation = creation; -+ *ret_creation = c; - - return fd; - } -@@ -1760,30 +1767,28 @@ static int create_directory_or_subvolume( - static int create_directory(Item *i, const char *path) { - _cleanup_close_ int fd = -1; - CreationMode creation; -- struct stat st; - - assert(i); - assert(IN_SET(i->type, CREATE_DIRECTORY, TRUNCATE_DIRECTORY)); - -- fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, i->allow_failure, &st, &creation); -+ fd = create_directory_or_subvolume(path, i->mode, /* subvol= */ false, i->allow_failure, &creation); - if (fd == -EEXIST) - return 0; - if (fd < 0) - return fd; - -- return fd_set_perms(i, fd, path, &st, creation); -+ return fd_set_perms(i, fd, path, /* st= */ NULL, creation); - } - - static int create_subvolume(Item *i, const char *path) { - _cleanup_close_ int fd = -1; - CreationMode creation; -- struct stat st; - int r, q = 0; - - assert(i); - assert(IN_SET(i->type, CREATE_SUBVOLUME, CREATE_SUBVOLUME_NEW_QUOTA, CREATE_SUBVOLUME_INHERIT_QUOTA)); - -- fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, i->allow_failure, &st, &creation); -+ fd = create_directory_or_subvolume(path, i->mode, /* subvol = */ true, i->allow_failure, &creation); - if (fd == -EEXIST) - return 0; - if (fd < 0) -@@ -1806,7 +1811,7 @@ static int create_subvolume(Item *i, const char *path) { - log_debug("Quota for subvolume \"%s\" already in place, no change made.", i->path); - } - -- r = fd_set_perms(i, fd, path, &st, creation); -+ r = fd_set_perms(i, fd, path, /* st= */ NULL, creation); - if (q < 0) /* prefer the quota change error from above */ - return q; - -@@ -1847,11 +1852,9 @@ static int create_device(Item *i, mode_t file_type) { - _cleanup_close_ int dfd = -1, fd = -1; - _cleanup_free_ char *bn = NULL; - CreationMode creation; -- struct stat st; - int r; - - assert(i); -- assert(IN_SET(i->type, CREATE_BLOCK_DEVICE, CREATE_CHAR_DEVICE)); - assert(IN_SET(file_type, S_IFBLK, S_IFCHR)); - - r = path_extract_filename(i->path, &bn); -@@ -1871,166 +1874,116 @@ static int create_device(Item *i, mode_t file_type) { - r = RET_NERRNO(mknodat(dfd, bn, i->mode | file_type, i->major_minor)); - mac_selinux_create_file_clear(); - } -- creation = r >= 0 ? CREATION_NORMAL : CREATION_EXISTING; -- -- /* Try to open the inode via O_PATH, regardless if we could create it or not. Maybe everything is in -- * order anyway and we hence can ignore the error to create the device node */ -- fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -- if (fd < 0) { -- /* OK, so opening the inode failed, let's look at the original error then. */ - -- if (r < 0) { -- if (ERRNO_IS_PRIVILEGE(r)) -- goto handle_privilege; -+ if (r < 0) { -+ struct stat st; - -- return log_error_errno(r, "Failed to create device node '%s': %m", i->path); -+ if (r == -EPERM) { -+ log_debug_errno(r, -+ "We lack permissions, possibly because of cgroup configuration; " -+ "skipping creation of device node %s.", i->path); -+ return 0; - } - -- return log_error_errno(errno, "Failed to open device node '%s' we just created: %m", i->path); -- } -+ if (r != -EEXIST) -+ return log_error_errno(r, "Failed to create device node %s: %m", i->path); - -- if (fstat(fd, &st) < 0) -- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); -+ if (fstatat(dfd, bn, &st, 0) < 0) -+ return log_error_errno(errno, "stat(%s) failed: %m", i->path); - -- if (((st.st_mode ^ file_type) & S_IFMT) != 0) { -+ if ((st.st_mode & S_IFMT) != file_type) { - -- if (i->append_or_force) { -- fd = safe_close(fd); -+ if (i->append_or_force) { - -- RUN_WITH_UMASK(0000) { -- mac_selinux_create_file_prepare(i->path, file_type); -- r = mknodat_atomic(dfd, bn, i->mode | file_type, i->major_minor); -- mac_selinux_create_file_clear(); -- } -- if (ERRNO_IS_PRIVILEGE(r)) -- goto handle_privilege; -- if (IN_SET(r, -EISDIR, -EEXIST, -ENOTEMPTY)) { -- r = rm_rf_child(dfd, bn, REMOVE_PHYSICAL); -- if (r < 0) -- return log_error_errno(r, "rm -rf %s failed: %m", i->path); -+ RUN_WITH_UMASK(0000) { -+ mac_selinux_create_file_prepare(i->path, file_type); -+ /* FIXME: need to introduce mknodat_atomic() */ -+ r = mknod_atomic(i->path, i->mode | file_type, i->major_minor); -+ mac_selinux_create_file_clear(); -+ } - -- mac_selinux_create_file_prepare(i->path, file_type); -- r = RET_NERRNO(mknodat(dfd, bn, i->mode | file_type, i->major_minor)); -- mac_selinux_create_file_clear(); -+ if (r < 0) -+ return log_error_errno(r, "Failed to create device node \"%s\": %m", i->path); -+ creation = CREATION_FORCE; -+ } else { -+ log_warning("\"%s\" already exists is not a device node.", i->path); -+ return 0; - } -- if (r < 0) -- return log_error_errno(r, "Failed to create device node '%s': %m", i->path); -- -- fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -- if (fd < 0) -- return log_error_errno(errno, "Failed to open device node we just created '%s': %m", i->path); -- -- /* Validate type before change ownership below */ -- if (fstat(fd, &st) < 0) -- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); -- -- if (((st.st_mode ^ file_type) & S_IFMT) != 0) -- return log_error_errno(SYNTHETIC_ERRNO(EBADF), "Device node we just created is not a device node, refusing."); -- -- creation = CREATION_FORCE; -- } else { -- log_warning("\"%s\" already exists and is not a device node.", i->path); -- return 0; -- } -- } -+ } else -+ creation = CREATION_EXISTING; -+ } else -+ creation = CREATION_NORMAL; - - log_debug("%s %s device node \"%s\" %u:%u.", - creation_mode_verb_to_string(creation), - i->type == CREATE_BLOCK_DEVICE ? "block" : "char", - i->path, major(i->mode), minor(i->mode)); - -- return fd_set_perms(i, fd, i->path, &st, creation); -+ fd = openat(dfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -+ if (fd < 0) -+ return log_error_errno(errno, "Failed to openat(%s): %m", i->path); - --handle_privilege: -- log_debug_errno(r, -- "We lack permissions, possibly because of cgroup configuration; " -- "skipping creation of device node '%s'.", i->path); -- return 0; -+ return fd_set_perms(i, fd, i->path, /* st = */ NULL, creation); - } - --static int create_fifo(Item *i) { -+static int create_fifo(Item *i, const char *path) { - _cleanup_close_ int pfd = -1, fd = -1; - _cleanup_free_ char *bn = NULL; - CreationMode creation; - struct stat st; - int r; - -- assert(i); -- assert(i->type == CREATE_FIFO); -- - r = path_extract_filename(i->path, &bn); - if (r < 0) -- return log_error_errno(r, "Failed to extract filename from path '%s': %m", i->path); -+ return log_error_errno(r, "Failed to extract filename from path '%s': %m", path); - if (r == O_DIRECTORY) -- return log_error_errno(SYNTHETIC_ERRNO(EISDIR), "Cannot open path '%s' for creating FIFO, is a directory.", i->path); -+ return log_error_errno(SYNTHETIC_ERRNO(EISDIR), "Cannot open path '%s' for creating FIFO, is a directory.", path); - -- pfd = path_open_parent_safe(i->path, i->allow_failure); -+ pfd = path_open_parent_safe(path, i->allow_failure); - if (pfd < 0) - return pfd; - - RUN_WITH_UMASK(0000) { -- mac_selinux_create_file_prepare(i->path, S_IFIFO); -+ mac_selinux_create_file_prepare(path, S_IFIFO); - r = RET_NERRNO(mkfifoat(pfd, bn, i->mode)); - mac_selinux_create_file_clear(); - } - -- creation = r >= 0 ? CREATION_NORMAL : CREATION_EXISTING; -- -- /* Open the inode via O_PATH, regardless if we managed to create it or not. Maybe it is is already the FIFO we want */ -- fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -- if (fd < 0) { -- if (r < 0) -- return log_error_errno(r, "Failed to create FIFO %s: %m", i->path); /* original error! */ -- -- return log_error_errno(errno, "Failed to open FIFO we just created %s: %m", i->path); -- } -+ if (r < 0) { -+ if (r != -EEXIST) -+ return log_error_errno(r, "Failed to create fifo %s: %m", path); - -- if (fstat(fd, &st) < 0) -- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); -+ if (fstatat(pfd, bn, &st, AT_SYMLINK_NOFOLLOW) < 0) -+ return log_error_errno(errno, "stat(%s) failed: %m", path); - -- if (!S_ISFIFO(st.st_mode)) { -+ if (!S_ISFIFO(st.st_mode)) { - -- if (i->append_or_force) { -- fd = safe_close(fd); -+ if (i->append_or_force) { -+ RUN_WITH_UMASK(0000) { -+ mac_selinux_create_file_prepare(path, S_IFIFO); -+ r = mkfifoat_atomic(pfd, bn, i->mode); -+ mac_selinux_create_file_clear(); -+ } - -- RUN_WITH_UMASK(0000) { -- mac_selinux_create_file_prepare(i->path, S_IFIFO); -- r = mkfifoat_atomic(pfd, bn, i->mode); -- mac_selinux_create_file_clear(); -- } -- if (IN_SET(r, -EISDIR, -EEXIST, -ENOTEMPTY)) { -- r = rm_rf_child(pfd, bn, REMOVE_PHYSICAL); - if (r < 0) -- return log_error_errno(r, "rm -rf %s failed: %m", i->path); -- -- mac_selinux_create_file_prepare(i->path, S_IFIFO); -- r = RET_NERRNO(mkfifoat(pfd, bn, i->mode)); -- mac_selinux_create_file_clear(); -+ return log_error_errno(r, "Failed to create fifo %s: %m", path); -+ creation = CREATION_FORCE; -+ } else { -+ log_warning("\"%s\" already exists and is not a fifo.", path); -+ return 0; - } -- if (r < 0) -- return log_error_errno(r, "Failed to create FIFO %s: %m", i->path); -- -- fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -- if (fd < 0) -- return log_error_errno(errno, "Failed to open FIFO we just created '%s': %m", i->path); -- -- /* Validate type before change ownership below */ -- if (fstat(fd, &st) < 0) -- return log_error_errno(errno, "Failed to fstat(%s): %m", i->path); -+ } else -+ creation = CREATION_EXISTING; -+ } else -+ creation = CREATION_NORMAL; - -- if (!S_ISFIFO(st.st_mode)) -- return log_error_errno(SYNTHETIC_ERRNO(EBADF), "FIFO inode we just created is not a FIFO, refusing."); -+ log_debug("%s fifo \"%s\".", creation_mode_verb_to_string(creation), path); - -- creation = CREATION_FORCE; -- } else { -- log_warning("\"%s\" already exists and is not a FIFO.", i->path); -- return 0; -- } -- } -- -- log_debug("%s fifo \"%s\".", creation_mode_verb_to_string(creation), i->path); -+ fd = openat(pfd, bn, O_NOFOLLOW|O_CLOEXEC|O_PATH); -+ if (fd < 0) -+ return log_error_errno(errno, "Failed to openat(%s): %m", path); - -- return fd_set_perms(i, fd, i->path, &st, creation); -+ return fd_set_perms(i, fd, i->path, /* st = */ NULL, creation); - } - - static int create_symlink(Item *i) { -@@ -2499,7 +2452,7 @@ static int create_item(Item *i) { - if (r < 0) - return r; - -- r = create_fifo(i); -+ r = create_fifo(i, i->path); - if (r < 0) - return r; - break; --- -2.35.3 - diff --git a/systemd-v252.2+suse.29.ge7e931b07e.tar.xz b/systemd-v252.2+suse.29.ge7e931b07e.tar.xz deleted file mode 100644 index e67235d2..00000000 --- a/systemd-v252.2+suse.29.ge7e931b07e.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:981382ec6df9b609d8ecd5cb7e570064567840e1f618c205df9d0fc67d803dca -size 8035936 diff --git a/systemd-v252.3+suse.40.gbf3fef9988.tar.xz b/systemd-v252.3+suse.40.gbf3fef9988.tar.xz new file mode 100644 index 00000000..a630a377 --- /dev/null +++ b/systemd-v252.3+suse.40.gbf3fef9988.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4274c52c308874f73756af1fe91d0cf35ab72112f6ba593399398eddd17cc0c4 +size 8040380 diff --git a/systemd.changes b/systemd.changes index c29812f8..c887dc75 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Fri Dec 9 08:28:50 UTC 2022 - Franck Bui + +- Import commit bf3fef99886bd977a1c7a51d20087bc8977fff44 + + 6372fb0cc4 btrfs-util: convert O_PATH if necessary, in btrfs quota call (bsc#1205560) + 12e68eb0e5 blockdev-util: move O_PATH fd conversion into btrfs_get_block_device_fd() to shorten things + bb2bafdc9d btrfs-util: convert to fd_reopen_condition() + 1323232948 fd-util: add new helper fd_reopen_conditional() + +- Drop 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch + + It's no more needed as a fix for bsc#1205560 has been queued, see above. + +------------------------------------------------------------------- +Fri Dec 9 07:41:04 UTC 2022 - Franck Bui + +- Import commit 82898a14f5b0a965ba9c1efc1913fcdf29d446a8 (merge of v252.3) + + It includes the following fixes: + + 9410eb20eb cryptsetup: retry TPM2 unseal operation if it fails with TPM2_RC_PCR_CHANGED (bsc#1204944) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/e7e931b07edd786dc6ca1dae6c23ff7b785f8efd...82898a14f5b0a965ba9c1efc1913fcdf29d446a8 + + Additionally, it also includes the following backports: + + - 17b2f9f196 utmp-wtmp: fix error in case isatty() fails + - 8d5c487c87 sd-bus: handle -EINTR return from bus_poll() (bsc#1201982) + - 2dd217c8b5 tree-wide: modernizations with RET_NERRNO() + ------------------------------------------------------------------- Fri Dec 2 14:06:08 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ca60b72b..ad7989d5 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.29.ge7e931b07e +%define archive_version +suse.40.gbf3fef9988 %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: 252.2 +Version: 252.3 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -216,7 +216,6 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch # very few cases, some stuff might be broken in upstream and need to be fixed # quickly. But even in these cases, the patches are temporary and should be # removed as soon as a fix is merged by upstream. -Patch6000: 6000-Revert-tmpfiles-whenever-creating-an-inode-immediate.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 594c8f4a91f102a4078551b32a4628d6ec6127f9e0ddf4f82f55cf551593725c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 20 Dec 2022 19:20:12 +0000 Subject: [PATCH 117/124] Accepting request 1043872 from Base:System - Fix systemd-coredump to not allow user to access coredumps with changed uid/gid/capabilities (bsc#1205000 CVE-2022-4415) Add 5000-coredump-adjust-whitespace.patch Add 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch OBS-URL: https://build.opensuse.org/request/show/1043872 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=375 --- 5000-coredump-adjust-whitespace.patch | 101 +++++ ...allow-user-to-access-coredumps-with-.patch | 385 ++++++++++++++++++ systemd.changes | 9 + systemd.spec | 2 + 4 files changed, 497 insertions(+) create mode 100644 5000-coredump-adjust-whitespace.patch create mode 100644 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch diff --git a/5000-coredump-adjust-whitespace.patch b/5000-coredump-adjust-whitespace.patch new file mode 100644 index 00000000..ab21a57e --- /dev/null +++ b/5000-coredump-adjust-whitespace.patch @@ -0,0 +1,101 @@ +From 2f427f96135fbf3743eb58cfa9216fb605f0891d Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Tue, 29 Nov 2022 09:00:16 +0100 +Subject: [PATCH 5000/5001] coredump: adjust whitespace + +--- + src/coredump/coredump.c | 56 ++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 28 deletions(-) + +diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c +index 98e7492811..7a181bdeeb 100644 +--- a/src/coredump/coredump.c ++++ b/src/coredump/coredump.c +@@ -110,16 +110,16 @@ enum { + }; + + static const char * const meta_field_names[_META_MAX] = { +- [META_ARGV_PID] = "COREDUMP_PID=", +- [META_ARGV_UID] = "COREDUMP_UID=", +- [META_ARGV_GID] = "COREDUMP_GID=", +- [META_ARGV_SIGNAL] = "COREDUMP_SIGNAL=", +- [META_ARGV_TIMESTAMP] = "COREDUMP_TIMESTAMP=", +- [META_ARGV_RLIMIT] = "COREDUMP_RLIMIT=", +- [META_ARGV_HOSTNAME] = "COREDUMP_HOSTNAME=", +- [META_COMM] = "COREDUMP_COMM=", +- [META_EXE] = "COREDUMP_EXE=", +- [META_UNIT] = "COREDUMP_UNIT=", ++ [META_ARGV_PID] = "COREDUMP_PID=", ++ [META_ARGV_UID] = "COREDUMP_UID=", ++ [META_ARGV_GID] = "COREDUMP_GID=", ++ [META_ARGV_SIGNAL] = "COREDUMP_SIGNAL=", ++ [META_ARGV_TIMESTAMP] = "COREDUMP_TIMESTAMP=", ++ [META_ARGV_RLIMIT] = "COREDUMP_RLIMIT=", ++ [META_ARGV_HOSTNAME] = "COREDUMP_HOSTNAME=", ++ [META_COMM] = "COREDUMP_COMM=", ++ [META_EXE] = "COREDUMP_EXE=", ++ [META_UNIT] = "COREDUMP_UNIT=", + }; + + typedef struct Context { +@@ -138,9 +138,9 @@ typedef enum CoredumpStorage { + } CoredumpStorage; + + static const char* const coredump_storage_table[_COREDUMP_STORAGE_MAX] = { +- [COREDUMP_STORAGE_NONE] = "none", ++ [COREDUMP_STORAGE_NONE] = "none", + [COREDUMP_STORAGE_EXTERNAL] = "external", +- [COREDUMP_STORAGE_JOURNAL] = "journal", ++ [COREDUMP_STORAGE_JOURNAL] = "journal", + }; + + DEFINE_PRIVATE_STRING_TABLE_LOOKUP(coredump_storage, CoredumpStorage); +@@ -156,13 +156,13 @@ static uint64_t arg_max_use = UINT64_MAX; + + static int parse_config(void) { + static const ConfigTableItem items[] = { +- { "Coredump", "Storage", config_parse_coredump_storage, 0, &arg_storage }, +- { "Coredump", "Compress", config_parse_bool, 0, &arg_compress }, +- { "Coredump", "ProcessSizeMax", config_parse_iec_uint64, 0, &arg_process_size_max }, +- { "Coredump", "ExternalSizeMax", config_parse_iec_uint64_infinity, 0, &arg_external_size_max }, +- { "Coredump", "JournalSizeMax", config_parse_iec_size, 0, &arg_journal_size_max }, +- { "Coredump", "KeepFree", config_parse_iec_uint64, 0, &arg_keep_free }, +- { "Coredump", "MaxUse", config_parse_iec_uint64, 0, &arg_max_use }, ++ { "Coredump", "Storage", config_parse_coredump_storage, 0, &arg_storage }, ++ { "Coredump", "Compress", config_parse_bool, 0, &arg_compress }, ++ { "Coredump", "ProcessSizeMax", config_parse_iec_uint64, 0, &arg_process_size_max }, ++ { "Coredump", "ExternalSizeMax", config_parse_iec_uint64_infinity, 0, &arg_external_size_max }, ++ { "Coredump", "JournalSizeMax", config_parse_iec_size, 0, &arg_journal_size_max }, ++ { "Coredump", "KeepFree", config_parse_iec_uint64, 0, &arg_keep_free }, ++ { "Coredump", "MaxUse", config_parse_iec_uint64, 0, &arg_max_use }, + {} + }; + +@@ -208,15 +208,15 @@ static int fix_acl(int fd, uid_t uid) { + static int fix_xattr(int fd, const Context *context) { + + static const char * const xattrs[_META_MAX] = { +- [META_ARGV_PID] = "user.coredump.pid", +- [META_ARGV_UID] = "user.coredump.uid", +- [META_ARGV_GID] = "user.coredump.gid", +- [META_ARGV_SIGNAL] = "user.coredump.signal", +- [META_ARGV_TIMESTAMP] = "user.coredump.timestamp", +- [META_ARGV_RLIMIT] = "user.coredump.rlimit", +- [META_ARGV_HOSTNAME] = "user.coredump.hostname", +- [META_COMM] = "user.coredump.comm", +- [META_EXE] = "user.coredump.exe", ++ [META_ARGV_PID] = "user.coredump.pid", ++ [META_ARGV_UID] = "user.coredump.uid", ++ [META_ARGV_GID] = "user.coredump.gid", ++ [META_ARGV_SIGNAL] = "user.coredump.signal", ++ [META_ARGV_TIMESTAMP] = "user.coredump.timestamp", ++ [META_ARGV_RLIMIT] = "user.coredump.rlimit", ++ [META_ARGV_HOSTNAME] = "user.coredump.hostname", ++ [META_COMM] = "user.coredump.comm", ++ [META_EXE] = "user.coredump.exe", + }; + + int r = 0; +-- +2.35.3 + diff --git a/5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch b/5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch new file mode 100644 index 00000000..aedc307c --- /dev/null +++ b/5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch @@ -0,0 +1,385 @@ +From 87cad85ebec62e63893df46ff78becf82e984bee Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= +Date: Mon, 28 Nov 2022 12:12:55 +0100 +Subject: [PATCH 5001/5001] coredump: do not allow user to access coredumps + with changed uid/gid/capabilities + +When the user starts a program which elevates its permissions via setuid, +setgid, or capabilities set on the file, it may access additional information +which would then be visible in the coredump. We shouldn't make the the coredump +visible to the user in such cases. + +Reported-by: Matthias Gerstner + +This reads the /proc//auxv file and attaches it to the process metadata as +PROC_AUXV. Before the coredump is submitted, it is parsed and if either +at_secure was set (which the kernel will do for processes that are setuid, +setgid, or setcap), or if the effective uid/gid don't match uid/gid, the file +is not made accessible to the user. If we can't access this data, we assume the +file should not be made accessible either. In principle we could also access +the auxv data from a note in the core file, but that is much more complex and +it seems better to use the stand-alone file that is provided by the kernel. + +Attaching auxv is both convient for this patch (because this way it's passed +between the stages along with other fields), but I think it makes sense to save +it in general. + +We use the information early in the core file to figure out if the program was +32-bit or 64-bit and its endianness. This way we don't need heuristics to guess +whether the format of the auxv structure. This test might reject some cases on +fringe architecutes. But the impact would be limited: we just won't grant the +user permissions to view the coredump file. If people report that we're missing +some cases, we can always enhance this to support more architectures. + +I tested auxv parsing on amd64, 32-bit program on amd64, arm64, arm32, and +ppc64el, but not the whole coredump handling. + +[fbui: fixes bsc#1205000] +[fbui: fixes CVE-2022-4415] +--- + src/basic/io-util.h | 9 ++ + src/coredump/coredump.c | 196 +++++++++++++++++++++++++++++++++++++--- + 2 files changed, 192 insertions(+), 13 deletions(-) + +diff --git a/src/basic/io-util.h b/src/basic/io-util.h +index 39728e06bc..3afb134266 100644 +--- a/src/basic/io-util.h ++++ b/src/basic/io-util.h +@@ -91,7 +91,16 @@ struct iovec_wrapper *iovw_new(void); + struct iovec_wrapper *iovw_free(struct iovec_wrapper *iovw); + struct iovec_wrapper *iovw_free_free(struct iovec_wrapper *iovw); + void iovw_free_contents(struct iovec_wrapper *iovw, bool free_vectors); ++ + int iovw_put(struct iovec_wrapper *iovw, void *data, size_t len); ++static inline int iovw_consume(struct iovec_wrapper *iovw, void *data, size_t len) { ++ /* Move data into iovw or free on error */ ++ int r = iovw_put(iovw, data, len); ++ if (r < 0) ++ free(data); ++ return r; ++} ++ + int iovw_put_string_field(struct iovec_wrapper *iovw, const char *field, const char *value); + int iovw_put_string_field_free(struct iovec_wrapper *iovw, const char *field, char *value); + void iovw_rebase(struct iovec_wrapper *iovw, char *old, char *new); +diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c +index 7a181bdeeb..ea3d8c415a 100644 +--- a/src/coredump/coredump.c ++++ b/src/coredump/coredump.c +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -106,6 +107,7 @@ enum { + + META_EXE = _META_MANDATORY_MAX, + META_UNIT, ++ META_PROC_AUXV, + _META_MAX + }; + +@@ -120,10 +122,12 @@ static const char * const meta_field_names[_META_MAX] = { + [META_COMM] = "COREDUMP_COMM=", + [META_EXE] = "COREDUMP_EXE=", + [META_UNIT] = "COREDUMP_UNIT=", ++ [META_PROC_AUXV] = "COREDUMP_PROC_AUXV=", + }; + + typedef struct Context { + const char *meta[_META_MAX]; ++ size_t meta_size[_META_MAX]; + pid_t pid; + bool is_pid1; + bool is_journald; +@@ -185,13 +189,16 @@ static uint64_t storage_size_max(void) { + return 0; + } + +-static int fix_acl(int fd, uid_t uid) { ++static int fix_acl(int fd, uid_t uid, bool allow_user) { ++ assert(fd >= 0); ++ assert(uid_is_valid(uid)); + + #if HAVE_ACL + int r; + +- assert(fd >= 0); +- assert(uid_is_valid(uid)); ++ /* We don't allow users to read coredumps if the uid or capabilities were changed. */ ++ if (!allow_user) ++ return 0; + + if (uid_is_system(uid) || uid_is_dynamic(uid) || uid == UID_NOBODY) + return 0; +@@ -251,7 +258,8 @@ static int fix_permissions( + const char *filename, + const char *target, + const Context *context, +- uid_t uid) { ++ uid_t uid, ++ bool allow_user) { + + int r; + +@@ -261,7 +269,7 @@ static int fix_permissions( + + /* Ignore errors on these */ + (void) fchmod(fd, 0640); +- (void) fix_acl(fd, uid); ++ (void) fix_acl(fd, uid, allow_user); + (void) fix_xattr(fd, context); + + r = fsync_full(fd); +@@ -331,6 +339,153 @@ static int make_filename(const Context *context, char **ret) { + return 0; + } + ++static int parse_auxv64( ++ const uint64_t *auxv, ++ size_t size_bytes, ++ int *at_secure, ++ uid_t *uid, ++ uid_t *euid, ++ gid_t *gid, ++ gid_t *egid) { ++ ++ assert(auxv || size_bytes == 0); ++ ++ if (size_bytes % (2 * sizeof(uint64_t)) != 0) ++ return log_warning_errno(SYNTHETIC_ERRNO(EIO), "Incomplete auxv structure (%zu bytes).", size_bytes); ++ ++ size_t words = size_bytes / sizeof(uint64_t); ++ ++ /* Note that we set output variables even on error. */ ++ ++ for (size_t i = 0; i + 1 < words; i += 2) ++ switch (auxv[i]) { ++ case AT_SECURE: ++ *at_secure = auxv[i + 1] != 0; ++ break; ++ case AT_UID: ++ *uid = auxv[i + 1]; ++ break; ++ case AT_EUID: ++ *euid = auxv[i + 1]; ++ break; ++ case AT_GID: ++ *gid = auxv[i + 1]; ++ break; ++ case AT_EGID: ++ *egid = auxv[i + 1]; ++ break; ++ case AT_NULL: ++ if (auxv[i + 1] != 0) ++ goto error; ++ return 0; ++ } ++ error: ++ return log_warning_errno(SYNTHETIC_ERRNO(ENODATA), ++ "AT_NULL terminator not found, cannot parse auxv structure."); ++} ++ ++static int parse_auxv32( ++ const uint32_t *auxv, ++ size_t size_bytes, ++ int *at_secure, ++ uid_t *uid, ++ uid_t *euid, ++ gid_t *gid, ++ gid_t *egid) { ++ ++ assert(auxv || size_bytes == 0); ++ ++ size_t words = size_bytes / sizeof(uint32_t); ++ ++ if (size_bytes % (2 * sizeof(uint32_t)) != 0) ++ return log_warning_errno(SYNTHETIC_ERRNO(EIO), "Incomplete auxv structure (%zu bytes).", size_bytes); ++ ++ /* Note that we set output variables even on error. */ ++ ++ for (size_t i = 0; i + 1 < words; i += 2) ++ switch (auxv[i]) { ++ case AT_SECURE: ++ *at_secure = auxv[i + 1] != 0; ++ break; ++ case AT_UID: ++ *uid = auxv[i + 1]; ++ break; ++ case AT_EUID: ++ *euid = auxv[i + 1]; ++ break; ++ case AT_GID: ++ *gid = auxv[i + 1]; ++ break; ++ case AT_EGID: ++ *egid = auxv[i + 1]; ++ break; ++ case AT_NULL: ++ if (auxv[i + 1] != 0) ++ goto error; ++ return 0; ++ } ++ error: ++ return log_warning_errno(SYNTHETIC_ERRNO(ENODATA), ++ "AT_NULL terminator not found, cannot parse auxv structure."); ++} ++ ++static int grant_user_access(int core_fd, const Context *context) { ++ int at_secure = -1; ++ uid_t uid = UID_INVALID, euid = UID_INVALID; ++ uid_t gid = GID_INVALID, egid = GID_INVALID; ++ int r; ++ ++ assert(core_fd >= 0); ++ assert(context); ++ ++ if (!context->meta[META_PROC_AUXV]) ++ return log_warning_errno(SYNTHETIC_ERRNO(ENODATA), "No auxv data, not adjusting permissions."); ++ ++ uint8_t elf[EI_NIDENT]; ++ errno = 0; ++ if (pread(core_fd, &elf, sizeof(elf), 0) != sizeof(elf)) ++ return log_warning_errno(errno_or_else(EIO), ++ "Failed to pread from coredump fd: %s", STRERROR_OR_EOF(errno)); ++ ++ if (elf[EI_MAG0] != ELFMAG0 || ++ elf[EI_MAG1] != ELFMAG1 || ++ elf[EI_MAG2] != ELFMAG2 || ++ elf[EI_MAG3] != ELFMAG3 || ++ elf[EI_VERSION] != EV_CURRENT) ++ return log_info_errno(SYNTHETIC_ERRNO(EUCLEAN), ++ "Core file does not have ELF header, not adjusting permissions."); ++ if (!IN_SET(elf[EI_CLASS], ELFCLASS32, ELFCLASS64) || ++ !IN_SET(elf[EI_DATA], ELFDATA2LSB, ELFDATA2MSB)) ++ return log_info_errno(SYNTHETIC_ERRNO(EUCLEAN), ++ "Core file has strange ELF class, not adjusting permissions."); ++ ++ if ((elf[EI_DATA] == ELFDATA2LSB) != (__BYTE_ORDER == __LITTLE_ENDIAN)) ++ return log_info_errno(SYNTHETIC_ERRNO(EUCLEAN), ++ "Core file has non-native endianness, not adjusting permissions."); ++ ++ if (elf[EI_CLASS] == ELFCLASS64) ++ r = parse_auxv64((const uint64_t*) context->meta[META_PROC_AUXV], ++ context->meta_size[META_PROC_AUXV], ++ &at_secure, &uid, &euid, &gid, &egid); ++ else ++ r = parse_auxv32((const uint32_t*) context->meta[META_PROC_AUXV], ++ context->meta_size[META_PROC_AUXV], ++ &at_secure, &uid, &euid, &gid, &egid); ++ if (r < 0) ++ return r; ++ ++ /* We allow access if we got all the data and at_secure is not set and ++ * the uid/gid matches euid/egid. */ ++ bool ret = ++ at_secure == 0 && ++ uid != UID_INVALID && euid != UID_INVALID && uid == euid && ++ gid != GID_INVALID && egid != GID_INVALID && gid == egid; ++ log_debug("Will %s access (uid="UID_FMT " euid="UID_FMT " gid="GID_FMT " egid="GID_FMT " at_secure=%s)", ++ ret ? "permit" : "restrict", ++ uid, euid, gid, egid, yes_no(at_secure)); ++ return ret; ++} ++ + static int save_external_coredump( + const Context *context, + int input_fd, +@@ -453,6 +608,8 @@ static int save_external_coredump( + context->meta[META_ARGV_PID], context->meta[META_COMM]); + truncated = r == 1; + ++ bool allow_user = grant_user_access(fd, context) > 0; ++ + #if HAVE_COMPRESSION + if (arg_compress) { + _cleanup_(unlink_and_freep) char *tmp_compressed = NULL; +@@ -490,7 +647,7 @@ static int save_external_coredump( + uncompressed_size += partial_uncompressed_size; + } + +- r = fix_permissions(fd_compressed, tmp_compressed, fn_compressed, context, uid); ++ r = fix_permissions(fd_compressed, tmp_compressed, fn_compressed, context, uid, allow_user); + if (r < 0) + return r; + +@@ -517,7 +674,7 @@ static int save_external_coredump( + "SIZE_LIMIT=%"PRIu64, max_size, + "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR); + +- r = fix_permissions(fd, tmp, fn, context, uid); ++ r = fix_permissions(fd, tmp, fn, context, uid, allow_user); + if (r < 0) + return log_error_errno(r, "Failed to fix permissions and finalize coredump %s into %s: %m", coredump_tmpfile_name(tmp), fn); + +@@ -765,7 +922,7 @@ static int change_uid_gid(const Context *context) { + } + + static int submit_coredump( +- Context *context, ++ const Context *context, + struct iovec_wrapper *iovw, + int input_fd) { + +@@ -944,16 +1101,15 @@ static int save_context(Context *context, const struct iovec_wrapper *iovw) { + struct iovec *iovec = iovw->iovec + n; + + for (size_t i = 0; i < ELEMENTSOF(meta_field_names); i++) { +- char *p; +- + /* Note that these strings are NUL terminated, because we made sure that a + * trailing NUL byte is in the buffer, though not included in the iov_len + * count (see process_socket() and gather_pid_metadata_*()) */ + assert(((char*) iovec->iov_base)[iovec->iov_len] == 0); + +- p = startswith(iovec->iov_base, meta_field_names[i]); ++ const char *p = startswith(iovec->iov_base, meta_field_names[i]); + if (p) { + context->meta[i] = p; ++ context->meta_size[i] = iovec->iov_len - strlen(meta_field_names[i]); + break; + } + } +@@ -1190,6 +1346,7 @@ static int gather_pid_metadata(struct iovec_wrapper *iovw, Context *context) { + uid_t owner_uid; + pid_t pid; + char *t; ++ size_t size; + const char *p; + int r; + +@@ -1254,13 +1411,26 @@ static int gather_pid_metadata(struct iovec_wrapper *iovw, Context *context) { + (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_LIMITS=", t); + + p = procfs_file_alloca(pid, "cgroup"); +- if (read_full_virtual_file(p, &t, NULL) >=0) ++ if (read_full_virtual_file(p, &t, NULL) >= 0) + (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_CGROUP=", t); + + p = procfs_file_alloca(pid, "mountinfo"); +- if (read_full_virtual_file(p, &t, NULL) >=0) ++ if (read_full_virtual_file(p, &t, NULL) >= 0) + (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_MOUNTINFO=", t); + ++ /* We attach /proc/auxv here. ELF coredumps also contain a note for this (NT_AUXV), see elf(5). */ ++ p = procfs_file_alloca(pid, "auxv"); ++ if (read_full_virtual_file(p, &t, &size) >= 0) { ++ char *buf = malloc(strlen("COREDUMP_PROC_AUXV=") + size + 1); ++ if (buf) { ++ /* Add a dummy terminator to make save_context() happy. */ ++ *((uint8_t*) mempcpy(stpcpy(buf, "COREDUMP_PROC_AUXV="), t, size)) = '\0'; ++ (void) iovw_consume(iovw, buf, size + strlen("COREDUMP_PROC_AUXV=")); ++ } ++ ++ free(t); ++ } ++ + if (get_process_cwd(pid, &t) >= 0) + (void) iovw_put_string_field_free(iovw, "COREDUMP_CWD=", t); + +-- +2.35.3 + diff --git a/systemd.changes b/systemd.changes index c887dc75..7d06424f 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Mon Dec 19 07:50:15 UTC 2022 - Franck Bui + +- Fix systemd-coredump to not allow user to access coredumps with changed + uid/gid/capabilities (bsc#1205000 CVE-2022-4415) + + Add 5000-coredump-adjust-whitespace.patch + Add 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch + ------------------------------------------------------------------- Fri Dec 9 08:28:50 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index ad7989d5..4037f598 100644 --- a/systemd.spec +++ b/systemd.spec @@ -216,6 +216,8 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch # very few cases, some stuff might be broken in upstream and need to be fixed # quickly. But even in these cases, the patches are temporary and should be # removed as soon as a fix is merged by upstream. +Patch5000: 5000-coredump-adjust-whitespace.patch +Patch5001: 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 59b703ed3989179735bf9b190c080a09ceb455dd0725111114b467388a92a73f Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Sat, 7 Jan 2023 16:16:19 +0000 Subject: [PATCH 118/124] Accepting request 1056400 from Base:System - Add 5000-rules-add-missing-line-continuation.patch until commit de8409ac43f6e4596de4cecce8dbbb5f1f2a18b1 is backported to the v252 stable tree. - Import commit 5a506d73bde7ba9261985f8e9ce084044a519432 (merge of v252.4) It includes the following fixes: 9b75a3d050 coredump: do not allow user to access coredumps with changed uid/gid/capabilities (bsc#1205000 CVE-2022-4415) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/bf3fef99886bd977a1c7a51d20087bc8977fff44...5a506d73bde7ba9261985f8e9ce084044a519432 Additionally, it also includes the following backports: - 20ca3155c5 localed: reload PID1 configuration after modifying /etc/locale.conf - 3538c202fd test: update TEST-73-LOCALE to define several locale settings in initial PID1 environment - Drop 5000-coredump-adjust-whitespace.patch 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch They are part of v252.4. OBS-URL: https://build.opensuse.org/request/show/1056400 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=376 --- 5000-coredump-adjust-whitespace.patch | 101 ----- ...-rules-add-missing-line-continuation.patch | 28 ++ ...allow-user-to-access-coredumps-with-.patch | 385 ------------------ systemd-v252.3+suse.40.gbf3fef9988.tar.xz | 3 - systemd-v252.4+suse.44.g5a506d73bd.tar.xz | 3 + systemd.changes | 29 ++ systemd.spec | 9 +- 7 files changed, 64 insertions(+), 494 deletions(-) delete mode 100644 5000-coredump-adjust-whitespace.patch create mode 100644 5000-rules-add-missing-line-continuation.patch delete mode 100644 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch delete mode 100644 systemd-v252.3+suse.40.gbf3fef9988.tar.xz create mode 100644 systemd-v252.4+suse.44.g5a506d73bd.tar.xz diff --git a/5000-coredump-adjust-whitespace.patch b/5000-coredump-adjust-whitespace.patch deleted file mode 100644 index ab21a57e..00000000 --- a/5000-coredump-adjust-whitespace.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 2f427f96135fbf3743eb58cfa9216fb605f0891d Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Tue, 29 Nov 2022 09:00:16 +0100 -Subject: [PATCH 5000/5001] coredump: adjust whitespace - ---- - src/coredump/coredump.c | 56 ++++++++++++++++++++--------------------- - 1 file changed, 28 insertions(+), 28 deletions(-) - -diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c -index 98e7492811..7a181bdeeb 100644 ---- a/src/coredump/coredump.c -+++ b/src/coredump/coredump.c -@@ -110,16 +110,16 @@ enum { - }; - - static const char * const meta_field_names[_META_MAX] = { -- [META_ARGV_PID] = "COREDUMP_PID=", -- [META_ARGV_UID] = "COREDUMP_UID=", -- [META_ARGV_GID] = "COREDUMP_GID=", -- [META_ARGV_SIGNAL] = "COREDUMP_SIGNAL=", -- [META_ARGV_TIMESTAMP] = "COREDUMP_TIMESTAMP=", -- [META_ARGV_RLIMIT] = "COREDUMP_RLIMIT=", -- [META_ARGV_HOSTNAME] = "COREDUMP_HOSTNAME=", -- [META_COMM] = "COREDUMP_COMM=", -- [META_EXE] = "COREDUMP_EXE=", -- [META_UNIT] = "COREDUMP_UNIT=", -+ [META_ARGV_PID] = "COREDUMP_PID=", -+ [META_ARGV_UID] = "COREDUMP_UID=", -+ [META_ARGV_GID] = "COREDUMP_GID=", -+ [META_ARGV_SIGNAL] = "COREDUMP_SIGNAL=", -+ [META_ARGV_TIMESTAMP] = "COREDUMP_TIMESTAMP=", -+ [META_ARGV_RLIMIT] = "COREDUMP_RLIMIT=", -+ [META_ARGV_HOSTNAME] = "COREDUMP_HOSTNAME=", -+ [META_COMM] = "COREDUMP_COMM=", -+ [META_EXE] = "COREDUMP_EXE=", -+ [META_UNIT] = "COREDUMP_UNIT=", - }; - - typedef struct Context { -@@ -138,9 +138,9 @@ typedef enum CoredumpStorage { - } CoredumpStorage; - - static const char* const coredump_storage_table[_COREDUMP_STORAGE_MAX] = { -- [COREDUMP_STORAGE_NONE] = "none", -+ [COREDUMP_STORAGE_NONE] = "none", - [COREDUMP_STORAGE_EXTERNAL] = "external", -- [COREDUMP_STORAGE_JOURNAL] = "journal", -+ [COREDUMP_STORAGE_JOURNAL] = "journal", - }; - - DEFINE_PRIVATE_STRING_TABLE_LOOKUP(coredump_storage, CoredumpStorage); -@@ -156,13 +156,13 @@ static uint64_t arg_max_use = UINT64_MAX; - - static int parse_config(void) { - static const ConfigTableItem items[] = { -- { "Coredump", "Storage", config_parse_coredump_storage, 0, &arg_storage }, -- { "Coredump", "Compress", config_parse_bool, 0, &arg_compress }, -- { "Coredump", "ProcessSizeMax", config_parse_iec_uint64, 0, &arg_process_size_max }, -- { "Coredump", "ExternalSizeMax", config_parse_iec_uint64_infinity, 0, &arg_external_size_max }, -- { "Coredump", "JournalSizeMax", config_parse_iec_size, 0, &arg_journal_size_max }, -- { "Coredump", "KeepFree", config_parse_iec_uint64, 0, &arg_keep_free }, -- { "Coredump", "MaxUse", config_parse_iec_uint64, 0, &arg_max_use }, -+ { "Coredump", "Storage", config_parse_coredump_storage, 0, &arg_storage }, -+ { "Coredump", "Compress", config_parse_bool, 0, &arg_compress }, -+ { "Coredump", "ProcessSizeMax", config_parse_iec_uint64, 0, &arg_process_size_max }, -+ { "Coredump", "ExternalSizeMax", config_parse_iec_uint64_infinity, 0, &arg_external_size_max }, -+ { "Coredump", "JournalSizeMax", config_parse_iec_size, 0, &arg_journal_size_max }, -+ { "Coredump", "KeepFree", config_parse_iec_uint64, 0, &arg_keep_free }, -+ { "Coredump", "MaxUse", config_parse_iec_uint64, 0, &arg_max_use }, - {} - }; - -@@ -208,15 +208,15 @@ static int fix_acl(int fd, uid_t uid) { - static int fix_xattr(int fd, const Context *context) { - - static const char * const xattrs[_META_MAX] = { -- [META_ARGV_PID] = "user.coredump.pid", -- [META_ARGV_UID] = "user.coredump.uid", -- [META_ARGV_GID] = "user.coredump.gid", -- [META_ARGV_SIGNAL] = "user.coredump.signal", -- [META_ARGV_TIMESTAMP] = "user.coredump.timestamp", -- [META_ARGV_RLIMIT] = "user.coredump.rlimit", -- [META_ARGV_HOSTNAME] = "user.coredump.hostname", -- [META_COMM] = "user.coredump.comm", -- [META_EXE] = "user.coredump.exe", -+ [META_ARGV_PID] = "user.coredump.pid", -+ [META_ARGV_UID] = "user.coredump.uid", -+ [META_ARGV_GID] = "user.coredump.gid", -+ [META_ARGV_SIGNAL] = "user.coredump.signal", -+ [META_ARGV_TIMESTAMP] = "user.coredump.timestamp", -+ [META_ARGV_RLIMIT] = "user.coredump.rlimit", -+ [META_ARGV_HOSTNAME] = "user.coredump.hostname", -+ [META_COMM] = "user.coredump.comm", -+ [META_EXE] = "user.coredump.exe", - }; - - int r = 0; --- -2.35.3 - diff --git a/5000-rules-add-missing-line-continuation.patch b/5000-rules-add-missing-line-continuation.patch new file mode 100644 index 00000000..a0cfa7dd --- /dev/null +++ b/5000-rules-add-missing-line-continuation.patch @@ -0,0 +1,28 @@ +From de8409ac43f6e4596de4cecce8dbbb5f1f2a18b1 Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Wed, 21 Dec 2022 17:32:56 +0900 +Subject: [PATCH 5000/5000] rules: add missing line continuation + +Fixes a bug introduced by 953c928c24455744d5534679998d129b947a5e04. + +Fixes #25811. +--- + rules.d/60-evdev.rules | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rules.d/60-evdev.rules b/rules.d/60-evdev.rules +index 15483101e7..c97cdecb58 100644 +--- a/rules.d/60-evdev.rules ++++ b/rules.d/60-evdev.rules +@@ -6,7 +6,7 @@ KERNEL!="event*", GOTO="evdev_end" + # Execute the match patterns below, from least-to-most specific. + + # Device matching the modalias string (bustype, vendor, product, version, other properties) +-IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", ++IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", \ + ENV{.HAVE_HWDB_PROPERTIES}="1" + + # AT keyboard matching by the machine's DMI data +-- +2.35.3 + diff --git a/5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch b/5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch deleted file mode 100644 index aedc307c..00000000 --- a/5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch +++ /dev/null @@ -1,385 +0,0 @@ -From 87cad85ebec62e63893df46ff78becf82e984bee Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Mon, 28 Nov 2022 12:12:55 +0100 -Subject: [PATCH 5001/5001] coredump: do not allow user to access coredumps - with changed uid/gid/capabilities - -When the user starts a program which elevates its permissions via setuid, -setgid, or capabilities set on the file, it may access additional information -which would then be visible in the coredump. We shouldn't make the the coredump -visible to the user in such cases. - -Reported-by: Matthias Gerstner - -This reads the /proc//auxv file and attaches it to the process metadata as -PROC_AUXV. Before the coredump is submitted, it is parsed and if either -at_secure was set (which the kernel will do for processes that are setuid, -setgid, or setcap), or if the effective uid/gid don't match uid/gid, the file -is not made accessible to the user. If we can't access this data, we assume the -file should not be made accessible either. In principle we could also access -the auxv data from a note in the core file, but that is much more complex and -it seems better to use the stand-alone file that is provided by the kernel. - -Attaching auxv is both convient for this patch (because this way it's passed -between the stages along with other fields), but I think it makes sense to save -it in general. - -We use the information early in the core file to figure out if the program was -32-bit or 64-bit and its endianness. This way we don't need heuristics to guess -whether the format of the auxv structure. This test might reject some cases on -fringe architecutes. But the impact would be limited: we just won't grant the -user permissions to view the coredump file. If people report that we're missing -some cases, we can always enhance this to support more architectures. - -I tested auxv parsing on amd64, 32-bit program on amd64, arm64, arm32, and -ppc64el, but not the whole coredump handling. - -[fbui: fixes bsc#1205000] -[fbui: fixes CVE-2022-4415] ---- - src/basic/io-util.h | 9 ++ - src/coredump/coredump.c | 196 +++++++++++++++++++++++++++++++++++++--- - 2 files changed, 192 insertions(+), 13 deletions(-) - -diff --git a/src/basic/io-util.h b/src/basic/io-util.h -index 39728e06bc..3afb134266 100644 ---- a/src/basic/io-util.h -+++ b/src/basic/io-util.h -@@ -91,7 +91,16 @@ struct iovec_wrapper *iovw_new(void); - struct iovec_wrapper *iovw_free(struct iovec_wrapper *iovw); - struct iovec_wrapper *iovw_free_free(struct iovec_wrapper *iovw); - void iovw_free_contents(struct iovec_wrapper *iovw, bool free_vectors); -+ - int iovw_put(struct iovec_wrapper *iovw, void *data, size_t len); -+static inline int iovw_consume(struct iovec_wrapper *iovw, void *data, size_t len) { -+ /* Move data into iovw or free on error */ -+ int r = iovw_put(iovw, data, len); -+ if (r < 0) -+ free(data); -+ return r; -+} -+ - int iovw_put_string_field(struct iovec_wrapper *iovw, const char *field, const char *value); - int iovw_put_string_field_free(struct iovec_wrapper *iovw, const char *field, char *value); - void iovw_rebase(struct iovec_wrapper *iovw, char *old, char *new); -diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c -index 7a181bdeeb..ea3d8c415a 100644 ---- a/src/coredump/coredump.c -+++ b/src/coredump/coredump.c -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -106,6 +107,7 @@ enum { - - META_EXE = _META_MANDATORY_MAX, - META_UNIT, -+ META_PROC_AUXV, - _META_MAX - }; - -@@ -120,10 +122,12 @@ static const char * const meta_field_names[_META_MAX] = { - [META_COMM] = "COREDUMP_COMM=", - [META_EXE] = "COREDUMP_EXE=", - [META_UNIT] = "COREDUMP_UNIT=", -+ [META_PROC_AUXV] = "COREDUMP_PROC_AUXV=", - }; - - typedef struct Context { - const char *meta[_META_MAX]; -+ size_t meta_size[_META_MAX]; - pid_t pid; - bool is_pid1; - bool is_journald; -@@ -185,13 +189,16 @@ static uint64_t storage_size_max(void) { - return 0; - } - --static int fix_acl(int fd, uid_t uid) { -+static int fix_acl(int fd, uid_t uid, bool allow_user) { -+ assert(fd >= 0); -+ assert(uid_is_valid(uid)); - - #if HAVE_ACL - int r; - -- assert(fd >= 0); -- assert(uid_is_valid(uid)); -+ /* We don't allow users to read coredumps if the uid or capabilities were changed. */ -+ if (!allow_user) -+ return 0; - - if (uid_is_system(uid) || uid_is_dynamic(uid) || uid == UID_NOBODY) - return 0; -@@ -251,7 +258,8 @@ static int fix_permissions( - const char *filename, - const char *target, - const Context *context, -- uid_t uid) { -+ uid_t uid, -+ bool allow_user) { - - int r; - -@@ -261,7 +269,7 @@ static int fix_permissions( - - /* Ignore errors on these */ - (void) fchmod(fd, 0640); -- (void) fix_acl(fd, uid); -+ (void) fix_acl(fd, uid, allow_user); - (void) fix_xattr(fd, context); - - r = fsync_full(fd); -@@ -331,6 +339,153 @@ static int make_filename(const Context *context, char **ret) { - return 0; - } - -+static int parse_auxv64( -+ const uint64_t *auxv, -+ size_t size_bytes, -+ int *at_secure, -+ uid_t *uid, -+ uid_t *euid, -+ gid_t *gid, -+ gid_t *egid) { -+ -+ assert(auxv || size_bytes == 0); -+ -+ if (size_bytes % (2 * sizeof(uint64_t)) != 0) -+ return log_warning_errno(SYNTHETIC_ERRNO(EIO), "Incomplete auxv structure (%zu bytes).", size_bytes); -+ -+ size_t words = size_bytes / sizeof(uint64_t); -+ -+ /* Note that we set output variables even on error. */ -+ -+ for (size_t i = 0; i + 1 < words; i += 2) -+ switch (auxv[i]) { -+ case AT_SECURE: -+ *at_secure = auxv[i + 1] != 0; -+ break; -+ case AT_UID: -+ *uid = auxv[i + 1]; -+ break; -+ case AT_EUID: -+ *euid = auxv[i + 1]; -+ break; -+ case AT_GID: -+ *gid = auxv[i + 1]; -+ break; -+ case AT_EGID: -+ *egid = auxv[i + 1]; -+ break; -+ case AT_NULL: -+ if (auxv[i + 1] != 0) -+ goto error; -+ return 0; -+ } -+ error: -+ return log_warning_errno(SYNTHETIC_ERRNO(ENODATA), -+ "AT_NULL terminator not found, cannot parse auxv structure."); -+} -+ -+static int parse_auxv32( -+ const uint32_t *auxv, -+ size_t size_bytes, -+ int *at_secure, -+ uid_t *uid, -+ uid_t *euid, -+ gid_t *gid, -+ gid_t *egid) { -+ -+ assert(auxv || size_bytes == 0); -+ -+ size_t words = size_bytes / sizeof(uint32_t); -+ -+ if (size_bytes % (2 * sizeof(uint32_t)) != 0) -+ return log_warning_errno(SYNTHETIC_ERRNO(EIO), "Incomplete auxv structure (%zu bytes).", size_bytes); -+ -+ /* Note that we set output variables even on error. */ -+ -+ for (size_t i = 0; i + 1 < words; i += 2) -+ switch (auxv[i]) { -+ case AT_SECURE: -+ *at_secure = auxv[i + 1] != 0; -+ break; -+ case AT_UID: -+ *uid = auxv[i + 1]; -+ break; -+ case AT_EUID: -+ *euid = auxv[i + 1]; -+ break; -+ case AT_GID: -+ *gid = auxv[i + 1]; -+ break; -+ case AT_EGID: -+ *egid = auxv[i + 1]; -+ break; -+ case AT_NULL: -+ if (auxv[i + 1] != 0) -+ goto error; -+ return 0; -+ } -+ error: -+ return log_warning_errno(SYNTHETIC_ERRNO(ENODATA), -+ "AT_NULL terminator not found, cannot parse auxv structure."); -+} -+ -+static int grant_user_access(int core_fd, const Context *context) { -+ int at_secure = -1; -+ uid_t uid = UID_INVALID, euid = UID_INVALID; -+ uid_t gid = GID_INVALID, egid = GID_INVALID; -+ int r; -+ -+ assert(core_fd >= 0); -+ assert(context); -+ -+ if (!context->meta[META_PROC_AUXV]) -+ return log_warning_errno(SYNTHETIC_ERRNO(ENODATA), "No auxv data, not adjusting permissions."); -+ -+ uint8_t elf[EI_NIDENT]; -+ errno = 0; -+ if (pread(core_fd, &elf, sizeof(elf), 0) != sizeof(elf)) -+ return log_warning_errno(errno_or_else(EIO), -+ "Failed to pread from coredump fd: %s", STRERROR_OR_EOF(errno)); -+ -+ if (elf[EI_MAG0] != ELFMAG0 || -+ elf[EI_MAG1] != ELFMAG1 || -+ elf[EI_MAG2] != ELFMAG2 || -+ elf[EI_MAG3] != ELFMAG3 || -+ elf[EI_VERSION] != EV_CURRENT) -+ return log_info_errno(SYNTHETIC_ERRNO(EUCLEAN), -+ "Core file does not have ELF header, not adjusting permissions."); -+ if (!IN_SET(elf[EI_CLASS], ELFCLASS32, ELFCLASS64) || -+ !IN_SET(elf[EI_DATA], ELFDATA2LSB, ELFDATA2MSB)) -+ return log_info_errno(SYNTHETIC_ERRNO(EUCLEAN), -+ "Core file has strange ELF class, not adjusting permissions."); -+ -+ if ((elf[EI_DATA] == ELFDATA2LSB) != (__BYTE_ORDER == __LITTLE_ENDIAN)) -+ return log_info_errno(SYNTHETIC_ERRNO(EUCLEAN), -+ "Core file has non-native endianness, not adjusting permissions."); -+ -+ if (elf[EI_CLASS] == ELFCLASS64) -+ r = parse_auxv64((const uint64_t*) context->meta[META_PROC_AUXV], -+ context->meta_size[META_PROC_AUXV], -+ &at_secure, &uid, &euid, &gid, &egid); -+ else -+ r = parse_auxv32((const uint32_t*) context->meta[META_PROC_AUXV], -+ context->meta_size[META_PROC_AUXV], -+ &at_secure, &uid, &euid, &gid, &egid); -+ if (r < 0) -+ return r; -+ -+ /* We allow access if we got all the data and at_secure is not set and -+ * the uid/gid matches euid/egid. */ -+ bool ret = -+ at_secure == 0 && -+ uid != UID_INVALID && euid != UID_INVALID && uid == euid && -+ gid != GID_INVALID && egid != GID_INVALID && gid == egid; -+ log_debug("Will %s access (uid="UID_FMT " euid="UID_FMT " gid="GID_FMT " egid="GID_FMT " at_secure=%s)", -+ ret ? "permit" : "restrict", -+ uid, euid, gid, egid, yes_no(at_secure)); -+ return ret; -+} -+ - static int save_external_coredump( - const Context *context, - int input_fd, -@@ -453,6 +608,8 @@ static int save_external_coredump( - context->meta[META_ARGV_PID], context->meta[META_COMM]); - truncated = r == 1; - -+ bool allow_user = grant_user_access(fd, context) > 0; -+ - #if HAVE_COMPRESSION - if (arg_compress) { - _cleanup_(unlink_and_freep) char *tmp_compressed = NULL; -@@ -490,7 +647,7 @@ static int save_external_coredump( - uncompressed_size += partial_uncompressed_size; - } - -- r = fix_permissions(fd_compressed, tmp_compressed, fn_compressed, context, uid); -+ r = fix_permissions(fd_compressed, tmp_compressed, fn_compressed, context, uid, allow_user); - if (r < 0) - return r; - -@@ -517,7 +674,7 @@ static int save_external_coredump( - "SIZE_LIMIT=%"PRIu64, max_size, - "MESSAGE_ID=" SD_MESSAGE_TRUNCATED_CORE_STR); - -- r = fix_permissions(fd, tmp, fn, context, uid); -+ r = fix_permissions(fd, tmp, fn, context, uid, allow_user); - if (r < 0) - return log_error_errno(r, "Failed to fix permissions and finalize coredump %s into %s: %m", coredump_tmpfile_name(tmp), fn); - -@@ -765,7 +922,7 @@ static int change_uid_gid(const Context *context) { - } - - static int submit_coredump( -- Context *context, -+ const Context *context, - struct iovec_wrapper *iovw, - int input_fd) { - -@@ -944,16 +1101,15 @@ static int save_context(Context *context, const struct iovec_wrapper *iovw) { - struct iovec *iovec = iovw->iovec + n; - - for (size_t i = 0; i < ELEMENTSOF(meta_field_names); i++) { -- char *p; -- - /* Note that these strings are NUL terminated, because we made sure that a - * trailing NUL byte is in the buffer, though not included in the iov_len - * count (see process_socket() and gather_pid_metadata_*()) */ - assert(((char*) iovec->iov_base)[iovec->iov_len] == 0); - -- p = startswith(iovec->iov_base, meta_field_names[i]); -+ const char *p = startswith(iovec->iov_base, meta_field_names[i]); - if (p) { - context->meta[i] = p; -+ context->meta_size[i] = iovec->iov_len - strlen(meta_field_names[i]); - break; - } - } -@@ -1190,6 +1346,7 @@ static int gather_pid_metadata(struct iovec_wrapper *iovw, Context *context) { - uid_t owner_uid; - pid_t pid; - char *t; -+ size_t size; - const char *p; - int r; - -@@ -1254,13 +1411,26 @@ static int gather_pid_metadata(struct iovec_wrapper *iovw, Context *context) { - (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_LIMITS=", t); - - p = procfs_file_alloca(pid, "cgroup"); -- if (read_full_virtual_file(p, &t, NULL) >=0) -+ if (read_full_virtual_file(p, &t, NULL) >= 0) - (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_CGROUP=", t); - - p = procfs_file_alloca(pid, "mountinfo"); -- if (read_full_virtual_file(p, &t, NULL) >=0) -+ if (read_full_virtual_file(p, &t, NULL) >= 0) - (void) iovw_put_string_field_free(iovw, "COREDUMP_PROC_MOUNTINFO=", t); - -+ /* We attach /proc/auxv here. ELF coredumps also contain a note for this (NT_AUXV), see elf(5). */ -+ p = procfs_file_alloca(pid, "auxv"); -+ if (read_full_virtual_file(p, &t, &size) >= 0) { -+ char *buf = malloc(strlen("COREDUMP_PROC_AUXV=") + size + 1); -+ if (buf) { -+ /* Add a dummy terminator to make save_context() happy. */ -+ *((uint8_t*) mempcpy(stpcpy(buf, "COREDUMP_PROC_AUXV="), t, size)) = '\0'; -+ (void) iovw_consume(iovw, buf, size + strlen("COREDUMP_PROC_AUXV=")); -+ } -+ -+ free(t); -+ } -+ - if (get_process_cwd(pid, &t) >= 0) - (void) iovw_put_string_field_free(iovw, "COREDUMP_CWD=", t); - --- -2.35.3 - diff --git a/systemd-v252.3+suse.40.gbf3fef9988.tar.xz b/systemd-v252.3+suse.40.gbf3fef9988.tar.xz deleted file mode 100644 index a630a377..00000000 --- a/systemd-v252.3+suse.40.gbf3fef9988.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4274c52c308874f73756af1fe91d0cf35ab72112f6ba593399398eddd17cc0c4 -size 8040380 diff --git a/systemd-v252.4+suse.44.g5a506d73bd.tar.xz b/systemd-v252.4+suse.44.g5a506d73bd.tar.xz new file mode 100644 index 00000000..0421d76b --- /dev/null +++ b/systemd-v252.4+suse.44.g5a506d73bd.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2c897cd9b3d3b7ba9fdb5600ddb2f9aff285abc479f190bbbdcec8ca37c95b8b +size 8042788 diff --git a/systemd.changes b/systemd.changes index 7d06424f..cd0000d2 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,32 @@ +------------------------------------------------------------------- +Fri Jan 6 10:10:37 UTC 2023 - Franck Bui + +- Add 5000-rules-add-missing-line-continuation.patch until commit + de8409ac43f6e4596de4cecce8dbbb5f1f2a18b1 is backported to the v252 stable + tree. + +------------------------------------------------------------------- +Wed Dec 21 07:31:38 UTC 2022 - Franck Bui + +- Import commit 5a506d73bde7ba9261985f8e9ce084044a519432 (merge of v252.4) + + It includes the following fixes: + + 9b75a3d050 coredump: do not allow user to access coredumps with changed uid/gid/capabilities (bsc#1205000 CVE-2022-4415) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/bf3fef99886bd977a1c7a51d20087bc8977fff44...5a506d73bde7ba9261985f8e9ce084044a519432 + + Additionally, it also includes the following backports: + + - 20ca3155c5 localed: reload PID1 configuration after modifying /etc/locale.conf + - 3538c202fd test: update TEST-73-LOCALE to define several locale settings in initial PID1 environment + +- Drop 5000-coredump-adjust-whitespace.patch + 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch + + They are part of v252.4. + ------------------------------------------------------------------- Mon Dec 19 07:50:15 UTC 2022 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 4037f598..71f0d042 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,7 +1,7 @@ # # spec file # -# Copyright (c) 2022 SUSE LLC +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,7 +19,7 @@ %global flavor @BUILD_FLAVOR@%{nil} %define min_kernel_version 4.5 -%define archive_version +suse.40.gbf3fef9988 +%define archive_version +suse.44.g5a506d73bd %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: 252.3 +Version: 252.4 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -216,8 +216,7 @@ Patch1000: 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch # very few cases, some stuff might be broken in upstream and need to be fixed # quickly. But even in these cases, the patches are temporary and should be # removed as soon as a fix is merged by upstream. -Patch5000: 5000-coredump-adjust-whitespace.patch -Patch5001: 5001-coredump-do-not-allow-user-to-access-coredumps-with-.patch +Patch5000: 5000-rules-add-missing-line-continuation.patch %description Systemd is a system and service manager, compatible with SysV and LSB From 54c156c423b7f16ef7eaaad3e66e74908529455e8c6ebbc05d0ca5b45ea7fbbd Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 25 Jan 2023 16:42:40 +0000 Subject: [PATCH 119/124] Accepting request 1060655 from Base:System - Drop 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch It's no more necessary since util-linux 2.38 has been released in Factory. - Make sure we apply the presets on units shipped by systemd package OBS-URL: https://build.opensuse.org/request/show/1060655 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=377 --- ...-Pass-tty-to-use-by-agetty-via-stdin.patch | 90 --------------- systemd.changes | 12 ++ systemd.spec | 106 +++++++++--------- 3 files changed, 68 insertions(+), 140 deletions(-) delete mode 100644 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch diff --git a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch b/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch deleted file mode 100644 index 9100a4e9..00000000 --- a/1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 9e41b33e4e0d0fcc1dba654b485d6f5238e71ea8 Mon Sep 17 00:00:00 2001 -From: Franck Bui -Date: Thu, 17 Mar 2022 11:35:33 +0100 -Subject: [PATCH 8/8] Revert "getty: Pass tty to use by agetty via stdin" - -This reverts commit b4bf9007cbee7dc0b1356897344ae2a7890df84c. ---- - units/console-getty.service.in | 4 +--- - units/container-getty@.service.in | 4 +--- - units/getty@.service.in | 4 +--- - units/serial-getty@.service.in | 4 +--- - 4 files changed, 4 insertions(+), 12 deletions(-) - -diff --git a/units/console-getty.service.in b/units/console-getty.service.in -index 606b7dbe16..54fd7c292d 100644 ---- a/units/console-getty.service.in -+++ b/units/console-getty.service.in -@@ -22,12 +22,10 @@ ConditionPathExists=/dev/console - [Service] - # The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), - # followed by '--' for safety, and then the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud - 115200,38400,9600 $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear --keep-baud console 115200,38400,9600 $TERM - Type=idle - Restart=always - UtmpIdentifier=cons --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/console - TTYReset=yes - TTYVHangup=yes -diff --git a/units/container-getty@.service.in b/units/container-getty@.service.in -index 8d7e20d5ec..5dc75f769e 100644 ---- a/units/container-getty@.service.in -+++ b/units/container-getty@.service.in -@@ -27,13 +27,11 @@ Before=rescue.service - [Service] - # The '-o' option value tells agetty to replace 'login' arguments with an option to preserve environment (-p), - # followed by '--' for safety, and then the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear pts/%I $TERM - Type=idle - Restart=always - RestartSec=0 - UtmpIdentifier=pts/%I --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/pts/%I - TTYReset=yes - TTYVHangup=yes -diff --git a/units/getty@.service.in b/units/getty@.service.in -index 21d66f9367..78deb7cffe 100644 ---- a/units/getty@.service.in -+++ b/units/getty@.service.in -@@ -38,13 +38,11 @@ ConditionPathExists=/dev/tty0 - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear - $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --noclear %I $TERM - Type=idle - Restart=always - RestartSec=0 - UtmpIdentifier=%I --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/%I - TTYReset=yes - TTYVHangup=yes -diff --git a/units/serial-getty@.service.in b/units/serial-getty@.service.in -index 2433124c55..bb7af3105d 100644 ---- a/units/serial-getty@.service.in -+++ b/units/serial-getty@.service.in -@@ -33,12 +33,10 @@ Before=rescue.service - # The '-o' option value tells agetty to replace 'login' arguments with an - # option to preserve environment (-p), followed by '--' for safety, and then - # the entered username. --ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 - $TERM -+ExecStart=-/sbin/agetty -o '-p -- \\u' --keep-baud 115200,57600,38400,9600 %I $TERM - Type=idle - Restart=always - UtmpIdentifier=%I --StandardInput=tty --StandardOutput=tty - TTYPath=/dev/%I - TTYReset=yes - TTYVHangup=yes --- -2.35.3 - diff --git a/systemd.changes b/systemd.changes index cd0000d2..7940f4e3 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jan 24 13:19:01 UTC 2023 - Franck Bui + +- Drop 1000-Revert-getty-Pass-tty-to-use-by-agetty-via-stdin.patch + + It's no more necessary since util-linux 2.38 has been released in Factory. + +------------------------------------------------------------------- +Mon Jan 23 10:48:30 UTC 2023 - Franck Bui + +- Make sure we apply the presets on units shipped by systemd package + ------------------------------------------------------------------- Fri Jan 6 10:10:37 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 71f0d042..cdcc6532 100644 --- a/systemd.spec +++ b/systemd.spec @@ -208,9 +208,6 @@ Patch8: 0008-sysv-generator-translate-Required-Start-into-a-Wants.patch Patch10: 0001-conf-parser-introduce-early-drop-ins.patch 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 - # Patches listed below are put in quarantine. Normally all changes must go to # upstream first and then are cherry-picked in the SUSE git repository. But for # very few cases, some stuff might be broken in upstream and need to be fixed @@ -959,11 +956,16 @@ find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %find_lang systemd %endif -# Build of installation images uses a hard coded list of packages with a %%pre -# that needs to be run during the build. systemd is one of them so keep the -# section even if it's empty. +# Don't drop %%pre section even if it becomes empty: the build process of +# installation images uses a hardcoded list of packages with a %%pre that needs +# to be run during the build and complains if it can't find one. %pre -: +# Units listed below can be enabled at installation according to their preset +# setting. +%systemd_pre machines.target +%systemd_pre remote-fs.target +%systemd_pre getty@.service +%systemd_pre systemd-timesyncd.service %post # Make /etc/machine-id an empty file during package installation. On the first @@ -1018,11 +1020,11 @@ fi %journal_catalog_update %tmpfiles_create -# Create default config in /etc at first install. -# Later package updates should not overwrite these settings. -%systemd_post getty@.service +# Units listed below can be enabled at installation accoding to their preset +# setting. %systemd_post machines.target %systemd_post remote-fs.target +%systemd_post getty@.service %systemd_post systemd-timesyncd.service # v228 wrongly set world writable suid root permissions on timestamp files used @@ -1069,6 +1071,8 @@ fi # Avoid restarting logind until fixed upstream (issue #1163) %pre -n udev%{?mini} +# Units listed below can be enabled at installation accoding to their preset +# setting. %systemd_pre remote-cryptsetup.target %systemd_pre systemd-pstore.service @@ -1086,6 +1090,8 @@ fi %tmpfiles_create systemd-pstore.conf +# Units listed below can be enabled at installation accoding to their preset +# setting. %systemd_post remote-cryptsetup.target %systemd_post systemd-pstore.service @@ -1162,107 +1168,107 @@ fi %if %{with journal_remote} %pre journal-remote -%service_add_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_add_pre systemd-journal-remote.socket systemd-journal-remote.service -%service_add_pre systemd-journal-upload.service +%systemd_pre systemd-journal-gatewayd.socket systemd-journal-gatewayd.service +%systemd_pre systemd-journal-remote.socket systemd-journal-remote.service +%systemd_pre systemd-journal-upload.service %post journal-remote # Assume that all files shipped by systemd-journal-remove are owned by root. %sysusers_create systemd-remote.conf -%service_add_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_add_post systemd-journal-remote.socket systemd-journal-remote.service -%service_add_post systemd-journal-upload.service +%systemd_post systemd-journal-gatewayd.socket systemd-journal-gatewayd.service +%systemd_post systemd-journal-remote.socket systemd-journal-remote.service +%systemd_post systemd-journal-upload.service %preun journal-remote -%service_del_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_del_preun systemd-journal-remote.socket systemd-journal-remote.service -%service_del_preun systemd-journal-upload.service +%systemd_preun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service +%systemd_preun systemd-journal-remote.socket systemd-journal-remote.service +%systemd_preun systemd-journal-upload.service %postun journal-remote -%service_del_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service -%service_del_postun systemd-journal-remote.socket systemd-journal-remote.service -%service_del_postun systemd-journal-upload.service +%systemd_postun systemd-journal-gatewayd.socket systemd-journal-gatewayd.service +%systemd_postun systemd-journal-remote.socket systemd-journal-remote.service +%systemd_postun systemd-journal-upload.service %endif %if %{with networkd} || %{with resolved} %pre network %if %{with networkd} -%service_add_pre systemd-networkd.service -%service_add_pre systemd-networkd-wait-online.service +%systemd_pre systemd-networkd.service +%systemd_pre systemd-networkd-wait-online.service %endif %if %{with resolved} -%service_add_pre systemd-resolved.service +%systemd_pre systemd-resolved.service %endif %post network %if %{with networkd} %sysusers_create systemd-network.conf %tmpfiles_create systemd-network.conf -%service_add_post systemd-networkd.service -%service_add_post systemd-networkd-wait-online.service +%systemd_post systemd-networkd.service +%systemd_post systemd-networkd-wait-online.service %endif %if %{with resolved} %ldconfig %sysusers_create systemd-resolve.conf -%service_add_post systemd-resolved.service +%systemd_post systemd-resolved.service %endif %preun network %if %{with networkd} -%service_del_preun systemd-networkd.service -%service_del_preun systemd-networkd-wait-online.service +%systemd_preun systemd-networkd.service +%systemd_preun systemd-networkd-wait-online.service %endif %if %{with resolved} -%service_del_preun systemd-resolved.service +%systemd_preun systemd-resolved.service %endif %postun network %if %{with networkd} -%service_del_postun systemd-networkd.service -%service_del_postun systemd-networkd-wait-online.service +%systemd_postun systemd-networkd.service +%systemd_postun systemd-networkd-wait-online.service %endif %if %{with resolved} %ldconfig -%service_del_postun systemd-resolved.service +%systemd_postun systemd-resolved.service %endif %endif %if %{with portabled} %pre portable -%service_add_pre systemd-portabled.service +%systemd_pre systemd-portabled.service %post portable %tmpfiles_create portables.conf -%service_add_post systemd-portabled.service +%systemd_post systemd-portabled.service %preun portable -%service_del_preun systemd-portabled.service +%systemd_preun systemd-portabled.service %postun portable -%service_del_postun systemd-portabled.service +%systemd_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 +%systemd_pre systemd-homed.service +%systemd_pre systemd-oomd.service systemd-oomd.socket +%systemd_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 +%systemd_post systemd-homed.service +%systemd_post systemd-oomd.service systemd-oomd.socket +%systemd_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 +%systemd_preun systemd-homed.service +%systemd_preun systemd-oomd.service systemd-oomd.socket +%systemd_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 +%systemd_postun systemd-homed.service +%systemd_postun systemd-oomd.service systemd-oomd.socket +%systemd_postun systemd-userdbd.service systemd-userdbd.socket %endif %files From 688f3b3091ce2e81c9683d741561df810d4e493965bad19752f01e7c6aecd166 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 31 Jan 2023 15:08:28 +0000 Subject: [PATCH 120/124] Accepting request 1062012 from Base:System - Import commit d87834a33444b7163e741e1089e82b44af663808 (merge of v252.5) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/5a506d73bde7ba9261985f8e9ce084044a519432...d87834a33444b7163e741e1089e82b44af663808 - Move the bash completion support for systemd-cryptenroll in udev. - systemd-testsuite: move the integration tests in a dedicated sub directory. - machines.target belongs to systemd-container, do its init/cleanup steps from the scriptlets of this sub-package. OBS-URL: https://build.opensuse.org/request/show/1062012 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=378 --- files.systemd | 1 - files.udev | 1 + systemd-v252.4+suse.44.g5a506d73bd.tar.xz | 3 -- systemd-v252.5+suse.46.gd87834a334.tar.xz | 3 ++ systemd.changes | 24 ++++++++++ systemd.spec | 54 ++++++++++++++--------- 6 files changed, 60 insertions(+), 26 deletions(-) delete mode 100644 systemd-v252.4+suse.44.g5a506d73bd.tar.xz create mode 100644 systemd-v252.5+suse.46.gd87834a334.tar.xz diff --git a/files.systemd b/files.systemd index 36178f84..1bc8da22 100644 --- a/files.systemd +++ b/files.systemd @@ -137,7 +137,6 @@ %{_datadir}/bash-completion/completions/systemd-cat %{_datadir}/bash-completion/completions/systemd-cgls %{_datadir}/bash-completion/completions/systemd-cgtop -%{_datadir}/bash-completion/completions/systemd-cryptenroll %{_datadir}/bash-completion/completions/systemd-delta %{_datadir}/bash-completion/completions/systemd-detect-virt %{_datadir}/bash-completion/completions/systemd-id128 diff --git a/files.udev b/files.udev index daf66aa9..94571214 100644 --- a/files.udev +++ b/files.udev @@ -28,6 +28,7 @@ %{_bindir}/systemd-hwdb %{_bindir}/udevadm %if %{without bootstrap} +%{_datadir}/bash-completion/completions/systemd-cryptenroll %{_datadir}/bash-completion/completions/udevadm %endif %{_datadir}/pkgconfig/udev.pc diff --git a/systemd-v252.4+suse.44.g5a506d73bd.tar.xz b/systemd-v252.4+suse.44.g5a506d73bd.tar.xz deleted file mode 100644 index 0421d76b..00000000 --- a/systemd-v252.4+suse.44.g5a506d73bd.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2c897cd9b3d3b7ba9fdb5600ddb2f9aff285abc479f190bbbdcec8ca37c95b8b -size 8042788 diff --git a/systemd-v252.5+suse.46.gd87834a334.tar.xz b/systemd-v252.5+suse.46.gd87834a334.tar.xz new file mode 100644 index 00000000..8fe341c2 --- /dev/null +++ b/systemd-v252.5+suse.46.gd87834a334.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:bb506e9ea2783c8dff075ecfd6d253fd397d2bd017f928903aff0cd6f272c9e1 +size 8050412 diff --git a/systemd.changes b/systemd.changes index 7940f4e3..c99d8994 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,27 @@ +------------------------------------------------------------------- +Mon Jan 30 08:39:24 UTC 2023 - Franck Bui + +- Import commit d87834a33444b7163e741e1089e82b44af663808 (merge of v252.5) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/5a506d73bde7ba9261985f8e9ce084044a519432...d87834a33444b7163e741e1089e82b44af663808 + +------------------------------------------------------------------- +Thu Jan 26 16:30:41 UTC 2023 - Franck Bui + +- Move the bash completion support for systemd-cryptenroll in udev. + +------------------------------------------------------------------- +Thu Jan 26 16:13:43 UTC 2023 - Franck Bui + +- systemd-testsuite: move the integration tests in a dedicated sub directory. + +------------------------------------------------------------------- +Thu Jan 26 14:02:11 UTC 2023 - Franck Bui + +- machines.target belongs to systemd-container, do its init/cleanup steps from + the scriptlets of this sub-package. + ------------------------------------------------------------------- Tue Jan 24 13:19:01 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index cdcc6532..f3627169 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.44.g5a506d73bd +%define archive_version +suse.46.gd87834a334 %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: 252.4 +Version: 252.5 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -557,24 +557,24 @@ Requires: systemd-portable Requires: xz %description testsuite -This package contains the unit tests as well as the extended -testsuite. The unit tests are used to check various internal functions -used by systemd whereas the extended testsuite is used to test various -functionalities of systemd and all its components. +This package contains the unit tests as well as the extended testsuite. The unit +tests are used to check various internal functions used by systemd whereas the +extended testsuite is used to test various functionalities of systemd and all +its components. -Note that the extended testsuite only works with UID=0. +Note that you need root privileges to run the extended testsuite. Run the following python script to run all unit tests at once: $ %{_testsuitedir}/run-unit-tests.py To run the full extended testsuite do the following: -$ NO_BUILD=1 TEST_NESTED_VM=1 %{_testsuitedir}/test/run-integration-tests.sh +$ NO_BUILD=1 TEST_NESTED_VM=1 %{_testsuitedir}/integration-tests/run-integration-tests.sh Or to run one specific integration test: -$ NO_BUILD=1 TEST_NESTED_VM=1 make -C %{_testsuitedir}/test/TEST-01-BASIC clean setup run +$ NO_BUILD=1 TEST_NESTED_VM=1 make -C %{_testsuitedir}/integration-tests/TEST-01-BASIC clean setup run -For more details on the available options to run the extended -testsuite, please refer to %{_testsuitedir}/test/README.testsuite. +For more details on the available options to run the extended testsuite, please +refer to %{_testsuitedir}/integration-tests/README.testsuite. %endif %if %{with experimental} @@ -942,14 +942,18 @@ rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %if %{with testsuite} -cp -a test %{buildroot}%{_testsuitedir}/ -# When the tests are installed, the effective testdata directory is in -# %{_testsuitedir}, the other one, which is actually a symlink, is only useful -# when the tests are run directly from the source. -rm %{buildroot}%{_testsuitedir}/test/testdata -# kbd-model-map became a dangling symlink, drop it. -rm %{buildroot}%{_testsuitedir}/test/test-keymap-util/kbd-model-map -find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; +# -Dinstall_test took care of installing the unit tests only (those in +# src/tests) and testdata directory. Here we copy the integration tests +# including also all related scripts used to prepare and run the integration +# tests in dedicated VMs. During the copy, all symlinks are replaced by the +# files they point to making sure we won't try to embed dangling symlinks. +mkdir -p %{buildroot}%{_testsuitedir}/integration-tests +tar -cO \ + --dereference \ + --exclude=testdata \ + --exclude-vcs \ + --exclude-vcs-ignores \ + -C test/ . | tar -xC %{buildroot}%{_testsuitedir}/integration-tests %endif %if %{without bootstrap} @@ -962,7 +966,6 @@ find %{buildroot}%{_testsuitedir}/ -name .git\* -exec rm -fr {} \; %pre # Units listed below can be enabled at installation according to their preset # setting. -%systemd_pre machines.target %systemd_pre remote-fs.target %systemd_pre getty@.service %systemd_pre systemd-timesyncd.service @@ -1022,7 +1025,6 @@ fi # Units listed below can be enabled at installation accoding to their preset # setting. -%systemd_post machines.target %systemd_post remote-fs.target %systemd_post getty@.service %systemd_post systemd-timesyncd.service @@ -1136,7 +1138,11 @@ rm -f /etc/udev/rules.d/{20,55,65}-cdrom.rules %postun -n libudev%{?mini}1 -p %ldconfig %postun -n libsystemd0%{?mini} -p %ldconfig +%pre container +%systemd_pre machines.target + %post container +%systemd_post machines.target %tmpfiles_create systemd-nspawn.conf %if %{with machined} %ldconfig @@ -1157,7 +1163,11 @@ if [ $1 -gt 1 ]; then %{_prefix}/lib/systemd/scripts/fix-machines-btrfs-subvol.sh || : fi +%preun container +%systemd_preun machines.target + %postun container +%systemd_postun machines.target %ldconfig %endif @@ -1381,7 +1391,7 @@ fi %if %{with testsuite} %files testsuite %defattr(-,root,root) -%doc %{_testsuitedir}/test/README.testsuite +%doc %{_testsuitedir}/integration-tests/README.testsuite %{_testsuitedir} %endif From c34d91ebee1e261347d0e8cd989f5dbe3747b0aef08c87ce0eaf0b7d2fa69a4a Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Thu, 2 Mar 2023 22:02:53 +0000 Subject: [PATCH 121/124] Accepting request 1068038 from Base:System - Import commit 8e0a8094b8bbc442d262795b85ac57a37264c5fe (merge of v252.6) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/d87834a33444b7163e741e1089e82b44af663808...8e0a8094b8bbc442d262795b85ac57a37264c5fe - Drop 5000-rules-add-missing-line-continuation.patch, it's part of v252.6. - aaa_base has stop providing /etc/sysctl.conf, cope with this change so the compat symlink we provide is not dangling during the build. - Drop build requirement on libpci, it's not more needed since udev hwdb was introduced 11 years ago. - Conditionalize the use of /lib/modprobe.d only on systems with split usr support enabled (i.e. SLE). OBS-URL: https://build.opensuse.org/request/show/1068038 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=379 --- ...-rules-add-missing-line-continuation.patch | 28 ------------------ files.network | 1 + files.systemd | 8 +++++ files.udev | 1 + files.uefi-boot | 2 +- systemd-v252.5+suse.46.gd87834a334.tar.xz | 3 -- systemd-v252.6+suse.48.g8e0a8094b8.tar.xz | 3 ++ systemd.changes | 25 ++++++++++++++++ systemd.spec | 29 ++++++++----------- 9 files changed, 51 insertions(+), 49 deletions(-) delete mode 100644 5000-rules-add-missing-line-continuation.patch delete mode 100644 systemd-v252.5+suse.46.gd87834a334.tar.xz create mode 100644 systemd-v252.6+suse.48.g8e0a8094b8.tar.xz diff --git a/5000-rules-add-missing-line-continuation.patch b/5000-rules-add-missing-line-continuation.patch deleted file mode 100644 index a0cfa7dd..00000000 --- a/5000-rules-add-missing-line-continuation.patch +++ /dev/null @@ -1,28 +0,0 @@ -From de8409ac43f6e4596de4cecce8dbbb5f1f2a18b1 Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Wed, 21 Dec 2022 17:32:56 +0900 -Subject: [PATCH 5000/5000] rules: add missing line continuation - -Fixes a bug introduced by 953c928c24455744d5534679998d129b947a5e04. - -Fixes #25811. ---- - rules.d/60-evdev.rules | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/rules.d/60-evdev.rules b/rules.d/60-evdev.rules -index 15483101e7..c97cdecb58 100644 ---- a/rules.d/60-evdev.rules -+++ b/rules.d/60-evdev.rules -@@ -6,7 +6,7 @@ KERNEL!="event*", GOTO="evdev_end" - # Execute the match patterns below, from least-to-most specific. - - # Device matching the modalias string (bustype, vendor, product, version, other properties) --IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", -+IMPORT{builtin}="hwdb --subsystem=input --lookup-prefix=evdev:", \ - ENV{.HAVE_HWDB_PROPERTIES}="1" - - # AT keyboard matching by the machine's DMI data --- -2.35.3 - diff --git a/files.network b/files.network index d3c3715c..e1588c4b 100644 --- a/files.network +++ b/files.network @@ -28,6 +28,7 @@ %{_mandir}/man8/systemd-networkd.service.8.gz %{_systemd_util_dir}/network/80-6rd-tunnel.network %{_systemd_util_dir}/network/80-container-host0.network +%{_systemd_util_dir}/network/80-container-vb.network %{_systemd_util_dir}/network/80-container-ve.network %{_systemd_util_dir}/network/80-container-vz.network %{_systemd_util_dir}/network/80-ethernet.network.example diff --git a/files.systemd b/files.systemd index 1bc8da22..b7b53f15 100644 --- a/files.systemd +++ b/files.systemd @@ -82,6 +82,7 @@ %doc %{_sysctldir}/README %doc %{_sysusersdir}/README %doc %{_tmpfilesdir}/README +%exclude %{_sysconfdir}/sysctl.conf %ghost %attr(0444,root,root) %config(noreplace) %{_sysconfdir}/machine-id %ghost %attr(0600,root,root) %{_localstatedir}/lib/systemd/random-seed %ghost %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/00-keyboard.conf @@ -139,9 +140,11 @@ %{_datadir}/bash-completion/completions/systemd-cgtop %{_datadir}/bash-completion/completions/systemd-delta %{_datadir}/bash-completion/completions/systemd-detect-virt +%{_datadir}/bash-completion/completions/systemd-dissect %{_datadir}/bash-completion/completions/systemd-id128 %{_datadir}/bash-completion/completions/systemd-path %{_datadir}/bash-completion/completions/systemd-run +%{_datadir}/bash-completion/completions/systemd-sysext %{_datadir}/bash-completion/completions/timedatectl %endif # dbus introspection data for code generators: https://github.com/systemd/systemd/pull/20294 @@ -212,12 +215,17 @@ %{_journalcatalogdir}/systemd.be@latin.catalog %{_journalcatalogdir}/systemd.bg.catalog %{_journalcatalogdir}/systemd.catalog +%{_journalcatalogdir}/systemd.da.catalog %{_journalcatalogdir}/systemd.de.catalog %{_journalcatalogdir}/systemd.fr.catalog +%{_journalcatalogdir}/systemd.hr.catalog +%{_journalcatalogdir}/systemd.hu.catalog %{_journalcatalogdir}/systemd.it.catalog +%{_journalcatalogdir}/systemd.ko.catalog %{_journalcatalogdir}/systemd.pl.catalog %{_journalcatalogdir}/systemd.pt_BR.catalog %{_journalcatalogdir}/systemd.ru.catalog +%{_journalcatalogdir}/systemd.sr.catalog %{_journalcatalogdir}/systemd.zh_CN.catalog %{_journalcatalogdir}/systemd.zh_TW.catalog %if %{without bootstrap} diff --git a/files.udev b/files.udev index 94571214..1ea1a437 100644 --- a/files.udev +++ b/files.udev @@ -165,6 +165,7 @@ %{_udevrulesdir}/60-drm.rules %{_udevrulesdir}/60-evdev.rules %{_udevrulesdir}/60-fido-id.rules +%{_udevrulesdir}/60-infiniband.rules %{_udevrulesdir}/60-input-id.rules %{_udevrulesdir}/60-persistent-alsa.rules %{_udevrulesdir}/60-persistent-input.rules diff --git a/files.uefi-boot b/files.uefi-boot index a50867c4..75c3d0c4 100644 --- a/files.uefi-boot +++ b/files.uefi-boot @@ -31,7 +31,7 @@ %{_prefix}/lib/kernel/install.conf %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install -# These are part of the very few exceptions where glob pattern is allowd. +# These are the few exceptions where glob pattern is allowed. %{_systemd_util_dir}/boot/efi/linux*.efi.stub %{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/systemd-boot*.efi diff --git a/systemd-v252.5+suse.46.gd87834a334.tar.xz b/systemd-v252.5+suse.46.gd87834a334.tar.xz deleted file mode 100644 index 8fe341c2..00000000 --- a/systemd-v252.5+suse.46.gd87834a334.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bb506e9ea2783c8dff075ecfd6d253fd397d2bd017f928903aff0cd6f272c9e1 -size 8050412 diff --git a/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz b/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz new file mode 100644 index 00000000..a2f346c8 --- /dev/null +++ b/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:58501d3c453cc1c3363dd0263190d9514b34b4392f1ecaa32e9f7a2c715fa8d9 +size 8090264 diff --git a/systemd.changes b/systemd.changes index c99d8994..804dcfce 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,28 @@ +------------------------------------------------------------------- +Mon Feb 27 08:43:27 UTC 2023 - Franck Bui + +- Import commit 8e0a8094b8bbc442d262795b85ac57a37264c5fe (merge of v252.6) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/d87834a33444b7163e741e1089e82b44af663808...8e0a8094b8bbc442d262795b85ac57a37264c5fe + +- Drop 5000-rules-add-missing-line-continuation.patch, it's part of v252.6. + +- aaa_base has stop providing /etc/sysctl.conf, cope with this change so the + compat symlink we provide is not dangling during the build. + +------------------------------------------------------------------- +Fri Feb 17 11:06:41 UTC 2023 - Franck Bui + +- Drop build requirement on libpci, it's not more needed since udev hwdb was + introduced 11 years ago. + +------------------------------------------------------------------- +Tue Feb 7 08:44:32 UTC 2023 - Franck Bui + +- Conditionalize the use of /lib/modprobe.d only on systems with split usr + support enabled (i.e. SLE). + ------------------------------------------------------------------- Mon Jan 30 08:39:24 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index f3627169..6d1c9c40 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.46.gd87834a334 +%define archive_version +suse.48.g8e0a8094b8 %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: 252.5 +Version: 252.6 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -114,7 +114,6 @@ BuildRequires: python3-jinja2 BuildRequires: suse-module-tools >= 12.4 BuildRequires: systemd-rpm-macros BuildRequires: pkgconfig(blkid) >= 2.26 -BuildRequires: pkgconfig(libpci) >= 3 %if %{with bootstrap} #!BuildIgnore: dbus-1 @@ -213,7 +212,6 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.patch # very few cases, some stuff might be broken in upstream and need to be fixed # quickly. But even in these cases, the patches are temporary and should be # removed as soon as a fix is merged by upstream. -Patch5000: 5000-rules-add-missing-line-continuation.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -749,7 +747,7 @@ rm %{buildroot}%{_mandir}/man1/resolvconf.1* %endif %if %{with sysvcompat} -install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install +install -m0755 -D %{SOURCE4} %{buildroot}/%{_systemd_util_dir}/systemd-sysv-install %endif mkdir -p % %{buildroot}%{_sysconfdir}/systemd/network @@ -780,22 +778,19 @@ ln -s ../usr/bin/systemctl %{buildroot}/sbin/poweroff ln -s ../usr/bin/systemctl %{buildroot}/sbin/telinit ln -s ../usr/bin/systemctl %{buildroot}/sbin/runlevel %endif +# kmod keeps insisting on using /lib/modprobe.d only. +mkdir -p %{buildroot}%{_modprobedir} +mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/ %endif # Make sure we don't ship static enablement symlinks in /etc during # installation, presets should be honoured instead. -rm -rf %{buildroot}/etc/systemd/system/*.target.{requires,wants} -rm -f %{buildroot}/etc/systemd/system/default.target +rm -rf %{buildroot}%{_sysconfdir}/systemd/system/*.target.{requires,wants} +rm -f %{buildroot}%{_sysconfdir}/systemd/system/default.target # Replace upstream systemd-user with the openSUSE one. install -m0644 -D --target-directory=%{buildroot}%{_pam_vendordir} %{SOURCE2} -# kmod keeps insisting on using /lib on SLE. -if [ "$(realpath %{_modprobedir})" != /usr/lib/modprobe.d ]; then - mkdir -p %{buildroot}%{_modprobedir} - mv %{buildroot}/usr/lib/modprobe.d/* %{buildroot}%{_modprobedir}/ -fi - # Don't enable wall ask password service, it spams every console (bnc#747783). rm %{buildroot}%{_unitdir}/multi-user.target.wants/systemd-ask-password-wall.path @@ -812,9 +807,9 @@ mv %{buildroot}%{_datadir}/polkit-1/rules.d/systemd-networkd.rules \ %endif # Since v207 /etc/sysctl.conf is no longer parsed (commit 04bf3c1a60d82791), -# however backward compatibility is provided by -# /usr/lib/sysctl.d/99-sysctl.conf. +# however backward compatibility is provided by the following symlink. ln -s ../../../etc/sysctl.conf %{buildroot}%{_sysctldir}/99-sysctl.conf +touch %{buildroot}%{_sysconfdir}/sysctl.conf # The definitions of the basic users/groups are given by system-user package on # SUSE (bsc#1006978). @@ -827,7 +822,7 @@ rm -f %{buildroot}%{_environmentdir}/99-environment.conf # Remove README file in init.d as (SUSE) rpm requires executable files in this # directory... oh well. -rm -f %{buildroot}/etc/init.d/README +rm -f %{buildroot}%{_sysconfdir}/init.d/README # This dir must be owned (and thus created) by systemd otherwise the build # system will complain. This is odd since we simply own a ghost file in it... @@ -884,7 +879,7 @@ touch %{buildroot}%{_localstatedir}/lib/systemd/i18n-migrated %fdupes -s %{buildroot}%{_mandir} -# Make sure to disable all services by default. The Suse branding presets +# Make sure to disable all services by default. The SUSE branding presets # package takes care of defining the right policies. rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset From 61822162ec884efe374ad081b94dc81d3542daa2b927a4dbff7b2019f599b1fe Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 7 Mar 2023 15:48:32 +0000 Subject: [PATCH 122/124] Accepting request 1069558 from Base:System - Import commit d447802feee7752cd1756f8fa86ce2a6314ba24f (merge of v252.7) For a complete list of changes, visit: https://github.com/openSUSE/systemd/compare/8e0a8094b8bbc442d262795b85ac57a37264c5fe...d447802feee7752cd1756f8fa86ce2a6314ba24f - Fix return non-zero value when disabling SysVinit service(bsc#1208432) - Correct BR from python3-jinja2 to python3-Jinja2, fixes dependency resolving on older distros OBS-URL: https://build.opensuse.org/request/show/1069558 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=380 --- systemd-sysv-install | 4 ++-- systemd-v252.6+suse.48.g8e0a8094b8.tar.xz | 3 --- systemd-v252.7+suse.50.gd447802fee.tar.xz | 3 +++ systemd.changes | 19 +++++++++++++++++++ systemd.spec | 8 ++++---- 5 files changed, 28 insertions(+), 9 deletions(-) delete mode 100644 systemd-v252.6+suse.48.g8e0a8094b8.tar.xz create mode 100644 systemd-v252.7+suse.50.gd447802fee.tar.xz diff --git a/systemd-sysv-install b/systemd-sysv-install index cffe4c8f..d7900159 100644 --- a/systemd-sysv-install +++ b/systemd-sysv-install @@ -93,10 +93,10 @@ enable_initscript() { disable_initscript() { for symlink in rc*.d/[SK]*; do - [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ] && { + if [ -L $symlink ] && [ $(readlink $symlink) = "../$1" ]; then info "rm $(pwd)/$symlink" rm $symlink - } + fi done } diff --git a/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz b/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz deleted file mode 100644 index a2f346c8..00000000 --- a/systemd-v252.6+suse.48.g8e0a8094b8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:58501d3c453cc1c3363dd0263190d9514b34b4392f1ecaa32e9f7a2c715fa8d9 -size 8090264 diff --git a/systemd-v252.7+suse.50.gd447802fee.tar.xz b/systemd-v252.7+suse.50.gd447802fee.tar.xz new file mode 100644 index 00000000..0a07938e --- /dev/null +++ b/systemd-v252.7+suse.50.gd447802fee.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd9f697fdbb194da090ef87f472c1c6d05d16cfa49b3b668648ea6d3c8f177d2 +size 8089304 diff --git a/systemd.changes b/systemd.changes index 804dcfce..897181a9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Mar 6 08:40:35 UTC 2023 - Franck Bui + +- Import commit d447802feee7752cd1756f8fa86ce2a6314ba24f (merge of v252.7) + + For a complete list of changes, visit: + https://github.com/openSUSE/systemd/compare/8e0a8094b8bbc442d262795b85ac57a37264c5fe...d447802feee7752cd1756f8fa86ce2a6314ba24f + +------------------------------------------------------------------- +Tue Feb 28 02:58:20 UTC 2023 - Lidong Zhong + +- Fix return non-zero value when disabling SysVinit service(bsc#1208432) + ------------------------------------------------------------------- Mon Feb 27 08:43:27 UTC 2023 - Franck Bui @@ -11,6 +24,12 @@ Mon Feb 27 08:43:27 UTC 2023 - Franck Bui - aaa_base has stop providing /etc/sysctl.conf, cope with this change so the compat symlink we provide is not dangling during the build. +------------------------------------------------------------------- +Thu Feb 23 11:52:48 UTC 2023 - Callum Farmer + +- Correct BR from python3-jinja2 to python3-Jinja2, fixes + dependency resolving on older distros + ------------------------------------------------------------------- Fri Feb 17 11:06:41 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 6d1c9c40..75d654a5 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.48.g8e0a8094b8 +%define archive_version +suse.50.gd447802fee %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: 252.6 +Version: 252.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -108,7 +108,7 @@ BuildRequires: libcap-devel BuildRequires: libmount-devel >= 2.27.1 BuildRequires: meson >= 0.53.2 BuildRequires: pam-devel -BuildRequires: python3-jinja2 +BuildRequires: python3-Jinja2 # regenerate_initrd_post macro is expanded during build, hence this BR. Also # this macro was introduced since version 12.4. BuildRequires: suse-module-tools >= 12.4 @@ -596,7 +596,7 @@ BuildRequires: pkgconfig(openssl) %description experimental This package contains optional extra services that are considered as previews and are provided so users can do early experiments with the new features or -technologies without waiting for them to be fully supported by either upstream +technologies without waiting for them to be fully supported by both upstream and openSUSE. Please note that all services should be considered in development phase and as From 304994333280b9d2135b794db4d5a2823ab1b5e27e224630fac37bdeed681bf4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 14 Mar 2023 17:15:29 +0000 Subject: [PATCH 123/124] Accepting request 1070393 from Base:System - Add 5000-core-manager-run-generators-directly-when-we-are-in-.patch, a temporary workaround until https://github.com/dracutdevs/dracut/issues/2211 is fixed in dracut. - Upgrade to v253.1 (commit 6c327d74aa0d350482e82a247d7018559699798d) See https://github.com/openSUSE/systemd/blob/SUSE/v253/NEWS for details. * Rebased 0001-conf-parser-introduce-early-drop-ins.patch * Ship systemd-journald-audit.socket again: it can now be disabled via the usual "systemctl disable" mechanism to stop collection of audit messages. Note that it's handled by the preset logic, which turns it off by default. * TEST_06_SELINUX needs selinux-policy-devel. OBS-URL: https://build.opensuse.org/request/show/1070393 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=381 --- ...conf-parser-introduce-early-drop-ins.patch | 32 +++++++++-------- ...-generators-directly-when-we-are-in-.patch | 34 +++++++++++++++++++ files.devel | 11 ++++++ files.experimental | 11 ++++++ files.systemd | 9 +++-- files.udev | 4 +-- files.uefi-boot | 7 ++-- systemd-v252.7+suse.50.gd447802fee.tar.xz | 3 -- systemd-v253.1.tar.xz | 3 ++ systemd.changes | 23 +++++++++++++ systemd.spec | 28 +++++++-------- 11 files changed, 124 insertions(+), 41 deletions(-) create mode 100644 5000-core-manager-run-generators-directly-when-we-are-in-.patch delete mode 100644 systemd-v252.7+suse.50.gd447802fee.tar.xz create mode 100644 systemd-v253.1.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index 0d06f860..47f4da7c 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,7 +1,7 @@ -From 288be40eb94ddc1d549a98556baea71d20df224f Mon Sep 17 00:00:00 2001 +From 77391d9baf86f10daf210ccf5527e0155a33fc73 Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 -Subject: [PATCH 1/8] conf-parser: introduce 'early' drop-ins +Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -62,14 +62,14 @@ drop this feature at any time. Fixes: #2121 --- src/shared/conf-parser.c | 55 ++++++++++-- - src/test/test-conf-parser.c | 164 ++++++++++++++++++++++++++++++++++++ - 2 files changed, 214 insertions(+), 5 deletions(-) + src/test/test-conf-parser.c | 166 +++++++++++++++++++++++++++++++++++- + 2 files changed, 215 insertions(+), 6 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 5cb41a39da..86dc1c95f6 100644 +index 29051ca0e3..72935030ea 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -478,6 +478,7 @@ int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, const s +@@ -477,6 +477,7 @@ int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, const s static int config_parse_many_files( const char* const* conf_files, @@ -77,7 +77,7 @@ index 5cb41a39da..86dc1c95f6 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -496,6 +497,20 @@ static int config_parse_many_files( +@@ -495,6 +496,20 @@ static int config_parse_many_files( return -ENOMEM; } @@ -98,7 +98,7 @@ index 5cb41a39da..86dc1c95f6 100644 /* First read the first found main config file. */ STRV_FOREACH(fn, conf_files) { r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); -@@ -534,6 +549,27 @@ static int config_parse_many_files( +@@ -533,6 +548,27 @@ static int config_parse_many_files( return 0; } @@ -126,7 +126,7 @@ index 5cb41a39da..86dc1c95f6 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -545,15 +581,19 @@ int config_parse_many_nulstr( +@@ -544,15 +580,19 @@ int config_parse_many_nulstr( void *userdata, Hashmap **ret_stats_by_path) { @@ -149,7 +149,7 @@ index 5cb41a39da..86dc1c95f6 100644 ret_stats_by_path); } -@@ -591,6 +631,7 @@ int config_parse_many( +@@ -590,6 +630,7 @@ int config_parse_many( Hashmap **ret_stats_by_path, char ***ret_dropin_files) { @@ -157,7 +157,7 @@ index 5cb41a39da..86dc1c95f6 100644 _cleanup_strv_free_ char **files = NULL; int r; -@@ -603,12 +644,16 @@ int config_parse_many( +@@ -602,12 +643,16 @@ int config_parse_many( if (r < 0) return r; @@ -177,20 +177,22 @@ index 5cb41a39da..86dc1c95f6 100644 return 0; } diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 8c27dcac3f..745e4a127a 100644 +index 0acb4131b5..96a52e759f 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c -@@ -5,6 +5,9 @@ +@@ -5,7 +5,10 @@ #include "fs-util.h" #include "log.h" #include "macro.h" +-#include "string-util.h" +#include "mkdir.h" ++#include "nulstr-util.h" +#include "path-util.h" +#include "rm-rf.h" - #include "string-util.h" #include "strv.h" #include "tests.h" -@@ -391,4 +394,165 @@ TEST(config_parse) { + #include "tmpfile-util.h" +@@ -390,4 +393,165 @@ TEST(config_parse) { test_config_parse_one(i, config_file[i]); } diff --git a/5000-core-manager-run-generators-directly-when-we-are-in-.patch b/5000-core-manager-run-generators-directly-when-we-are-in-.patch new file mode 100644 index 00000000..20c0b682 --- /dev/null +++ b/5000-core-manager-run-generators-directly-when-we-are-in-.patch @@ -0,0 +1,34 @@ +From 9d0f728f65e6c3ad586e276c1ed3c2cd8cc944be Mon Sep 17 00:00:00 2001 +From: Yu Watanabe +Date: Mon, 20 Feb 2023 12:00:30 +0900 +Subject: [PATCH 5000/5000] core/manager: run generators directly when we are + in initrd + +Some initrd system write files at ourside of /run, /etc, or other +allowed places. This is a kind of workaround, but in most cases, such +sandboxing is not necessary as the filesystem is on ramfs when we are in +initrd. + +Fixes #26488. +--- + src/core/manager.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/core/manager.c b/src/core/manager.c +index 380a4e30d7..6135205761 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -3822,8 +3822,8 @@ static int manager_run_generators(Manager *m) { + /* If we are the system manager, we fork and invoke the generators in a sanitized mount namespace. If + * we are the user manager, let's just execute the generators directly. We might not have the + * necessary privileges, and the system manager has already mounted /tmp/ and everything else for us. +- */ +- if (MANAGER_IS_USER(m)) { ++ * If we are in initrd, let's also execute the generators directly, as we are in ramfs. */ ++ if (MANAGER_IS_USER(m) || in_initrd()) { + r = manager_execute_generators(m, paths, /* remount_ro= */ false); + goto finish; + } +-- +2.35.3 + diff --git a/files.devel b/files.devel index 2bd1c670..f9248ea5 100644 --- a/files.devel +++ b/files.devel @@ -197,6 +197,8 @@ %{_mandir}/man3/sd_bus_emit_properties_changed.3.gz %{_mandir}/man3/sd_bus_emit_properties_changed_strv.3.gz %{_mandir}/man3/sd_bus_emit_signal.3.gz +%{_mandir}/man3/sd_bus_emit_signal_to.3.gz +%{_mandir}/man3/sd_bus_emit_signal_tov.3.gz %{_mandir}/man3/sd_bus_emit_signalv.3.gz %{_mandir}/man3/sd_bus_enqueue_for_read.3.gz %{_mandir}/man3/sd_bus_error.3.gz @@ -312,6 +314,7 @@ %{_mandir}/man3/sd_bus_message_new_method_errorf.3.gz %{_mandir}/man3/sd_bus_message_new_method_return.3.gz %{_mandir}/man3/sd_bus_message_new_signal.3.gz +%{_mandir}/man3/sd_bus_message_new_signal_to.3.gz %{_mandir}/man3/sd_bus_message_open_container.3.gz %{_mandir}/man3/sd_bus_message_peek_type.3.gz %{_mandir}/man3/sd_bus_message_read.3.gz @@ -663,6 +666,14 @@ %{_mandir}/man3/sd_pid_notify.3.gz %{_mandir}/man3/sd_pid_notify_with_fds.3.gz %{_mandir}/man3/sd_pid_notifyf.3.gz +%{_mandir}/man3/sd_pidfd_get_cgroup.3.gz +%{_mandir}/man3/sd_pidfd_get_machine_name.3.gz +%{_mandir}/man3/sd_pidfd_get_owner_uid.3.gz +%{_mandir}/man3/sd_pidfd_get_session.3.gz +%{_mandir}/man3/sd_pidfd_get_slice.3.gz +%{_mandir}/man3/sd_pidfd_get_unit.3.gz +%{_mandir}/man3/sd_pidfd_get_user_slice.3.gz +%{_mandir}/man3/sd_pidfd_get_user_unit.3.gz %{_mandir}/man3/sd_seat_can_graphical.3.gz %{_mandir}/man3/sd_seat_can_tty.3.gz %{_mandir}/man3/sd_seat_get_active.3.gz diff --git a/files.experimental b/files.experimental index 6bc23ede..0cea03ba 100644 --- a/files.experimental +++ b/files.experimental @@ -27,6 +27,7 @@ %{_mandir}/man1/oomctl.1.gz %if %{with sd_boot} %{_mandir}/man1/systemd-measure.1.gz +%{_mandir}/man1/ukify.1.gz %endif %{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/homed.conf.5.gz @@ -43,6 +44,9 @@ %{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz %if %{with sd_boot} +%{_mandir}/man8/systemd-pcrfs-root.service.8.gz +%{_mandir}/man8/systemd-pcrfs@.service.8.gz +%{_mandir}/man8/systemd-pcrmachine.service.8.gz %{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz %{_mandir}/man8/systemd-pcrphase.8.gz @@ -72,9 +76,13 @@ %{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork +%if %{with sd_boot} +%{_systemd_util_dir}/ukify +%endif %{_sysusersdir}/systemd-oom.conf %if %{with sd_boot} %{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service +%{_unitdir}/sysinit.target.wants/systemd-pcrmachine.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase.service %endif @@ -83,6 +91,9 @@ %{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.socket %if %{with sd_boot} +%{_unitdir}/systemd-pcrfs-root.service +%{_unitdir}/systemd-pcrfs@.service +%{_unitdir}/systemd-pcrmachine.service %{_unitdir}/systemd-pcrphase-initrd.service %{_unitdir}/systemd-pcrphase-sysinit.service %{_unitdir}/systemd-pcrphase.service diff --git a/files.systemd b/files.systemd index b7b53f15..6d2276f1 100644 --- a/files.systemd +++ b/files.systemd @@ -100,6 +100,7 @@ %{_bindir}/localectl %{_bindir}/loginctl %{_bindir}/systemctl +%{_bindir}/systemd-ac-power %{_bindir}/systemd-analyze %{_bindir}/systemd-ask-password %{_bindir}/systemd-cat @@ -232,8 +233,8 @@ %{_libdir}/libnss_myhostname.so.2 %{_libdir}/libnss_systemd.so.2 %endif -%{_libdir}/systemd/libsystemd-core-252.so -%{_libdir}/systemd/libsystemd-shared-252.so +%{_libdir}/systemd/libsystemd-core-253.so +%{_libdir}/systemd/libsystemd-shared-253.so %if %{without bootstrap} %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz @@ -242,6 +243,7 @@ %{_mandir}/man1/localectl.1.gz %{_mandir}/man1/loginctl.1.gz %{_mandir}/man1/systemctl.1.gz +%{_mandir}/man1/systemd-ac-power.1.gz %{_mandir}/man1/systemd-analyze.1.gz %{_mandir}/man1/systemd-ask-password.1.gz %{_mandir}/man1/systemd-cat.1.gz @@ -445,7 +447,6 @@ %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh %{_systemd_util_dir}/system-preset/99-default.preset %{_systemd_util_dir}/systemd -%{_systemd_util_dir}/systemd-ac-power %{_systemd_util_dir}/systemd-binfmt %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent @@ -505,6 +506,7 @@ %{_systemdgeneratordir}/systemd-system-update-generator %{_sysusersdir}/systemd-journal.conf %{_sysusersdir}/systemd-timesync.conf +%{_tmpfilesdir}/credstore.conf %{_tmpfilesdir}/journal-nocow.conf %{_tmpfilesdir}/provision.conf %{_tmpfilesdir}/suse.conf @@ -641,6 +643,7 @@ %{_unitdir}/systemd-hybrid-sleep.service %{_unitdir}/systemd-journal-catalog-update.service %{_unitdir}/systemd-journal-flush.service +%{_unitdir}/systemd-journald-audit.socket %{_unitdir}/systemd-journald-dev-log.socket %{_unitdir}/systemd-journald-varlink@.socket %{_unitdir}/systemd-journald.service diff --git a/files.udev b/files.udev index 1ea1a437..a793d096 100644 --- a/files.udev +++ b/files.udev @@ -94,7 +94,6 @@ %endif %{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe -%{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_systemd_util_dir}/network/99-default.link @@ -174,7 +173,6 @@ %{_udevrulesdir}/60-persistent-v4l.rules %{_udevrulesdir}/60-sensor.rules %{_udevrulesdir}/60-serial.rules -%{_udevrulesdir}/61-persistent-storage-compat.rules %{_udevrulesdir}/64-btrfs.rules %{_udevrulesdir}/70-camera.rules %{_udevrulesdir}/70-joystick.rules @@ -226,6 +224,8 @@ %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/systemd-backlight@.service +%{_unitdir}/systemd-growfs-root.service +%{_unitdir}/systemd-growfs@.service %{_unitdir}/systemd-hwdb-update.service %if %{without bootstrap} %{_unitdir}/systemd-modules-load.service diff --git a/files.uefi-boot b/files.uefi-boot index 75c3d0c4..7c50c27a 100644 --- a/files.uefi-boot +++ b/files.uefi-boot @@ -26,19 +26,20 @@ %{_mandir}/man8/systemd-bless-boot-generator.8.gz %{_mandir}/man8/systemd-bless-boot.8.gz %{_mandir}/man8/systemd-bless-boot.service.8.gz -%{_mandir}/man8/systemd-boot-system-token.service.8.gz +%{_mandir}/man8/systemd-boot-random-seed.service.8.gz %endif %{_prefix}/lib/kernel/install.conf %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install +%{_prefix}/lib/kernel/install.d/90-uki-copy.install # These are the few exceptions where glob pattern is allowed. %{_systemd_util_dir}/boot/efi/linux*.efi.stub %{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/systemd-boot*.efi %{_systemd_util_dir}/systemd-bless-boot %{_systemdgeneratordir}/systemd-bless-boot-generator -%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service +%{_unitdir}/sysinit.target.wants/systemd-boot-random-seed.service %{_unitdir}/systemd-bless-boot.service -%{_unitdir}/systemd-boot-system-token.service +%{_unitdir}/systemd-boot-random-seed.service %{_unitdir}/systemd-boot-update.service %endif diff --git a/systemd-v252.7+suse.50.gd447802fee.tar.xz b/systemd-v252.7+suse.50.gd447802fee.tar.xz deleted file mode 100644 index 0a07938e..00000000 --- a/systemd-v252.7+suse.50.gd447802fee.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fd9f697fdbb194da090ef87f472c1c6d05d16cfa49b3b668648ea6d3c8f177d2 -size 8089304 diff --git a/systemd-v253.1.tar.xz b/systemd-v253.1.tar.xz new file mode 100644 index 00000000..18ac8b19 --- /dev/null +++ b/systemd-v253.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:84aad84973ab74246f5eff59641a5570c3a0bb6fce66402a4644212d71f38d07 +size 8205144 diff --git a/systemd.changes b/systemd.changes index 897181a9..c87c37ca 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +Thu Mar 9 10:38:10 UTC 2023 - Franck Bui + +- Add 5000-core-manager-run-generators-directly-when-we-are-in-.patch, a + temporary workaround until https://github.com/dracutdevs/dracut/issues/2211 is + fixed in dracut. + +------------------------------------------------------------------- +Mon Mar 6 10:08:33 UTC 2023 - Franck Bui + +- Upgrade to v253.1 (commit 6c327d74aa0d350482e82a247d7018559699798d) + + See https://github.com/openSUSE/systemd/blob/SUSE/v253/NEWS for details. + + * Rebased 0001-conf-parser-introduce-early-drop-ins.patch + + * Ship systemd-journald-audit.socket again: it can now be disabled via the + usual "systemctl disable" mechanism to stop collection of audit + messages. Note that it's handled by the preset logic, which turns it off by + default. + + * TEST_06_SELINUX needs selinux-policy-devel. + ------------------------------------------------------------------- Mon Mar 6 08:40:35 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index 75d654a5..a4b18fcc 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.50.gd447802fee +%define archive_version %nil %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: 252.7 +Version: 253.1 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -209,9 +209,10 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.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 repository. But for -# very few cases, some stuff might be broken in upstream and need to be fixed -# quickly. But even in these cases, the patches are temporary and should be -# removed as soon as a fix is merged by upstream. +# very few cases, some stuff might be broken in upstream and need to be fixed or +# worked around quickly. In these cases, the patches are added temporarily and +# will be removed as soon as a proper fix will be merged by upstream. +Patch5000: 5000-core-manager-run-generators-directly-when-we-are-in-.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -530,6 +531,7 @@ Requires: netcat Requires: python3-pexpect Requires: qemu-kvm Requires: quota +Requires: selinux-policy-devel Requires: socat Requires: squashfs Requires: systemd-container @@ -885,8 +887,8 @@ rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset -# The tmpfiles dealing with the generic paths is pretty messy -# currently because: +# The current situation with tmpfiles snippets dealing with the generic paths is +# pretty messy currently because: # # 1. filesystem package wants to define the generic paths and some of them # conflict with the definition given by systemd in var.conf, see @@ -930,12 +932,6 @@ fi # still be used by yast. cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map -# Don't ship systemd-journald-audit.socket as there's no other way for us to -# prevent journald from recording audit messages in the journal by default -# (bsc#1109252). -rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket -rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket - %if %{with testsuite} # -Dinstall_test took care of installing the unit tests only (those in # src/tests) and testdata directory. Here we copy the integration tests @@ -964,6 +960,7 @@ tar -cO \ %systemd_pre remote-fs.target %systemd_pre getty@.service %systemd_pre systemd-timesyncd.service +%systemd_pre systemd-journald-audit.socket %post # Make /etc/machine-id an empty file during package installation. On the first @@ -1023,6 +1020,7 @@ fi %systemd_post remote-fs.target %systemd_post getty@.service %systemd_post systemd-timesyncd.service +%systemd_post systemd-journald-audit.socket # v228 wrongly set world writable suid root permissions on timestamp files used # by permanent timers. Fix the timestamps that might have been created by the @@ -1314,13 +1312,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.35.0 +%{_libdir}/libsystemd.so.0.36.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.5 +%{_libdir}/libudev.so.1.7.6 %if %{with coredump} %files coredump From ba02eef87f4ee6df0dc118b22a642720bda50e6e093c2dbaf7b40705619be5a4 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 15 Mar 2023 17:53:31 +0000 Subject: [PATCH 124/124] Accepting request 1072108 from openSUSE:Factory https://bugzilla.opensuse.org/show_bug.cgi?id=1209305 OBS-URL: https://build.opensuse.org/request/show/1072108 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=382 --- ...conf-parser-introduce-early-drop-ins.patch | 32 ++++++++--------- ...-generators-directly-when-we-are-in-.patch | 34 ------------------- files.devel | 11 ------ files.experimental | 11 ------ files.systemd | 9 ++--- files.udev | 4 +-- files.uefi-boot | 7 ++-- systemd-v252.7+suse.50.gd447802fee.tar.xz | 3 ++ systemd-v253.1.tar.xz | 3 -- systemd.changes | 23 ------------- systemd.spec | 28 ++++++++------- 11 files changed, 41 insertions(+), 124 deletions(-) delete mode 100644 5000-core-manager-run-generators-directly-when-we-are-in-.patch create mode 100644 systemd-v252.7+suse.50.gd447802fee.tar.xz delete mode 100644 systemd-v253.1.tar.xz diff --git a/0001-conf-parser-introduce-early-drop-ins.patch b/0001-conf-parser-introduce-early-drop-ins.patch index 47f4da7c..0d06f860 100644 --- a/0001-conf-parser-introduce-early-drop-ins.patch +++ b/0001-conf-parser-introduce-early-drop-ins.patch @@ -1,7 +1,7 @@ -From 77391d9baf86f10daf210ccf5527e0155a33fc73 Mon Sep 17 00:00:00 2001 +From 288be40eb94ddc1d549a98556baea71d20df224f Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 22 Jan 2021 14:57:08 +0100 -Subject: [PATCH 1/1] conf-parser: introduce 'early' drop-ins +Subject: [PATCH 1/8] conf-parser: introduce 'early' drop-ins MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -62,14 +62,14 @@ drop this feature at any time. Fixes: #2121 --- src/shared/conf-parser.c | 55 ++++++++++-- - src/test/test-conf-parser.c | 166 +++++++++++++++++++++++++++++++++++- - 2 files changed, 215 insertions(+), 6 deletions(-) + src/test/test-conf-parser.c | 164 ++++++++++++++++++++++++++++++++++++ + 2 files changed, 214 insertions(+), 5 deletions(-) diff --git a/src/shared/conf-parser.c b/src/shared/conf-parser.c -index 29051ca0e3..72935030ea 100644 +index 5cb41a39da..86dc1c95f6 100644 --- a/src/shared/conf-parser.c +++ b/src/shared/conf-parser.c -@@ -477,6 +477,7 @@ int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, const s +@@ -478,6 +478,7 @@ int hashmap_put_stats_by_path(Hashmap **stats_by_path, const char *path, const s static int config_parse_many_files( const char* const* conf_files, @@ -77,7 +77,7 @@ index 29051ca0e3..72935030ea 100644 char **files, const char *sections, ConfigItemLookup lookup, -@@ -495,6 +496,20 @@ static int config_parse_many_files( +@@ -496,6 +497,20 @@ static int config_parse_many_files( return -ENOMEM; } @@ -98,7 +98,7 @@ index 29051ca0e3..72935030ea 100644 /* First read the first found main config file. */ STRV_FOREACH(fn, conf_files) { r = config_parse(NULL, *fn, NULL, sections, lookup, table, flags, userdata, &st); -@@ -533,6 +548,27 @@ static int config_parse_many_files( +@@ -534,6 +549,27 @@ static int config_parse_many_files( return 0; } @@ -126,7 +126,7 @@ index 29051ca0e3..72935030ea 100644 /* Parse each config file in the directories specified as nulstr. */ int config_parse_many_nulstr( const char *conf_file, -@@ -544,15 +580,19 @@ int config_parse_many_nulstr( +@@ -545,15 +581,19 @@ int config_parse_many_nulstr( void *userdata, Hashmap **ret_stats_by_path) { @@ -149,7 +149,7 @@ index 29051ca0e3..72935030ea 100644 ret_stats_by_path); } -@@ -590,6 +630,7 @@ int config_parse_many( +@@ -591,6 +631,7 @@ int config_parse_many( Hashmap **ret_stats_by_path, char ***ret_dropin_files) { @@ -157,7 +157,7 @@ index 29051ca0e3..72935030ea 100644 _cleanup_strv_free_ char **files = NULL; int r; -@@ -602,12 +643,16 @@ int config_parse_many( +@@ -603,12 +644,16 @@ int config_parse_many( if (r < 0) return r; @@ -177,22 +177,20 @@ index 29051ca0e3..72935030ea 100644 return 0; } diff --git a/src/test/test-conf-parser.c b/src/test/test-conf-parser.c -index 0acb4131b5..96a52e759f 100644 +index 8c27dcac3f..745e4a127a 100644 --- a/src/test/test-conf-parser.c +++ b/src/test/test-conf-parser.c -@@ -5,7 +5,10 @@ +@@ -5,6 +5,9 @@ #include "fs-util.h" #include "log.h" #include "macro.h" --#include "string-util.h" +#include "mkdir.h" -+#include "nulstr-util.h" +#include "path-util.h" +#include "rm-rf.h" + #include "string-util.h" #include "strv.h" #include "tests.h" - #include "tmpfile-util.h" -@@ -390,4 +393,165 @@ TEST(config_parse) { +@@ -391,4 +394,165 @@ TEST(config_parse) { test_config_parse_one(i, config_file[i]); } diff --git a/5000-core-manager-run-generators-directly-when-we-are-in-.patch b/5000-core-manager-run-generators-directly-when-we-are-in-.patch deleted file mode 100644 index 20c0b682..00000000 --- a/5000-core-manager-run-generators-directly-when-we-are-in-.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9d0f728f65e6c3ad586e276c1ed3c2cd8cc944be Mon Sep 17 00:00:00 2001 -From: Yu Watanabe -Date: Mon, 20 Feb 2023 12:00:30 +0900 -Subject: [PATCH 5000/5000] core/manager: run generators directly when we are - in initrd - -Some initrd system write files at ourside of /run, /etc, or other -allowed places. This is a kind of workaround, but in most cases, such -sandboxing is not necessary as the filesystem is on ramfs when we are in -initrd. - -Fixes #26488. ---- - src/core/manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/core/manager.c b/src/core/manager.c -index 380a4e30d7..6135205761 100644 ---- a/src/core/manager.c -+++ b/src/core/manager.c -@@ -3822,8 +3822,8 @@ static int manager_run_generators(Manager *m) { - /* If we are the system manager, we fork and invoke the generators in a sanitized mount namespace. If - * we are the user manager, let's just execute the generators directly. We might not have the - * necessary privileges, and the system manager has already mounted /tmp/ and everything else for us. -- */ -- if (MANAGER_IS_USER(m)) { -+ * If we are in initrd, let's also execute the generators directly, as we are in ramfs. */ -+ if (MANAGER_IS_USER(m) || in_initrd()) { - r = manager_execute_generators(m, paths, /* remount_ro= */ false); - goto finish; - } --- -2.35.3 - diff --git a/files.devel b/files.devel index f9248ea5..2bd1c670 100644 --- a/files.devel +++ b/files.devel @@ -197,8 +197,6 @@ %{_mandir}/man3/sd_bus_emit_properties_changed.3.gz %{_mandir}/man3/sd_bus_emit_properties_changed_strv.3.gz %{_mandir}/man3/sd_bus_emit_signal.3.gz -%{_mandir}/man3/sd_bus_emit_signal_to.3.gz -%{_mandir}/man3/sd_bus_emit_signal_tov.3.gz %{_mandir}/man3/sd_bus_emit_signalv.3.gz %{_mandir}/man3/sd_bus_enqueue_for_read.3.gz %{_mandir}/man3/sd_bus_error.3.gz @@ -314,7 +312,6 @@ %{_mandir}/man3/sd_bus_message_new_method_errorf.3.gz %{_mandir}/man3/sd_bus_message_new_method_return.3.gz %{_mandir}/man3/sd_bus_message_new_signal.3.gz -%{_mandir}/man3/sd_bus_message_new_signal_to.3.gz %{_mandir}/man3/sd_bus_message_open_container.3.gz %{_mandir}/man3/sd_bus_message_peek_type.3.gz %{_mandir}/man3/sd_bus_message_read.3.gz @@ -666,14 +663,6 @@ %{_mandir}/man3/sd_pid_notify.3.gz %{_mandir}/man3/sd_pid_notify_with_fds.3.gz %{_mandir}/man3/sd_pid_notifyf.3.gz -%{_mandir}/man3/sd_pidfd_get_cgroup.3.gz -%{_mandir}/man3/sd_pidfd_get_machine_name.3.gz -%{_mandir}/man3/sd_pidfd_get_owner_uid.3.gz -%{_mandir}/man3/sd_pidfd_get_session.3.gz -%{_mandir}/man3/sd_pidfd_get_slice.3.gz -%{_mandir}/man3/sd_pidfd_get_unit.3.gz -%{_mandir}/man3/sd_pidfd_get_user_slice.3.gz -%{_mandir}/man3/sd_pidfd_get_user_unit.3.gz %{_mandir}/man3/sd_seat_can_graphical.3.gz %{_mandir}/man3/sd_seat_can_tty.3.gz %{_mandir}/man3/sd_seat_get_active.3.gz diff --git a/files.experimental b/files.experimental index 0cea03ba..6bc23ede 100644 --- a/files.experimental +++ b/files.experimental @@ -27,7 +27,6 @@ %{_mandir}/man1/oomctl.1.gz %if %{with sd_boot} %{_mandir}/man1/systemd-measure.1.gz -%{_mandir}/man1/ukify.1.gz %endif %{_mandir}/man1/userdbctl.1.gz %{_mandir}/man5/homed.conf.5.gz @@ -44,9 +43,6 @@ %{_mandir}/man8/systemd-oomd.8.gz %{_mandir}/man8/systemd-oomd.service.8.gz %if %{with sd_boot} -%{_mandir}/man8/systemd-pcrfs-root.service.8.gz -%{_mandir}/man8/systemd-pcrfs@.service.8.gz -%{_mandir}/man8/systemd-pcrmachine.service.8.gz %{_mandir}/man8/systemd-pcrphase-initrd.service.8.gz %{_mandir}/man8/systemd-pcrphase-sysinit.service.8.gz %{_mandir}/man8/systemd-pcrphase.8.gz @@ -76,13 +72,9 @@ %{_systemd_util_dir}/systemd-sysupdate %{_systemd_util_dir}/systemd-userdbd %{_systemd_util_dir}/systemd-userwork -%if %{with sd_boot} -%{_systemd_util_dir}/ukify -%endif %{_sysusersdir}/systemd-oom.conf %if %{with sd_boot} %{_unitdir}/initrd.target.wants/systemd-pcrphase-initrd.service -%{_unitdir}/sysinit.target.wants/systemd-pcrmachine.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service %{_unitdir}/sysinit.target.wants/systemd-pcrphase.service %endif @@ -91,9 +83,6 @@ %{_unitdir}/systemd-oomd.service %{_unitdir}/systemd-oomd.socket %if %{with sd_boot} -%{_unitdir}/systemd-pcrfs-root.service -%{_unitdir}/systemd-pcrfs@.service -%{_unitdir}/systemd-pcrmachine.service %{_unitdir}/systemd-pcrphase-initrd.service %{_unitdir}/systemd-pcrphase-sysinit.service %{_unitdir}/systemd-pcrphase.service diff --git a/files.systemd b/files.systemd index 6d2276f1..b7b53f15 100644 --- a/files.systemd +++ b/files.systemd @@ -100,7 +100,6 @@ %{_bindir}/localectl %{_bindir}/loginctl %{_bindir}/systemctl -%{_bindir}/systemd-ac-power %{_bindir}/systemd-analyze %{_bindir}/systemd-ask-password %{_bindir}/systemd-cat @@ -233,8 +232,8 @@ %{_libdir}/libnss_myhostname.so.2 %{_libdir}/libnss_systemd.so.2 %endif -%{_libdir}/systemd/libsystemd-core-253.so -%{_libdir}/systemd/libsystemd-shared-253.so +%{_libdir}/systemd/libsystemd-core-252.so +%{_libdir}/systemd/libsystemd-shared-252.so %if %{without bootstrap} %{_mandir}/man1/busctl.1.gz %{_mandir}/man1/hostnamectl.1.gz @@ -243,7 +242,6 @@ %{_mandir}/man1/localectl.1.gz %{_mandir}/man1/loginctl.1.gz %{_mandir}/man1/systemctl.1.gz -%{_mandir}/man1/systemd-ac-power.1.gz %{_mandir}/man1/systemd-analyze.1.gz %{_mandir}/man1/systemd-ask-password.1.gz %{_mandir}/man1/systemd-cat.1.gz @@ -447,6 +445,7 @@ %{_systemd_util_dir}/scripts/upgrade-from-pre-210.sh %{_systemd_util_dir}/system-preset/99-default.preset %{_systemd_util_dir}/systemd +%{_systemd_util_dir}/systemd-ac-power %{_systemd_util_dir}/systemd-binfmt %{_systemd_util_dir}/systemd-boot-check-no-failures %{_systemd_util_dir}/systemd-cgroups-agent @@ -506,7 +505,6 @@ %{_systemdgeneratordir}/systemd-system-update-generator %{_sysusersdir}/systemd-journal.conf %{_sysusersdir}/systemd-timesync.conf -%{_tmpfilesdir}/credstore.conf %{_tmpfilesdir}/journal-nocow.conf %{_tmpfilesdir}/provision.conf %{_tmpfilesdir}/suse.conf @@ -643,7 +641,6 @@ %{_unitdir}/systemd-hybrid-sleep.service %{_unitdir}/systemd-journal-catalog-update.service %{_unitdir}/systemd-journal-flush.service -%{_unitdir}/systemd-journald-audit.socket %{_unitdir}/systemd-journald-dev-log.socket %{_unitdir}/systemd-journald-varlink@.socket %{_unitdir}/systemd-journald.service diff --git a/files.udev b/files.udev index a793d096..1ea1a437 100644 --- a/files.udev +++ b/files.udev @@ -94,6 +94,7 @@ %endif %{_prefix}/lib/udev/fido_id %{_prefix}/lib/udev/mtd_probe +%{_prefix}/lib/udev/path_id_compat %{_prefix}/lib/udev/scsi_id %{_prefix}/lib/udev/v4l_id %{_systemd_util_dir}/network/99-default.link @@ -173,6 +174,7 @@ %{_udevrulesdir}/60-persistent-v4l.rules %{_udevrulesdir}/60-sensor.rules %{_udevrulesdir}/60-serial.rules +%{_udevrulesdir}/61-persistent-storage-compat.rules %{_udevrulesdir}/64-btrfs.rules %{_udevrulesdir}/70-camera.rules %{_udevrulesdir}/70-joystick.rules @@ -224,8 +226,6 @@ %{_unitdir}/system-systemd\x2dcryptsetup.slice %endif %{_unitdir}/systemd-backlight@.service -%{_unitdir}/systemd-growfs-root.service -%{_unitdir}/systemd-growfs@.service %{_unitdir}/systemd-hwdb-update.service %if %{without bootstrap} %{_unitdir}/systemd-modules-load.service diff --git a/files.uefi-boot b/files.uefi-boot index 7c50c27a..75c3d0c4 100644 --- a/files.uefi-boot +++ b/files.uefi-boot @@ -26,20 +26,19 @@ %{_mandir}/man8/systemd-bless-boot-generator.8.gz %{_mandir}/man8/systemd-bless-boot.8.gz %{_mandir}/man8/systemd-bless-boot.service.8.gz -%{_mandir}/man8/systemd-boot-random-seed.service.8.gz +%{_mandir}/man8/systemd-boot-system-token.service.8.gz %endif %{_prefix}/lib/kernel/install.conf %{_prefix}/lib/kernel/install.d/50-depmod.install %{_prefix}/lib/kernel/install.d/90-loaderentry.install -%{_prefix}/lib/kernel/install.d/90-uki-copy.install # These are the few exceptions where glob pattern is allowed. %{_systemd_util_dir}/boot/efi/linux*.efi.stub %{_systemd_util_dir}/boot/efi/linux*.elf.stub %{_systemd_util_dir}/boot/efi/systemd-boot*.efi %{_systemd_util_dir}/systemd-bless-boot %{_systemdgeneratordir}/systemd-bless-boot-generator -%{_unitdir}/sysinit.target.wants/systemd-boot-random-seed.service +%{_unitdir}/sysinit.target.wants/systemd-boot-system-token.service %{_unitdir}/systemd-bless-boot.service -%{_unitdir}/systemd-boot-random-seed.service +%{_unitdir}/systemd-boot-system-token.service %{_unitdir}/systemd-boot-update.service %endif diff --git a/systemd-v252.7+suse.50.gd447802fee.tar.xz b/systemd-v252.7+suse.50.gd447802fee.tar.xz new file mode 100644 index 00000000..0a07938e --- /dev/null +++ b/systemd-v252.7+suse.50.gd447802fee.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fd9f697fdbb194da090ef87f472c1c6d05d16cfa49b3b668648ea6d3c8f177d2 +size 8089304 diff --git a/systemd-v253.1.tar.xz b/systemd-v253.1.tar.xz deleted file mode 100644 index 18ac8b19..00000000 --- a/systemd-v253.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:84aad84973ab74246f5eff59641a5570c3a0bb6fce66402a4644212d71f38d07 -size 8205144 diff --git a/systemd.changes b/systemd.changes index c87c37ca..897181a9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,26 +1,3 @@ -------------------------------------------------------------------- -Thu Mar 9 10:38:10 UTC 2023 - Franck Bui - -- Add 5000-core-manager-run-generators-directly-when-we-are-in-.patch, a - temporary workaround until https://github.com/dracutdevs/dracut/issues/2211 is - fixed in dracut. - -------------------------------------------------------------------- -Mon Mar 6 10:08:33 UTC 2023 - Franck Bui - -- Upgrade to v253.1 (commit 6c327d74aa0d350482e82a247d7018559699798d) - - See https://github.com/openSUSE/systemd/blob/SUSE/v253/NEWS for details. - - * Rebased 0001-conf-parser-introduce-early-drop-ins.patch - - * Ship systemd-journald-audit.socket again: it can now be disabled via the - usual "systemctl disable" mechanism to stop collection of audit - messages. Note that it's handled by the preset logic, which turns it off by - default. - - * TEST_06_SELINUX needs selinux-policy-devel. - ------------------------------------------------------------------- Mon Mar 6 08:40:35 UTC 2023 - Franck Bui diff --git a/systemd.spec b/systemd.spec index a4b18fcc..75d654a5 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 %nil +%define archive_version +suse.50.gd447802fee %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: 253.1 +Version: 252.7 Release: 0 Summary: A System and Session Manager License: LGPL-2.1-or-later @@ -209,10 +209,9 @@ Patch12: 0009-pid1-handle-console-specificities-weirdness-for-s390.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 repository. But for -# very few cases, some stuff might be broken in upstream and need to be fixed or -# worked around quickly. In these cases, the patches are added temporarily and -# will be removed as soon as a proper fix will be merged by upstream. -Patch5000: 5000-core-manager-run-generators-directly-when-we-are-in-.patch +# very few cases, some stuff might be broken in upstream and need to be fixed +# quickly. But even in these cases, the patches are temporary and should be +# removed as soon as a fix is merged by upstream. %description Systemd is a system and service manager, compatible with SysV and LSB @@ -531,7 +530,6 @@ Requires: netcat Requires: python3-pexpect Requires: qemu-kvm Requires: quota -Requires: selinux-policy-devel Requires: socat Requires: squashfs Requires: systemd-container @@ -887,8 +885,8 @@ rm -f %{buildroot}%{_presetdir}/*.preset echo 'disable *' >%{buildroot}%{_presetdir}/99-default.preset echo 'disable *' >%{buildroot}%{_userpresetdir}/99-default.preset -# The current situation with tmpfiles snippets dealing with the generic paths is -# pretty messy currently because: +# The tmpfiles dealing with the generic paths is pretty messy +# currently because: # # 1. filesystem package wants to define the generic paths and some of them # conflict with the definition given by systemd in var.conf, see @@ -932,6 +930,12 @@ fi # still be used by yast. cat %{SOURCE14} >>%{buildroot}%{_datarootdir}/systemd/kbd-model-map +# Don't ship systemd-journald-audit.socket as there's no other way for us to +# prevent journald from recording audit messages in the journal by default +# (bsc#1109252). +rm -f %{buildroot}%{_unitdir}/systemd-journald-audit.socket +rm -f %{buildroot}%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket + %if %{with testsuite} # -Dinstall_test took care of installing the unit tests only (those in # src/tests) and testdata directory. Here we copy the integration tests @@ -960,7 +964,6 @@ tar -cO \ %systemd_pre remote-fs.target %systemd_pre getty@.service %systemd_pre systemd-timesyncd.service -%systemd_pre systemd-journald-audit.socket %post # Make /etc/machine-id an empty file during package installation. On the first @@ -1020,7 +1023,6 @@ fi %systemd_post remote-fs.target %systemd_post getty@.service %systemd_post systemd-timesyncd.service -%systemd_post systemd-journald-audit.socket # v228 wrongly set world writable suid root permissions on timestamp files used # by permanent timers. Fix the timestamps that might have been created by the @@ -1312,13 +1314,13 @@ fi %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libsystemd.so.0 -%{_libdir}/libsystemd.so.0.36.0 +%{_libdir}/libsystemd.so.0.35.0 %files -n libudev%{?mini}1 %defattr(-,root,root) %license LICENSE.LGPL2.1 %{_libdir}/libudev.so.1 -%{_libdir}/libudev.so.1.7.6 +%{_libdir}/libudev.so.1.7.5 %if %{with coredump} %files coredump