X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=systemd.spec;h=0e34af1632e71eb5de2521ba0dfcd3bd34762d73;hb=f1d2fe4;hp=85349072d5820d18a04c90818428b64295d383aa;hpb=a2e26a8b55bf863384c56c86898eeaef55632b9b;p=packages%2Fsystemd.git diff --git a/systemd.spec b/systemd.spec index 8534907..0e34af1 100644 --- a/systemd.spec +++ b/systemd.spec @@ -25,13 +25,13 @@ 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: 233 -Release: 0.1 +Version: 234 +Release: 3 Epoch: 1 License: GPL v2+ (udev), LGPL v2.1+ (the rest) Group: Base Source0: https://github.com/systemd/systemd/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: 11d3ff48f3361b8bdcfcdc076a31b537 +# Source0-md5: 2d8f6ebded3462ac0d1a6275e54db561 Source1: %{name}-sysv-convert Source2: %{name}_booted.c Source3: network.service @@ -73,6 +73,9 @@ Patch12: uids_gids.patch Patch13: sysctl.patch Patch14: pld-pam-%{name}-user.patch Patch15: %{name}-seccomp_disable_on_i386.patch +Patch16: %{name}-path.patch +Patch17: cryptsetup-fix-infinite-timeout-6486.patch +Patch18: initrd-fstab-generator.patch URL: http://www.freedesktop.org/wiki/Software/systemd BuildRequires: acl-devel %{?with_audit:BuildRequires: audit-libs-devel} @@ -151,7 +154,7 @@ Requires: rc-scripts >= 0.4.5.3-7 Requires: setup >= 2.8.0-2 Requires: udev-core = %{epoch}:%{version}-%{release} Requires: udev-libs = %{epoch}:%{version}-%{release} -Requires: uname(release) >= 3.12 +Requires: uname(release) >= 3.13 Requires: util-linux >= 2.28.2-2 Suggests: fsck >= 2.25.0 Suggests: service(klogd) @@ -548,7 +551,7 @@ Requires: libblkid >= 2.24 %{?with_selinux:Requires: libselinux >= 2.6} Requires: setup >= 2.9.0-3 Requires: udev-libs = %{epoch}:%{version}-%{release} -Requires: uname(release) >= 3.12 +Requires: uname(release) >= 3.13 Obsoletes: udev-compat Obsoletes: udev-initrd < %{epoch}:%{version}-%{release}} Conflicts: geninitrd < 12639 @@ -638,6 +641,9 @@ Uzupełnianie parametrów w zsh dla poleceń udev. %patch13 -p1 %patch14 -p1 %patch15 -p1 +%patch16 -p1 +%patch17 -p1 +%patch18 -p1 cp -p %{SOURCE2} src/systemd_booted.c @@ -1135,6 +1141,7 @@ fi %attr(755,root,root) %{_bindir}/systemd-socket-activate %attr(755,root,root) %{_bindir}/systemd-stdio-bridge %attr(755,root,root) %{_bindir}/systemd-sysv-convert +%attr(755,root,root) %{_bindir}/systemd-umount %attr(755,root,root) %{_bindir}/timedatectl /lib/systemd/import-pubring.gpg /lib/systemd/resolv.conf @@ -1145,6 +1152,7 @@ fi %attr(755,root,root) /lib/systemd/systemd-cgroups-agent %attr(755,root,root) /lib/systemd/systemd-coredump %{?with_cryptsetup:%attr(755,root,root) /lib/systemd/systemd-cryptsetup} +%attr(755,root,root) /lib/systemd/systemd-dissect %attr(755,root,root) /lib/systemd/systemd-export %attr(755,root,root) /lib/systemd/systemd-fsck %attr(755,root,root) /lib/systemd/systemd-hibernate-resume @@ -1170,6 +1178,7 @@ fi %attr(755,root,root) /lib/systemd/systemd-shutdown %attr(755,root,root) /lib/systemd/systemd-sleep %attr(755,root,root) /lib/systemd/systemd-socket-proxyd +%attr(755,root,root) /lib/systemd/systemd-sulogin-shell %attr(755,root,root) /lib/systemd/systemd-sysctl %attr(755,root,root) /lib/systemd/systemd-timedated %attr(755,root,root) /lib/systemd/systemd-timesyncd @@ -1178,6 +1187,8 @@ fi %attr(755,root,root) /lib/systemd/systemd-update-done %attr(755,root,root) /lib/systemd/systemd-user-sessions %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 %{?with_cryptsetup:%attr(755,root,root) /lib/systemd/system-generators/systemd-cryptsetup-generator} %attr(755,root,root) /lib/systemd/system-generators/systemd-debug-generator @@ -1190,10 +1201,14 @@ fi %attr(755,root,root) /lib/systemd/system-generators/systemd-veritysetup-generator %dir /lib/systemd/network /lib/systemd/network/99-default.link +/lib/udev/rules.d/60-input-id.rules +/lib/udev/rules.d/60-sensor.rules +/lib/udev/rules.d/70-joystick.rules /lib/udev/rules.d/70-uaccess.rules /lib/udev/rules.d/71-seat.rules /lib/udev/rules.d/73-seat-late.rules /lib/udev/rules.d/99-systemd.rules +%{_libexecdir}/environment.d/99-environment.conf %dir %{_libexecdir}/kernel %dir %{_libexecdir}/kernel/install.d %{_libexecdir}/kernel/install.d/50-depmod.install @@ -1260,6 +1275,7 @@ fi %{_datadir}/polkit-1/actions/org.freedesktop.machine1.policy %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/polkit-1/actions/org.freedesktop.timedate1.policy +%{_datadir}/polkit-1/rules.d/systemd-networkd.rules %dir %{_datadir}/systemd %{?with_microhttpd:%{_datadir}/systemd/gatewayd} %{_datadir}/systemd/kbd-model-map @@ -1295,6 +1311,7 @@ fi %{_mandir}/man1/systemd-run.1* %{_mandir}/man1/systemd-socket-activate.1* %{_mandir}/man1/systemd-tty-ask-password-agent.1* +%{_mandir}/man1/systemd-umount.1* %{_mandir}/man1/timedatectl.1* %{_mandir}/man5/binfmt.d.5* %{_mandir}/man5/coredump.conf.5* @@ -1334,6 +1351,7 @@ fi %{_mandir}/man7/file-hierarchy.7* %{_mandir}/man7/kernel-command-line.7* %{_mandir}/man7/systemd.directives.7* +%{_mandir}/man7/systemd.environment-generator.7* %{_mandir}/man7/systemd.generator.7* %{_mandir}/man7/systemd.index.7* %{_mandir}/man7/systemd.journal-fields.7* @@ -1381,9 +1399,9 @@ fi %{_mandir}/man8/systemd-socket-proxyd.8* %{_mandir}/man8/systemd-sysctl.8* %{_mandir}/man8/systemd-system-update-generator.8* -%{_mandir}/man8/systemd-sysv-generator.8* %{_mandir}/man8/systemd-sysusers.8* %{_mandir}/man8/systemd-sysusers.service.8* +%{_mandir}/man8/systemd-sysv-generator.8* %{_mandir}/man8/systemd-timedated.8* %{_mandir}/man8/systemd-timesyncd.8* %{_mandir}/man8/systemd-timesyncd.service.8* @@ -1393,6 +1411,11 @@ fi %{_mandir}/man8/systemd-update-utmp.8* %{_mandir}/man8/systemd-user-sessions.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* %attr(700,root,root) %dir /var/lib/machines %dir /var/lib/%{name} %dir /var/lib/%{name}/coredump @@ -1437,6 +1460,7 @@ fi %dir %{_sysconfdir}/systemd/system-preset %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/systemd/system-preset/default.preset %dir %{_sysconfdir}/tmpfiles.d +%dir %{_libexecdir}/environment.d %dir %{_libexecdir}/modules-load.d %dir %{_libexecdir}/sysctl.d %{_libexecdir}/sysctl.d/50-default.conf @@ -1459,6 +1483,8 @@ fi %{_libexecdir}/systemd/user/timers.target %{_libexecdir}/systemd/user/systemd-exit.service %dir %{_libexecdir}/systemd/user-generators +%dir %{_libexecdir}/systemd/user-environment-generators +%{_libexecdir}/systemd/user-environment-generators/30-systemd-environment-d-generator %dir /lib/systemd/pld-helpers.d %dir /lib/systemd/system-generators %dir /lib/systemd/system-preset @@ -1470,6 +1496,7 @@ fi %attr(755,root,root) /bin/systemd_booted %{_mandir}/man1/systemctl.1* %{_mandir}/man5/tmpfiles.d.5* +%{_mandir}/man5/environment.d.5* %{_mandir}/man8/systemd-tmpfiles.8* %{_npkgconfigdir}/systemd.pc @@ -1536,6 +1563,7 @@ fi %{systemdunitdir}/single.service %{systemdunitdir}/sigpwr-container-shutdown.service %{systemdunitdir}/sys-kernel-config.service +%{systemdunitdir}/system-update-cleanup.service %{systemdunitdir}/systemd-ask-password-console.service %{systemdunitdir}/systemd-ask-password-wall.service %{systemdunitdir}/systemd-backlight@.service @@ -1586,6 +1614,7 @@ fi %{systemdunitdir}/systemd-update-utmp.service %{systemdunitdir}/systemd-user-sessions.service %{systemdunitdir}/systemd-vconsole-setup.service +%{systemdunitdir}/systemd-volatile-root.service %{systemdunitdir}/user@.service %{systemdunitdir}/machine.slice %{systemdunitdir}/system.slice @@ -1667,9 +1696,11 @@ fi %dir %{systemdunitdir}/initrd.target.wants %dir %{systemdunitdir}/kexec.target.wants %dir %{systemdunitdir}/local-fs.target.wants +%dir %{systemdunitdir}/machines.target.wants %dir %{systemdunitdir}/multi-user.target.wants %dir %{systemdunitdir}/poweroff.target.wants %dir %{systemdunitdir}/reboot.target.wants +%dir %{systemdunitdir}/remote-fs.target.wants %dir %{systemdunitdir}/rescue.target.wants %dir %{systemdunitdir}/runlevel[12345].target.wants %dir %{systemdunitdir}/shutdown.target.wants @@ -1692,15 +1723,16 @@ fi %{systemdunitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service %{systemdunitdir}/local-fs.target.wants/pld-clean-tmp.service %{systemdunitdir}/local-fs.target.wants/systemd-remount-fs.service -%{systemdunitdir}/local-fs.target.wants/var-lib-machines.mount %{systemdunitdir}/local-fs.target.wants/var-lock.mount %{systemdunitdir}/local-fs.target.wants/var-run.mount +%{systemdunitdir}/machines.target.wants/var-lib-machines.mount %{systemdunitdir}/multi-user.target.wants/getty.target %{systemdunitdir}/multi-user.target.wants/rc-local.service %{systemdunitdir}/multi-user.target.wants/systemd-ask-password-wall.path %{systemdunitdir}/multi-user.target.wants/systemd-logind.service %{systemdunitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service %{systemdunitdir}/multi-user.target.wants/systemd-user-sessions.service +%{systemdunitdir}/remote-fs.target.wants/var-lib-machines.mount %{systemdunitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service %{systemdunitdir}/sigpwr.target.wants/sigpwr-container-shutdown.service %{systemdunitdir}/sockets.target.wants/systemd-initctl.socket @@ -1739,6 +1771,8 @@ fi %dir %{systemduserunitdir}/sockets.target.wants %{systemduserunitdir}/graphical-session-pre.target %{systemduserunitdir}/graphical-session.target +%{_mandir}/man8/30-systemd-environment-d-generator.8* +%{_mandir}/man8/systemd-environment-d-generator.8* %{_mandir}/man8/systemd-ask-password-console.path.8* %{_mandir}/man8/systemd-ask-password-console.service.8* %{_mandir}/man8/systemd-ask-password-wall.path.8* @@ -1806,7 +1840,7 @@ fi /lib/systemd/network/80-container-host0.network /lib/systemd/network/80-container-ve.network /lib/systemd/network/80-container-vz.network -%{systemdunitdir}/dbus-org.freedesktop.network1.service +/etc/systemd/system/dbus-org.freedesktop.network1.service %{systemdunitdir}/systemd-networkd-wait-online.service %{systemdunitdir}/systemd-networkd.service %{systemdunitdir}/systemd-networkd.socket @@ -1903,6 +1937,7 @@ fi %{zsh_compdir}/_localectl %{zsh_compdir}/_loginctl %{zsh_compdir}/_machinectl +%{zsh_compdir}/_networkctl %{zsh_compdir}/_sd_hosts_or_user_at_host %{zsh_compdir}/_sd_machines %{zsh_compdir}/_sd_outputmodes @@ -1953,6 +1988,7 @@ fi /lib/udev/hwdb.d/20-usb-vendor-model.hwdb /lib/udev/hwdb.d/60-evdev.hwdb /lib/udev/hwdb.d/60-keyboard.hwdb +/lib/udev/hwdb.d/60-sensor.hwdb /lib/udev/hwdb.d/70-mouse.hwdb /lib/udev/hwdb.d/70-pointingstick.hwdb /lib/udev/hwdb.d/70-touchpad.hwdb