X-Git-Url: http://git.pld-linux.org/?p=packages%2Fsystemd.git;a=blobdiff_plain;f=systemd.spec;h=1b9842299960c4043104dd1e21b6b7d3989724ab;hp=75be8ea9ae1da8f36449a608dd1b27120e7fb722;hb=75e09f8;hpb=771be88c9227beef42e5b7c14c1575cc82f17ef3

diff --git a/systemd.spec b/systemd.spec
index 75be8ea..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:	245
-Release:	1.1
+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:	04f02d9841ea5992a16f6b03c873da28
+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
@@ -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
@@ -440,23 +441,6 @@ responder LLMNR.
 Generuje także dla zgodności plik /run/systemd/resolve/resolv.conf,
 który można użyć do dowiązania symbolicznego z /etc/resolv.conf.
 
-%package userdb
-Summary:	systemd userdb service and client tool
-Group:		Base
-Requires:	%{name} = %{epoch}:%{version}-%{release}
-
-%description userdb
-userdb component is a framework which allows defining rich user and
-group records in a JSON format, extending on the classic "struct
-passwd" and "struct group" structures. Various components in systemd
-have been updated to process records in this format, including
-systemd-logind and pam-systemd. The user records are intended to be
-extensible, and allow setting various resource management, security
-and runtime parameters that shall be applied to processes and sessions
-of the user as they log in. This facility is intended to allow
-associating such metadata directly with user/group records so that
-they can be produced, extended and consumed in unified form.
-
 %package inetd
 Summary:	Native inet service support for systemd via socket activation
 Summary(pl.UTF-8):	Natywna obsługa usług inet dla systemd
@@ -509,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
@@ -599,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
@@ -672,7 +658,7 @@ 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
@@ -1114,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
@@ -1159,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
@@ -1231,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}
@@ -1303,6 +1293,7 @@ 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
@@ -1365,6 +1356,7 @@ 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*
@@ -1387,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*
@@ -1397,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*
@@ -1486,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
@@ -1561,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
@@ -1699,6 +1704,8 @@ fi
 %{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
@@ -1784,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
@@ -1920,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
@@ -1947,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
@@ -2006,24 +2016,12 @@ 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*
 %{_mandir}/man8/systemd-resolved.service.8*
 
-%files userdb
-%defattr(644,root,root,755)
-%doc docs/GROUP_RECORD.md docs/USER_GROUP_API.md docs/USER_RECORD.md
-%attr(755,root,root) /bin/userdbctl
-%attr(755,root,root) /lib/systemd/systemd-userdbd
-%attr(755,root,root) /lib/systemd/systemd-userwork
-%{systemdunitdir}/sockets.target.wants/systemd-userdbd.socket
-%{systemdunitdir}/systemd-userdbd.service
-%{systemdunitdir}/systemd-userdbd.socket
-%{_mandir}/man8/systemd-userdbd.8*
-%{_mandir}/man8/systemd-userdbd.service.8*
-%{_mandir}/man1/userdbctl.1*
-
 %files inetd
 %defattr(644,root,root,755)
 %attr(755,root,root) %{systemdunitdir}-generators/pld-rc-inetd-generator
@@ -2143,6 +2141,8 @@ 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
@@ -2176,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
@@ -2188,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