X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsystemd.git;a=blobdiff_plain;f=systemd.spec;h=1b9842299960c4043104dd1e21b6b7d3989724ab;hp=b953e3294507975f376c63b25f449d0e08aadab5;hb=75e09f8;hpb=4975e6345d804a10ce92e3788417327d96798a78 diff --git a/systemd.spec b/systemd.spec index b953e32..1b98422 100644 --- a/systemd.spec +++ b/systemd.spec @@ -28,14 +28,14 @@ Summary: A System and Service Manager Summary(pl.UTF-8): systemd - zarządca systemu i usług dla Linuksa Name: systemd # Verify ChangeLog and NEWS when updating (since there are incompatible/breaking changes very often) -Version: 244 -Release: 2 +Version: 246.4 +Release: 1 Epoch: 1 License: GPL v2+ (udev), LGPL v2.1+ (the rest) Group: Base #Source0Download: https://github.com/systemd/systemd/releases -Source0: https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 413121fe918b252ae62310f6fc7c4b32 +Source0: https://github.com/systemd/systemd-stable/archive/v%{version}/%{name}-%{version}.tar.gz +# Source0-md5: 4e6d938bf5715e92c772bca7d5a6fa28 Source1: %{name}-sysv-convert Source2: %{name}_booted.c Source3: network.service @@ -66,7 +66,7 @@ Patch1: config-pld.patch Patch2: pld-sysv-network.patch Patch3: tmpfiles-not-fatal.patch Patch4: udev-ploop-rules.patch -Patch5: udevadm-in-sbin.patch + Patch6: net-rename-revert.patch Patch7: %{name}-completion.patch Patch8: proc-hidepid.patch @@ -84,7 +84,7 @@ BuildRequires: binutils >= 3:2.22.52.0.1-2 BuildRequires: bzip2-devel # ln --relative BuildRequires: coreutils >= 8.16 -%{?with_cryptsetup:BuildRequires: cryptsetup-devel >= 1.6.0} +%{?with_cryptsetup:BuildRequires: cryptsetup-devel >= 2.3.0} BuildRequires: curl-devel >= 7.32.0 BuildRequires: dbus-devel >= 1.9.18 BuildRequires: docbook-dtd42-xml @@ -101,7 +101,7 @@ BuildRequires: intltool >= 0.40.0 # pkgconfig(libiptc) BuildRequires: iptables-devel BuildRequires: kmod-devel >= 15 -BuildRequires: libapparmor-devel +BuildRequires: libapparmor-devel >= 1:2.13 BuildRequires: libblkid-devel >= 2.24 BuildRequires: libcap-devel BuildRequires: libgcrypt-devel >= 1.4.5 @@ -131,6 +131,7 @@ BuildRequires: usbutils >= 0.82 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.5.0 BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: zstd-devel >= 1.4.0 Requires(post,postun): %{name}-units = %{epoch}:%{version}-%{release} Requires(postun): /usr/sbin/groupdel Requires(postun): /usr/sbin/userdel @@ -145,7 +146,7 @@ Requires: %{name}-tools = %{epoch}:%{version}-%{release} Requires: /etc/os-release Requires: SysVinit-tools Requires: agetty -%{?with_cryptsetup:Requires: cryptsetup >= 1.6.0} +%{?with_cryptsetup:Requires: cryptsetup >= 2.3.0} Requires: curl-libs >= 7.32.0 Requires: dbus >= 1.9.18 Requires: filesystem >= 4.0-39 @@ -492,6 +493,7 @@ Requires: libgcrypt >= 1.4.5 Requires: libseccomp >= 2.4.0 %{?with_selinux:Requires: libselinux >= 2.6} Requires: lz4-libs >= 1:1.3.0 +Requires: zstd >= 1.4.0 Obsoletes: nss_myhostname %description libs @@ -582,6 +584,7 @@ Requires: kmod >= 15 Requires: libblkid >= 2.24 %{?with_selinux:Requires: libselinux >= 2.6} Requires: setup >= 2.9.0-3 +Requires: systemd-libs = %{epoch}:%{version}-%{release} Requires: udev-libs = %{epoch}:%{version}-%{release} Requires: uname(release) >= 3.13 Obsoletes: udev-compat @@ -655,13 +658,13 @@ zsh completion for udev commands. Uzupełnianie parametrów w zsh dla poleceń udev. %prep -%setup -q +%setup -q -n systemd-stable-%{version} %patch0 -p1 %patch1 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 + # rejected upstream (do not disable!) %patch6 -p1 %patch7 -p1 @@ -676,6 +679,8 @@ Uzupełnianie parametrów w zsh dla poleceń udev. cp -p %{SOURCE2} src/systemd_booted.c +grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash,#!/bin/bash,g' + %build %meson build \ -Daudit=%{__true_false audit} \ @@ -683,9 +688,7 @@ cp -p %{SOURCE2} src/systemd_booted.c -Ddefault-kill-user-processes=false \ %{?debug:--buildtype=debug} \ -Defi=%{__true_false efi} \ - -Dhalt-local=/sbin/halt.local \ -Dkexec-path=/sbin/kexec \ - -Dkill-path=/bin/kill \ -Dkmod-path=/sbin/kmod \ -Dlibcryptsetup=%{__true_false cryptsetup} \ -Dlibidn2=true \ @@ -705,7 +708,6 @@ cp -p %{SOURCE2} src/systemd_booted.c -Drc-local=/etc/rc.d/rc.local \ -Drootlibdir=/%{_lib} \ -Drootprefix="" \ - -Drootsbindir=%{_rootsbindir} \ -Dselinux=%{__true_false selinux} \ -Dsetfont-path=/bin/setfont \ -Dsplit-bin=true \ @@ -718,7 +720,7 @@ cp -p %{SOURCE2} src/systemd_booted.c %meson_build -C build -%{__cc} %{rpmcppflags} %{rpmcflags} -o build/systemd_booted %{rpmldflags} src/systemd_booted.c -L. -lsystemd +%{__cc} %{rpmcppflags} %{rpmcflags} -o build/systemd_booted %{rpmldflags} src/systemd_booted.c -Lbuild -lsystemd %{?with_tests:%meson_test -C build} @@ -729,6 +731,7 @@ install -d $RPM_BUILD_ROOT/var/lib/{%{name}/{catalog,coredump},machines} \ $RPM_BUILD_ROOT%{_sysconfdir}/{modprobe.d,systemd/system-preset} \ $RPM_BUILD_ROOT%{systemduserunitdir}/sockets.target.wants \ $RPM_BUILD_ROOT%{systemdunitdir}/{final,sound,system-update}.target.wants \ + $RPM_BUILD_ROOT%{systemdunitdir}/systemd-udevd.service.d \ $RPM_BUILD_ROOT%{_prefix}/lib/systemd/system-environment-generators %meson_install -C build @@ -750,7 +753,7 @@ ln -s /lib/udev/udevd $RPM_BUILD_ROOT/lib/systemd/systemd-udevd ln -s /lib/udev/udevd $RPM_BUILD_ROOT%{_rootsbindir}/udevd # compat symlinks for "/ merged into /usr" programs -ln -s %{_rootsbindir}/udevadm $RPM_BUILD_ROOT/bin +ln -s ../bin/udevadm $RPM_BUILD_ROOT%{_rootsbindir} ln -s /lib/udev $RPM_BUILD_ROOT%{_prefix}/lib # install custom udev rules from pld package @@ -1070,14 +1073,14 @@ fi %endif %triggerpostun -n udev-core -- udev < 165 -/sbin/udevadm info --convert-db +/bin/udevadm info --convert-db %post -n udev-core -/sbin/udevadm hwdb --update || : +/bin/udevadm hwdb --update || : if [ $1 -gt 1 ]; then if [ ! -x /bin/systemd_booted ] || ! /bin/systemd_booted; then if grep -qs devtmpfs /proc/mounts && [ -n "$(pidof udevd)" ]; then - /sbin/udevadm control --exit + /bin/udevadm control --exit /lib/udev/udevd --daemon fi else @@ -1097,7 +1100,7 @@ fi %files -f %{name}.lang %defattr(644,root,root,755) -%doc docs/{AUTOMATIC_BOOT_ASSESSMENT,BLOCK_DEVICE_LOCKING,BOOT_LOADER_INTERFACE,BOOT_LOADER_SPECIFICATION,DISTRO_PORTING,ENVIRONMENT,PREDICTABLE_INTERFACE_NAMES,TRANSIENT-SETTINGS,UIDS-GIDS}.md NEWS README TODO +%doc docs/{AUTOMATIC_BOOT_ASSESSMENT,BLOCK_DEVICE_LOCKING,BOOT_LOADER_INTERFACE,BOOT_LOADER_SPECIFICATION,DISTRO_PORTING,ENVIRONMENT,GROUP_RECORD,PREDICTABLE_INTERFACE_NAMES,TRANSIENT-SETTINGS,UIDS-GIDS,USER_GROUP_API,USER_RECORD}.md NEWS README TODO %{_datadir}/dbus-1/system.d/org.freedesktop.hostname1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.import1.conf %{_datadir}/dbus-1/system.d/org.freedesktop.locale1.conf @@ -1142,6 +1145,7 @@ fi %attr(755,root,root) /bin/systemd-notify %attr(755,root,root) /bin/systemd-sysusers %attr(755,root,root) /bin/systemd-tty-ask-password-agent +%attr(755,root,root) /bin/userdbctl %{?with_efi:%attr(755,root,root) %{_bindir}/bootctl} %attr(755,root,root) %{_bindir}/busctl %attr(755,root,root) %{_bindir}/coredumpctl @@ -1214,9 +1218,12 @@ fi %attr(755,root,root) /lib/systemd/systemd-update-done %attr(755,root,root) /lib/systemd/systemd-user-runtime-dir %attr(755,root,root) /lib/systemd/systemd-user-sessions +%attr(755,root,root) /lib/systemd/systemd-userdbd +%attr(755,root,root) /lib/systemd/systemd-userwork %attr(755,root,root) /lib/systemd/systemd-vconsole-setup %attr(755,root,root) /lib/systemd/systemd-veritysetup %attr(755,root,root) /lib/systemd/systemd-volatile-root +%attr(755,root,root) /lib/systemd/systemd-xdg-autostart-condition %attr(755,root,root) /lib/systemd/systemd %{?with_cryptsetup:%attr(755,root,root) /lib/systemd/system-generators/systemd-cryptsetup-generator} %{?with_efi:%attr(755,root,root) /lib/systemd/system-generators/systemd-bless-boot-generator} @@ -1286,20 +1293,23 @@ fi %{_prefix}/lib/tmpfiles.d/systemd.conf %{_prefix}/lib/tmpfiles.d/systemd-nologin.conf %{_prefix}/lib/tmpfiles.d/systemd-nspawn.conf +%{_prefix}/lib/tmpfiles.d/systemd-pstore.conf %{_prefix}/lib/tmpfiles.d/systemd-tmp.conf %{_prefix}/lib/tmpfiles.d/tmp.conf %{_prefix}/lib/tmpfiles.d/var.conf %{_prefix}/lib/tmpfiles.d/x11.conf %{_prefix}/lib/sysctl.d/50-coredump.conf # if cc.sizeof('long') > 4 -%ifarch %{x8664} +%ifarch %{x8664} aarch64 %{_prefix}/lib/sysctl.d/50-pid-max.conf %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.import1.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.machine1.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}/polkit-1/actions/org.freedesktop.hostname1.policy @@ -1346,11 +1356,13 @@ fi %{_mandir}/man1/systemd-tty-ask-password-agent.1* %{_mandir}/man1/systemd-umount.1* %{_mandir}/man1/timedatectl.1* +%{_mandir}/man1/userdbctl.1* %{_mandir}/man5/binfmt.d.5* %{_mandir}/man5/coredump.conf.5* %{_mandir}/man5/coredump.conf.d.5* %{_mandir}/man5/dnssec-trust-anchors.d.5* %{_mandir}/man5/hostname.5* +%{_mandir}/man5/journald@.conf.5* %{?with_efi:%{_mandir}/man5/loader.conf.5*} %if %{with microhttpd} %{_mandir}/man5/journal-remote.conf.5* @@ -1367,6 +1379,14 @@ fi %{_mandir}/man5/machine-id.5* %{_mandir}/man5/machine-info.5* %{_mandir}/man5/modules-load.d.5* +%{_mandir}/man5/org.freedesktop.LogControl1.5* +%{_mandir}/man5/org.freedesktop.hostname1.5* +%{_mandir}/man5/org.freedesktop.import1.5* +%{_mandir}/man5/org.freedesktop.locale1.5* +%{_mandir}/man5/org.freedesktop.login1.5* +%{_mandir}/man5/org.freedesktop.machine1.5* +%{_mandir}/man5/org.freedesktop.systemd1.5* +%{_mandir}/man5/org.freedesktop.timedate1.5* %{_mandir}/man5/os-release.5* %{_mandir}/man5/pstore.conf.5* %{_mandir}/man5/pstore.conf.d.5* @@ -1377,6 +1397,7 @@ fi %{_mandir}/man5/systemd-sleep.conf.5* %{_mandir}/man5/systemd-system.conf.5* %{_mandir}/man5/systemd-user.conf.5* +%{_mandir}/man5/systemd-user-runtime-dir.5* %{_mandir}/man5/sysusers.d.5* %{_mandir}/man5/timesyncd.conf.5* %{_mandir}/man5/timesyncd.conf.d.5* @@ -1404,7 +1425,11 @@ fi %{_mandir}/man8/nss-mymachines.8* %{_mandir}/man8/systemd-backlight.8* %{_mandir}/man8/systemd-binfmt.8* -%{?with_efi:%{_mandir}/man8/systemd-bless-boot-generator.8*} +%if %{with efi} +%{_mandir}/man8/systemd-bless-boot.8* +%{_mandir}/man8/systemd-bless-boot-generator.8* +%endif +%{_mandir}/man8/systemd-boot-check-no-failures.8* %{_mandir}/man8/systemd-coredump.8* %{?with_cryptsetup:%{_mandir}/man8/systemd-cryptsetup-generator.8*} %{_mandir}/man8/systemd-debug-generator.8* @@ -1421,7 +1446,10 @@ fi %{_mandir}/man8/systemd-importd.8* %{_mandir}/man8/systemd-initctl.8* %{_mandir}/man8/systemd-journald-dev-log.socket.8* +%{_mandir}/man8/systemd-journald-varlink@.socket.8* %{_mandir}/man8/systemd-journald.8* +%{_mandir}/man8/systemd-journald@.service.8* +%{_mandir}/man8/systemd-journald@.socket.8* %if %{with microhttpd} %{_mandir}/man8/systemd-journal-remote.8* %{_mandir}/man8/systemd-journal-upload.8* @@ -1459,12 +1487,14 @@ fi %{_mandir}/man8/systemd-update-done.service.8* %{_mandir}/man8/systemd-update-utmp.8* %{_mandir}/man8/systemd-user-sessions.8* +%{_mandir}/man8/systemd-userdbd.8* %{_mandir}/man8/systemd-vconsole-setup.8* %{_mandir}/man8/systemd-veritysetup.8* %{_mandir}/man8/systemd-veritysetup-generator.8* %{_mandir}/man8/systemd-veritysetup@.service.8* %{_mandir}/man8/systemd-volatile-root.8* %{_mandir}/man8/systemd-volatile-root.service.8* +%{_mandir}/man8/systemd-xdg-autostart-generator.8* %attr(700,root,root) %dir /var/lib/machines %dir /var/lib/%{name} %dir /var/lib/%{name}/coredump @@ -1534,7 +1564,9 @@ fi %{_prefix}/lib/systemd/user/systemd-tmpfiles-setup.service %{_prefix}/lib/systemd/user/timers.target %{_prefix}/lib/systemd/user/systemd-exit.service +%{_prefix}/lib/systemd/user/xdg-desktop-autostart.target %dir %{_prefix}/lib/systemd/user-generators +%attr(755,root,root) %{_prefix}/lib/systemd/user-generators/systemd-xdg-autostart-generator %dir %{_prefix}/lib/systemd/user-environment-generators %attr(755,root,root) %{_prefix}/lib/systemd/user-environment-generators/30-systemd-environment-d-generator %dir %{_prefix}/lib/systemd/user-preset @@ -1566,6 +1598,7 @@ fi %{systemdunitdir}/sys-fs-fuse-connections.mount %{systemdunitdir}/sys-kernel-config.mount %{systemdunitdir}/sys-kernel-debug.mount +%{systemdunitdir}/sys-kernel-tracing.mount %{systemdunitdir}/systemd-coredump@.service %{systemdunitdir}/systemd-coredump.socket %{systemdunitdir}/systemd-exit.service @@ -1600,6 +1633,7 @@ fi %{systemdunitdir}/killall.service %{systemdunitdir}/kmod-static-nodes.service %{systemdunitdir}/ldconfig.service +%{systemdunitdir}/modprobe@.service %{systemdunitdir}/netfs.service %{systemdunitdir}/network.service %{systemdunitdir}/pld-clean-tmp.service @@ -1638,6 +1672,7 @@ fi %{systemdunitdir}/systemd-journal-remote.service %{systemdunitdir}/systemd-journal-upload.service %{systemdunitdir}/systemd-journald.service +%{systemdunitdir}/systemd-journald@.service %{systemdunitdir}/systemd-kexec.service %{systemdunitdir}/systemd-localed.service %{systemdunitdir}/systemd-logind.service @@ -1664,15 +1699,19 @@ fi %{systemdunitdir}/systemd-udev-settle.service %{systemdunitdir}/systemd-udev-trigger.service %{systemdunitdir}/systemd-udevd.service +%dir %{systemdunitdir}/systemd-udevd.service.d %{systemdunitdir}/systemd-update-done.service %{systemdunitdir}/systemd-update-utmp-runlevel.service %{systemdunitdir}/systemd-update-utmp.service %{systemdunitdir}/systemd-user-sessions.service +%{systemdunitdir}/systemd-userdbd.service +%{systemdunitdir}/systemd-userdbd.socket %{systemdunitdir}/systemd-vconsole-setup.service %{systemdunitdir}/systemd-volatile-root.service %{systemdunitdir}/user@.service %{systemdunitdir}/machine.slice #%{systemdunitdir}/system.slice +%{?with_cryptsetup:%{systemdunitdir}/system-systemd\x2dcryptsetup.slice} %dir %{systemdunitdir}/user-.slice.d %{systemdunitdir}/user-.slice.d/10-defaults.conf %{systemdunitdir}/user-runtime-dir@.service @@ -1683,10 +1722,13 @@ fi %{systemdunitdir}/systemd-journal-remote.socket %{systemdunitdir}/systemd-journald-audit.socket %{systemdunitdir}/systemd-journald-dev-log.socket +%{systemdunitdir}/systemd-journald-varlink@.socket %{systemdunitdir}/systemd-journald.socket +%{systemdunitdir}/systemd-journald@.socket %{systemdunitdir}/systemd-udevd-control.socket %{systemdunitdir}/systemd-udevd-kernel.socket %{systemdunitdir}/basic.target +%{systemdunitdir}/blockdev@.target %{systemdunitdir}/bluetooth.target %{systemdunitdir}/boot-complete.target %{?with_cryptsetup:%{systemdunitdir}/cryptsetup-pre.target} @@ -1749,6 +1791,7 @@ fi %{systemdunitdir}/time-sync.target %{systemdunitdir}/timers.target %{systemdunitdir}/umount.target +%{systemdunitdir}/usb-gadget.target %{systemdunitdir}/systemd-tmpfiles-clean.timer %dir %{systemdunitdir}/basic.target.wants %dir %{systemdunitdir}/dbus.target.wants @@ -1802,6 +1845,7 @@ fi %{systemdunitdir}/sysinit.target.wants/proc-sys-fs-binfmt_misc.automount %{systemdunitdir}/sysinit.target.wants/sys-fs-fuse-connections.mount %{systemdunitdir}/sysinit.target.wants/sys-kernel-debug.mount +%{systemdunitdir}/sysinit.target.wants/sys-kernel-tracing.mount %{systemdunitdir}/sysinit.target.wants/systemd-ask-password-console.path %{systemdunitdir}/sysinit.target.wants/systemd-binfmt.service %{?with_efi:%{systemdunitdir}/sysinit.target.wants/systemd-boot-system-token.service} @@ -1884,6 +1928,7 @@ fi %{_mandir}/man8/systemd-update-utmp-runlevel.service.8* %{_mandir}/man8/systemd-update-utmp.service.8* %{_mandir}/man8/systemd-user-sessions.service.8* +%{_mandir}/man8/systemd-userdbd.service.8* %{_mandir}/man8/systemd-vconsole-setup.service.8* %files tools @@ -1911,6 +1956,7 @@ fi /lib/systemd/network/80-container-host0.network /lib/systemd/network/80-container-ve.network /lib/systemd/network/80-container-vz.network +/lib/systemd/network/80-vm-vt.network /lib/systemd/network/80-wifi-adhoc.network %{systemdunitdir}/systemd-network-generator.service %{systemdunitdir}/systemd-networkd-wait-online.service @@ -1926,6 +1972,8 @@ fi %{_mandir}/man5/networkd.conf.5* %{_mandir}/man5/networkd.conf.d.5* %{_mandir}/man7/systemd.net-naming-scheme.7* +%{_mandir}/man8/systemd-network-generator.8* +%{_mandir}/man8/systemd-network-generator.service.8* %{_mandir}/man8/systemd-networkd-wait-online.8* %{_mandir}/man8/systemd-networkd-wait-online.service.8* %{_mandir}/man8/systemd-networkd.8* @@ -1968,6 +2016,7 @@ fi %attr(755,root,root) /lib/systemd/systemd-resolved %{_mandir}/man1/resolvconf.1* %{_mandir}/man1/resolvectl.1* +%{_mandir}/man5/org.freedesktop.resolve1.5* %{_mandir}/man5/resolved.conf.5* %{_mandir}/man5/resolved.conf.d.5* %{_mandir}/man8/systemd-resolved.8* @@ -2092,7 +2141,10 @@ fi /lib/udev/hwdb.d/20-usb-classes.hwdb /lib/udev/hwdb.d/20-usb-vendor-model.hwdb /lib/udev/hwdb.d/20-vmbus-class.hwdb +/lib/udev/hwdb.d/60-autosuspend-chromiumos.hwdb +/lib/udev/hwdb.d/60-autosuspend.hwdb /lib/udev/hwdb.d/60-evdev.hwdb +/lib/udev/hwdb.d/60-input-id.hwdb /lib/udev/hwdb.d/60-keyboard.hwdb /lib/udev/hwdb.d/60-sensor.hwdb /lib/udev/hwdb.d/70-joystick.hwdb @@ -2124,7 +2176,7 @@ fi # rules below are NOT supposed to be changed by users /lib/udev/rules.d/50-udev-default.rules -/lib/udev/rules.d/60-autosuspend-chromiumos.rules +/lib/udev/rules.d/60-autosuspend.rules /lib/udev/rules.d/60-block.rules /lib/udev/rules.d/60-cdrom_id.rules /lib/udev/rules.d/60-drm.rules @@ -2136,7 +2188,6 @@ fi /lib/udev/rules.d/60-persistent-storage-tape.rules /lib/udev/rules.d/60-persistent-v4l.rules /lib/udev/rules.d/60-serial.rules -/lib/udev/rules.d/61-autosuspend-manual.rules /lib/udev/rules.d/64-btrfs.rules /lib/udev/rules.d/70-mouse.rules /lib/udev/rules.d/70-power-switch.rules