up to 253.1

- xen kexec support disabled by default to avoid xen-libs dependency but
  no strong opinions here. perhaps it should be toggled.

diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index 70ae39e5866db77f6d3f4c8853350098f81f67d0..f2cd69ac39cf1dcc1ae987eb1b535530cd938f59 100644 (file)
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -9,8 +9,8 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
 --- systemd-stable-246.1/src/udev/udev-event.c.orig    2020-08-07 17:09:53.000000000 +0200
 +++ systemd-stable-246.1/src/udev/udev-event.c 2020-08-15 11:04:10.263428290 +0200
 @@ -820,6 +820,8 @@
+         const char *s;
          sd_device *dev;
-         unsigned flags;
          int ifindex, r;
 +        char name[IFNAMSIZ];
 +        int loop;
@@ -18,7 +18,7 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
          assert(event);
  
 @@ -861,6 +863,32 @@
-                 return log_device_debug_errno(event->dev_db_clone, r, "Failed to update database under /run/udev/data/: %m");
+         }
  
          r = rtnl_set_link_name(&event->rtnl, ifindex, event->name);
 +        /* keep trying if the destination interface name already exists */
@@ -32,7 +32,7 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
 +                goto out;
 +
 +        /* log temporary name */
-+        log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, oldname, event->name);
++        log_device_debug(dev, "Network interface %i is renamed from '%s' to '%s'", ifindex, old_sysname, event->name);
 +
 +        /* wait a maximum of 90 seconds for our target to become available */
 +        strscpy(name, IFNAMSIZ, event->name);
@@ -47,6 +47,6 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
 +                        goto out;
 +        }
 +out:
-         if (r < 0)
-                 return log_device_error_errno(dev, r, "Failed to rename network interface %i from '%s' to '%s': %m",
-                                               ifindex, oldname, event->name);
+         if (r < 0) {
+                 if (r == -EBUSY) {
+                         log_device_info(dev, "Network interface '%s' is already up, cannot rename to '%s'.",

diff --git a/pld-pam-systemd-user.patch b/pld-pam-systemd-user.patch
index 808375bfa4e720af0d182ae4fb6b64eb8de219b0..c90e10ab7f9d50dae3ebfc2b24ebdbc158e32e0d 100644 (file)
--- a/pld-pam-systemd-user.patch
+++ b/pld-pam-systemd-user.patch
@@ -1,27 +1,29 @@
 --- systemd-stable-249/src/login/systemd-user.in.orig  2021-07-07 19:41:29.000000000 +0200
 +++ systemd-stable-249/src/login/systemd-user.in       2021-07-07 22:39:21.502935327 +0200
-@@ -2,19 +2,10 @@
+@@ -2,20 +2,11 @@
  #
  # Used by systemd --user instances.
  
 -{% if ENABLE_HOMED %}
 --account sufficient pam_systemd_home.so
 -{% endif %}
--account sufficient pam_unix.so no_pass_expiry
--account required pam_permit.so
+-account  sufficient pam_unix.so no_pass_expiry
+-account  required   pam_permit.so
 -
 +account               include         system-auth
  {% if HAVE_SELINUX %}
--session required pam_selinux.so close
--session required pam_selinux.so nottys open
+-session  required   pam_selinux.so close
+-session  required   pam_selinux.so nottys open
 -{% endif %}
--session required pam_loginuid.so
--session optional pam_keyinit.so force revoke
+-session  required   pam_loginuid.so
+-session  optional   pam_keyinit.so force revoke
+-session  required   pam_namespace.so
 -{% if ENABLE_HOMED %}
---session optional pam_systemd_home.so
+--session optional   pam_systemd_home.so
 +session               optional        pam_selinux.so close
 +session               optional        pam_selinux.so nottys open
  {% endif %}
--session optional pam_systemd.so
+-session  optional   pam_systemd.so
 +session               required        pam_loginuid.so
++session               required        pam_namespace.so
 +session               include system-auth

diff --git a/systemd-completion.patch b/systemd-completion.patch
index 61f3766b0eeeac712f52e9a3f3baf98a339058dc..23c74862bdd61ff7be6b38031ec78eee35f15155 100644 (file)
--- a/systemd-completion.patch
+++ b/systemd-completion.patch
@@ -2,9 +2,9 @@ diff -urN systemd-241.orig/shell-completion/bash/meson.build systemd-241/shell-c
 --- systemd-241.orig/shell-completion/bash/meson.build 2019-02-14 11:11:58.000000000 +0100
 +++ systemd-241/shell-completion/bash/meson.build      2019-03-07 01:08:55.312337719 +0100
 @@ -30,7 +30,7 @@
+          ['systemd-path',        ''],
           ['systemd-run',         ''],
           ['udevadm',             ''],
-          ['kernel-install',      'ENABLE_KERNEL_INSTALL'],
 -         ['bootctl',             'HAVE_GNU_EFI'],
 +         ['bootctl',             ''],
           ['coredumpctl',         'ENABLE_COREDUMP'],

diff --git a/systemd.spec b/systemd.spec
index 3ab9c2cbdc1e7e9e2c7196329fc4611431e78465..3b4cdc5ed94a4eb9fb8975982ba681f8ddb94015 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -20,6 +20,7 @@
 %bcond_without fido2           # FIDO2 support
 %bcond_without tpm2            # TPM2 support
 %bcond_with    tests           # "make check" (requires systemd already installed)
+%bcond_with    xen             # Xen kexec support
 
 %ifnarch %{ix86} %{x8664} aarch64
 # x32 disabled - maybe it's possible to build x64 EFI, but it requires some hacking (add -m64 to EFI gcc command line?)
@@ -29,14 +30,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:       252.5
-Release:       2
+Version:       253.1
+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-stable/archive/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 31d247df965121f453f1339371cca831
+# Source0-md5: e924b15c1bc32f763b6a45fbe554667a
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -140,7 +141,7 @@ BuildRequires:      pcre2-8-devel
 BuildRequires: pld-release
 BuildRequires: pkgconfig >= 1:0.9.0
 BuildRequires: polkit-devel >= 0.106
-BuildRequires: python3
+BuildRequires: python3 >= 1:3.9
 BuildRequires: python3-jinja2
 BuildRequires: python3-lxml
 %{?with_qrencode:BuildRequires:        qrencode-devel >= 3}
@@ -150,6 +151,7 @@ BuildRequires:      sed >= 4.0
 %{?with_tests:BuildRequires:   systemd}
 %{?with_tpm2:BuildRequires:    tpm2-tss-devel >= 3.0.0}
 BuildRequires: usbutils >= 0.82
+%{?with_xen:BuildRequires:     xen-devel}
 BuildRequires: xorg-lib-libxkbcommon-devel >= 0.5.0
 BuildRequires: xz-devel
 BuildRequires: zlib-devel
@@ -607,6 +609,19 @@ jednostki systemd na zakończenie podczas rozruchu systemu.
 'systemd-analyze plot' tworzy wykres SVG wizualizujący równoległy
 start jednostek podczas rozruchu.
 
+%package ukify
+Summary:       Tool for combining kernel and initrd into Unified Kernel Image (UKI)
+Summary(pl.UTF-8):     Narzędzie do łączenia jądra oraz initrd w Unified Kernel Image (UKI)
+Group:         Base
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      python3-modules >= 1:3.9
+
+%description ukify
+Tool for combining kernel and initrd into Unified Kernel Image (UKI).
+
+%description ukify -l pl.UTF-8
+Narzędzie do łączenia jądra oraz initrd w Unified Kernel Image (UKI).
+
 %package libs
 Summary:       Shared systemd libraries
 Summary(pl.UTF-8):     Biblioteki współdzielone systemd
@@ -813,6 +828,8 @@ 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'
 
+%{__sed} -i -e '1 s,#!.*env python3,#!%{__python3},' src/ukify/ukify.py
+
 %build
 %meson build \
        -Dadm-gid=3 \
@@ -870,6 +887,7 @@ grep -rlZ -0 '#!/usr/bin/env bash' . | xargs -0 sed -i -e 's,#!/usr/bin/env bash
        -Dsysvrcnd-path=/etc/rc.d \
        -Dtpm2=%{__true_false tpm2} \
        -Dumount-path=/bin/umount \
+       -Dxenctrl=%{__true_false xen}
 
 %ninja_build -C build
 
@@ -1308,6 +1326,7 @@ fi
 %attr(755,root,root) %{_bindir}/hostnamectl
 %attr(755,root,root) %{_bindir}/kernel-install
 %attr(755,root,root) %{_bindir}/localectl
+%attr(755,root,root) %{_bindir}/systemd-ac-power
 %attr(755,root,root) %{_bindir}/systemd-cat
 %{?with_cryptsetup:%attr(755,root,root) %{_bindir}/systemd-cryptenroll}
 %attr(755,root,root) %{_bindir}/systemd-delta
@@ -1326,7 +1345,6 @@ fi
 /lib/modprobe.d/systemd.conf
 /lib/systemd/resolv.conf
 %attr(755,root,root) /lib/systemd/pld-clean-tmp
-%attr(755,root,root) /lib/systemd/systemd-ac-power
 %attr(755,root,root) /lib/systemd/systemd-backlight
 %attr(755,root,root) /lib/systemd/systemd-binfmt
 %{?with_efi:%attr(755,root,root) /lib/systemd/systemd-bless-boot}
@@ -1405,6 +1423,7 @@ fi
 %dir %{_prefix}/lib/kernel/install.d
 %{_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
 %if %{with efi}
 %dir %{_prefix}/lib/systemd/boot
 %dir %{_prefix}/lib/systemd/boot/efi
@@ -1428,12 +1447,17 @@ fi
 %lang(be) %{_prefix}/lib/systemd/catalog/systemd.be.catalog
 %lang(be) %{_prefix}/lib/systemd/catalog/systemd.be@latin.catalog
 %lang(bg) %{_prefix}/lib/systemd/catalog/systemd.bg.catalog
+%lang(da) %{_prefix}/lib/systemd/catalog/systemd.da.catalog
 %lang(de) %{_prefix}/lib/systemd/catalog/systemd.de.catalog
 %lang(fr) %{_prefix}/lib/systemd/catalog/systemd.fr.catalog
+%lang(hr) %{_prefix}/lib/systemd/catalog/systemd.hr.catalog
+%lang(hu) %{_prefix}/lib/systemd/catalog/systemd.hu.catalog
 %lang(it) %{_prefix}/lib/systemd/catalog/systemd.it.catalog
+%lang(ko) %{_prefix}/lib/systemd/catalog/systemd.ko.catalog
 %lang(pl) %{_prefix}/lib/systemd/catalog/systemd.pl.catalog
 %lang(pt_BR) %{_prefix}/lib/systemd/catalog/systemd.pt_BR.catalog
 %lang(ru) %{_prefix}/lib/systemd/catalog/systemd.ru.catalog
+%lang(sr) %{_prefix}/lib/systemd/catalog/systemd.sr.catalog
 %lang(zh_CN) %{_prefix}/lib/systemd/catalog/systemd.zh_CN.catalog
 %lang(zh_TW) %{_prefix}/lib/systemd/catalog/systemd.zh_TW.catalog
 %dir %{_prefix}/lib/sysusers.d
@@ -1444,6 +1468,7 @@ fi
 %if %{with microhttpd}
 %{_prefix}/lib/sysusers.d/systemd-remote.conf
 %endif
+%{_prefix}/lib/tmpfiles.d/credstore.conf
 %{_prefix}/lib/tmpfiles.d/etc.conf
 %{_prefix}/lib/tmpfiles.d/home.conf
 %{_prefix}/lib/tmpfiles.d/journal-nocow.conf
@@ -1493,6 +1518,7 @@ fi
 %{_mandir}/man1/localectl.1*
 %{_mandir}/man1/loginctl.1*
 %{_mandir}/man1/systemd.1*
+%{_mandir}/man1/systemd-ac-power.1*
 %{_mandir}/man1/systemd-ask-password.1*
 %{_mandir}/man1/systemd-cat.1*
 %{_mandir}/man1/systemd-creds.1*
@@ -1833,13 +1859,15 @@ fi
 %{systemdunitdir}/systemd-binfmt.service
 %if %{with efi}
 %{systemdunitdir}/systemd-bless-boot.service
-%{systemdunitdir}/systemd-boot-system-token.service
+%{systemdunitdir}/systemd-boot-random-seed.service
 %{systemdunitdir}/systemd-boot-update.service
 %endif
 %{systemdunitdir}/systemd-boot-check-no-failures.service
 %{systemdunitdir}/systemd-firstboot.service
 %{systemdunitdir}/systemd-fsck-root.service
 %{systemdunitdir}/systemd-fsck@.service
+%{systemdunitdir}/systemd-growfs-root.service
+%{systemdunitdir}/systemd-growfs@.service
 %{systemdunitdir}/systemd-halt.service
 %{systemdunitdir}/systemd-hibernate-resume@.service
 %{systemdunitdir}/systemd-hibernate.service
@@ -1858,6 +1886,9 @@ fi
 %{systemdunitdir}/systemd-modules-load.service
 %{systemdunitdir}/systemd-nspawn@.service
 %if %{with efi} && %{with tpm2}
+%{systemdunitdir}/systemd-pcrfs-root.service
+%{systemdunitdir}/systemd-pcrfs@.service
+%{systemdunitdir}/systemd-pcrmachine.service
 %{systemdunitdir}/systemd-pcrphase-initrd.service
 %{systemdunitdir}/systemd-pcrphase-sysinit.service
 %{systemdunitdir}/systemd-pcrphase.service
@@ -2033,7 +2064,6 @@ fi
 %{systemdunitdir}/rescue.target.wants/systemd-update-utmp-runlevel.service
 %{systemdunitdir}/sigpwr.target.wants/sigpwr-container-shutdown.service
 %{systemdunitdir}/sockets.target.wants/systemd-initctl.socket
-%{systemdunitdir}/sockets.target.wants/systemd-journald-audit.socket
 %{systemdunitdir}/sockets.target.wants/systemd-journald-dev-log.socket
 %{systemdunitdir}/sockets.target.wants/systemd-journald.socket
 %{systemdunitdir}/sockets.target.wants/systemd-udevd-control.socket
@@ -2053,7 +2083,7 @@ fi
 %{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}
+%{?with_efi:%{systemdunitdir}/sysinit.target.wants/systemd-boot-random-seed.service}
 %{systemdunitdir}/sysinit.target.wants/systemd-firstboot.service
 %{systemdunitdir}/sysinit.target.wants/systemd-hwdb-update.service
 %{systemdunitdir}/sysinit.target.wants/systemd-journal-catalog-update.service
@@ -2062,6 +2092,7 @@ fi
 %{systemdunitdir}/sysinit.target.wants/systemd-machine-id-commit.service
 %{systemdunitdir}/sysinit.target.wants/systemd-modules-load.service
 %if %{with efi} && %{with tpm2}
+%{systemdunitdir}/sysinit.target.wants/systemd-pcrmachine.service
 %{systemdunitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service
 %{systemdunitdir}/sysinit.target.wants/systemd-pcrphase.service
 %endif
@@ -2090,7 +2121,7 @@ fi
 %{_mandir}/man8/systemd-binfmt.service.8*
 %{?with_efi:%{_mandir}/man8/systemd-bless-boot.service.8*}
 %{_mandir}/man8/systemd-boot-check-no-failures.service.8*
-%{?with_efi:%{_mandir}/man8/systemd-boot-system-token.service.8*}
+%{?with_efi:%{_mandir}/man8/systemd-boot-random-seed.service.8*}
 %{_mandir}/man8/systemd-coredump.socket.8*
 %{_mandir}/man8/systemd-coredump@.service.8*
 %if %{with cryptsetup}
@@ -2115,6 +2146,9 @@ fi
 %{_mandir}/man8/systemd-logind.service.8*
 %{_mandir}/man8/systemd-modules-load.service.8*
 %if %{with efi} && %{with tpm2}
+%{_mandir}/man8/systemd-pcrfs-root.service.8*
+%{_mandir}/man8/systemd-pcrfs@.service.8*
+%{_mandir}/man8/systemd-pcrmachine.service.8*
 %{_mandir}/man8/systemd-pcrphase-initrd.service.8*
 %{_mandir}/man8/systemd-pcrphase-sysinit.service.8*
 %{_mandir}/man8/systemd-pcrphase.8*
@@ -2247,6 +2281,7 @@ fi
 %{_prefix}/lib/tmpfiles.d/systemd-network.conf
 /lib/systemd/network/80-6rd-tunnel.network
 /lib/systemd/network/80-container-host0.network
+/lib/systemd/network/80-container-vb.network
 /lib/systemd/network/80-container-ve.network
 /lib/systemd/network/80-container-vz.network
 /lib/systemd/network/80-vm-vt.network
@@ -2380,6 +2415,13 @@ fi
 %attr(755,root,root) %{_bindir}/systemd-analyze
 %{_mandir}/man1/systemd-analyze.1*
 
+%if %{with efi}
+%files ukify
+%defattr(644,root,root,755)
+%attr(755,root,root) /lib/systemd/ukify
+%{_mandir}/man1/ukify.1*
+%endif
+
 %files libs
 %defattr(644,root,root,755)
 %attr(755,root,root) /%{_lib}/libnss_myhostname.so.2
@@ -2431,11 +2473,13 @@ fi
 %{bash_compdir}/systemd-cryptenroll
 %{bash_compdir}/systemd-delta
 %{bash_compdir}/systemd-detect-virt
+%{bash_compdir}/systemd-dissect
 %{bash_compdir}/systemd-id128
 %{bash_compdir}/systemd-nspawn
 %{bash_compdir}/systemd-path
 %{bash_compdir}/systemd-resolve
 %{bash_compdir}/systemd-run
+%{bash_compdir}/systemd-sysext
 %{bash_compdir}/timedatectl
 
 %files -n zsh-completion-systemd
@@ -2554,6 +2598,7 @@ fi
 /lib/udev/rules.d/60-drm.rules
 /lib/udev/rules.d/60-evdev.rules
 /lib/udev/rules.d/60-fido-id.rules
+/lib/udev/rules.d/60-infiniband.rules
 /lib/udev/rules.d/60-input-id.rules
 /lib/udev/rules.d/60-persistent-alsa.rules
 /lib/udev/rules.d/60-persistent-input.rules

diff --git a/target-pld.patch b/target-pld.patch
index 22ec8c6f32d290eddd8acb16e255793ed9f06033..aff2adbaf7786dfae1f570600450022cece9b07a 100644 (file)
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -58,16 +58,16 @@
 --- systemd-240/src/shared/locale-setup.c.orig 2019-01-13 09:27:36.718995151 +0100
 +++ systemd-240/src/shared/locale-setup.c      2019-01-13 09:29:37.548993771 +0100
 @@ -21,6 +21,7 @@
-                 locale_context_clear(c);
+         locale_context_clear(c);
  
-                 r = proc_cmdline_get_key_many(PROC_CMDLINE_STRIP_RD_PREFIX,
-+                                              "LANG",                     &c->locale[VARIABLE_LANG],
-                                               "locale.LANG",              &c->locale[VARIABLE_LANG],
-                                               "locale.LANGUAGE",          &c->locale[VARIABLE_LANGUAGE],
-                                               "locale.LC_CTYPE",          &c->locale[VARIABLE_LC_CTYPE],
+         r = proc_cmdline_get_key_many(PROC_CMDLINE_STRIP_RD_PREFIX,
++                                      "LANG",                     &c->locale[VARIABLE_LANG],
+                                       "locale.LANG",              &c->locale[VARIABLE_LANG],
+                                       "locale.LANGUAGE",          &c->locale[VARIABLE_LANGUAGE],
+                                       "locale.LC_CTYPE",          &c->locale[VARIABLE_LC_CTYPE],
 @@ -59,6 +60,17 @@
-                 if (r < 0 && errno != ENOENT)
-                         return log_debug_errno(errno, "Failed to stat /etc/locale.conf: %m");
+         if (fstat(fd, &st) < 0)
+                 return log_debug_errno(errno, "Failed to stat /etc/locale.conf: %m");
  
 +        if (r < 0 && stat("/etc/sysconfig/i18n", &st) == 0) {
 +                locale_context_clear(c);
@@ -80,9 +80,9 @@
 +                }
 +        }
 +
-                 if (r >= 0) {
-                         /* If mtime is not changed, then we do not need to re-read the file. */
-                         t = timespec_load(&st.st_mtim);
+         /* If the file is not changed, then we do not need to re-read the file. */
+         if (stat_inode_unmodified(&c->st, &st))
+                 return 0;
 --- systemd-240/src/basic/time-util.c.orig     2019-01-13 09:27:36.718995151 +0100
 +++ systemd-240/src/basic/time-util.c  2019-01-13 09:31:12.275659356 +0100
 @@ -14,6 +14,7 @@
@@ -116,7 +116,7 @@
 +++ systemd-240/src/vconsole/vconsole-setup.c  2014-01-09 15:17:49.000000000 +0100
 @@ -284,6 +284,17 @@ int main(int argc, char **argv) {
          if (r < 0 && r != -ENOENT)
-                 log_warning_errno(r, "Failed to read /etc/vconsole.conf: %m");
+                 log_warning_errno(r, "Failed to read /etc/vconsole.conf, ignoring: %m");
  
 +        if (r < 0) {
 +                int r1 = parse_env_file(NULL, "/etc/sysconfig/console"
@@ -129,6 +129,6 @@
 +                        log_warning_errno(r1, "Failed to read /etc/sysconfig/console: %m");
 +        } 
 +
-         /* Let the kernel command line override /etc/vconsole.conf */
+         /* Let the kernel command line override /etc/vconsole.conf (highest priority) */
          r = proc_cmdline_get_key_many(
                          PROC_CMDLINE_STRIP_RD_PREFIX,