up to 252

diff --git a/net-rename-revert.patch b/net-rename-revert.patch
index 0d4568e01e5e88bf3038aef74a446f230817b9dd..70ae39e5866db77f6d3f4c8853350098f81f67d0 100644 (file)
--- a/net-rename-revert.patch
+++ b/net-rename-revert.patch
@@ -26,7 +26,7 @@ generated names. Re-apply this old hack to make the renaming less likely to fail
 +                goto out;
 +
 +        /* free our own name, another process may wait for us */
-+        snprintf(name, IFNAMSIZ, "rename%u", ifindex);
++        snprintf(name, IFNAMSIZ, "rename%d", ifindex);
 +        r = rtnl_set_link_name(&event->rtnl, ifindex, name);
 +        if (r < 0)
 +                goto out;

diff --git a/sysctl.patch b/sysctl.patch
index d4c4eab6129adc302bc1552ae8f8394a2e65bba4..cdffb9e52b2e072d3384956692858ccd95cfc87d 100644 (file)
--- a/sysctl.patch
+++ b/sysctl.patch
@@ -7,7 +7,7 @@
 -# System Request functionality of the kernel (SYNC)
 -#
 -# Use kernel.sysrq = 1 to allow all keys.
--# See https://www.kernel.org/doc/html/latest/admin-guide/sysrq.html for a list
+-# See https://docs.kernel.org/admin-guide/sysrq.html for a list
 -# of values and keys.
 -kernel.sysrq = 16
 -

diff --git a/systemd-configfs.patch b/systemd-configfs.patch
index b9b57f1c1f3a92af2aa6bd1caad0d359b10d4b26..1fe11c8b0bbaefdf70a6b1edd38d08b156807bed 100644 (file)
--- a/systemd-configfs.patch
+++ b/systemd-configfs.patch
@@ -12,7 +12,7 @@ diff -durN -x '*.orig' systemd-208.orig/units/sys-kernel-config.mount systemd-20
 --- systemd-208.orig/units/sys-kernel-config.mount     2013-08-13 22:02:52.000000000 +0200
 +++ systemd-208/units/sys-kernel-config.mount  2014-01-10 10:22:04.000000000 +0100
 @@ -10,8 +10,9 @@ Description=Configuration File System
- Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/configfs.txt
+ Documentation=https://docs.kernel.org/filesystems/configfs.html
  Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
  DefaultDependencies=no
 -ConditionPathExists=/sys/kernel/config

diff --git a/systemd-include.patch b/systemd-include.patch
deleted file mode 100644 (file)
index 22cbca6..0000000
--- a/systemd-include.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Constant `false` (used on some platforms) requires <stdbool.h>
-
---- systemd-stable-251.2/src/fundamental/sha256.c.orig 2022-06-02 20:07:11.000000000 +0200
-+++ systemd-stable-251.2/src/fundamental/sha256.c      2022-06-03 20:29:08.057216388 +0200
-@@ -26,6 +26,7 @@
- #ifndef SD_BOOT
- #include <string.h>
- #endif
-+#include <stdbool.h>
- 
- #include "macro-fundamental.h"
- #include "sha256.h"

diff --git a/systemd.spec b/systemd.spec
index b224a4a7f3094d9edffe1fe5ae310317e6921452..e63a9caab7d2b20a9f77f1234b7fbc9ff6dac820 100644 (file)
--- a/systemd.spec
+++ b/systemd.spec
@@ -29,14 +29,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:       251.7
+Version:       252
 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: 5ef4286f7678127ca151c7910291874e
+# Source0-md5: 99166e0d58c72988fcd1fe8ff147ed70
 Source1:       %{name}-sysv-convert
 Source2:       %{name}_booted.c
 Source3:       network.service
@@ -79,7 +79,6 @@ Patch13:      sysctl.patch
 Patch14:       pld-pam-%{name}-user.patch
 Patch15:       %{name}-x32.patch
 Patch16:       rpm-macros.patch
-Patch17:       %{name}-include.patch
 URL:           https://www.freedesktop.org/wiki/Software/systemd/
 BuildRequires: acl-devel
 %{?with_audit:BuildRequires:   audit-libs-devel}
@@ -127,6 +126,7 @@ BuildRequires:      lz4-devel >= 1:1.3.0
 BuildRequires: m4
 BuildRequires: meson >= 0.53.2
 BuildRequires: ninja
+%{?with_fido2:BuildRequires:   openssl-devel}
 BuildRequires: p11-kit-devel >= 0.23.3
 %{?with_pam:BuildRequires:     pam-devel >= 1.1.2}
 BuildRequires: pcre2-8-devel
@@ -801,7 +801,6 @@ Makra RPM-a definiujące ścieżki i skryptlety związane z systemd.
 %patch14 -p1
 %patch15 -p1
 %patch16 -p1
-%patch17 -p1
 
 cp -p %{SOURCE2} src/systemd_booted.c
 
@@ -1293,7 +1292,6 @@ fi
 %attr(755,root,root) /bin/systemd-sysext
 %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
@@ -1314,6 +1312,7 @@ fi
 %attr(755,root,root) %{_bindir}/systemd-stdio-bridge
 %attr(755,root,root) %{_bindir}/systemd-umount
 %attr(755,root,root) %{_bindir}/timedatectl
+%attr(755,root,root) %{_bindir}/userdbctl
 /lib/modprobe.d/systemd.conf
 /lib/systemd/resolv.conf
 %attr(755,root,root) /lib/systemd/pld-clean-tmp
@@ -1340,7 +1339,9 @@ fi
 %attr(755,root,root) /lib/systemd/systemd-localed
 %attr(755,root,root) /lib/systemd/systemd-logind
 %attr(755,root,root) /lib/systemd/systemd-makefs
+%attr(755,root,root) /lib/systemd/systemd-measure
 %attr(755,root,root) /lib/systemd/systemd-modules-load
+%attr(755,root,root) /lib/systemd/systemd-pcrphase
 %attr(755,root,root) /lib/systemd/systemd-pstore
 %attr(755,root,root) /lib/systemd/systemd-quotacheck
 %attr(755,root,root) /lib/systemd/systemd-random-seed
@@ -1352,6 +1353,7 @@ fi
 %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-sysroot-fstab-check
 %attr(755,root,root) /lib/systemd/systemd-time-wait-sync
 %attr(755,root,root) /lib/systemd/systemd-timedated
 %attr(755,root,root) /lib/systemd/systemd-timesyncd
@@ -1432,6 +1434,7 @@ fi
 %{_prefix}/lib/tmpfiles.d/home.conf
 %{_prefix}/lib/tmpfiles.d/journal-nocow.conf
 %{_prefix}/lib/tmpfiles.d/legacy.conf
+%{_prefix}/lib/tmpfiles.d/provision.conf
 %{_prefix}/lib/tmpfiles.d/static-nodes-permissions.conf
 %{_prefix}/lib/tmpfiles.d/systemd.conf
 %{_prefix}/lib/tmpfiles.d/systemd-nologin.conf
@@ -1489,6 +1492,7 @@ fi
 %{_mandir}/man1/systemd-id128.1*
 %{_mandir}/man1/systemd-inhibit.1*
 %{_mandir}/man1/systemd-machine-id-setup.1*
+%{_mandir}/man1/systemd-measure.1*
 %{_mandir}/man1/systemd-mount.1*
 %{_mandir}/man1/systemd-notify.1*
 %{_mandir}/man1/systemd-nspawn.1*
@@ -1567,6 +1571,7 @@ fi
 %{_mandir}/man7/systemd.offline-updates.7*
 %{_mandir}/man7/systemd.special.7*
 %{_mandir}/man7/systemd.syntax.7*
+%{_mandir}/man7/systemd.system-credentials.7*
 %{_mandir}/man7/systemd.time.7*
 %{_mandir}/man8/kernel-install.8*
 %{_mandir}/man8/libnss_myhostname.so.2.8*
@@ -1836,6 +1841,9 @@ fi
 %{systemdunitdir}/systemd-machine-id-commit.service
 %{systemdunitdir}/systemd-modules-load.service
 %{systemdunitdir}/systemd-nspawn@.service
+%{systemdunitdir}/systemd-pcrphase-initrd.service
+%{systemdunitdir}/systemd-pcrphase-sysinit.service
+%{systemdunitdir}/systemd-pcrphase.service
 %{systemdunitdir}/systemd-poweroff.service
 %{systemdunitdir}/systemd-quotacheck.service
 %{systemdunitdir}/systemd-random-seed.service
@@ -1866,6 +1874,10 @@ fi
 %{systemdunitdir}/systemd-vconsole-setup.service
 %{systemdunitdir}/systemd-volatile-root.service
 %{systemdunitdir}/user@.service
+%dir %{systemdunitdir}/user@.service.d
+%{systemdunitdir}/user@.service.d/10-login-barrier.conf
+%dir %{systemdunitdir}/user@0.service.d
+%{systemdunitdir}/user@0.service.d/10-login-barrier.conf
 %{systemdunitdir}/machine.slice
 #%{systemdunitdir}/system.slice
 %{?with_cryptsetup:%{systemdunitdir}/system-systemd\x2dcryptsetup.slice}
@@ -1988,6 +2000,7 @@ fi
 %endif
 %{systemdunitdir}/graphical.target.wants/display-manager.service
 %{systemdunitdir}/graphical.target.wants/systemd-update-utmp-runlevel.service
+%{systemdunitdir}/initrd.target.wants/systemd-pcrphase-initrd.service
 %{systemdunitdir}/local-fs.target.wants/pld-clean-tmp.service
 %{systemdunitdir}/local-fs.target.wants/var-lock.mount
 %{systemdunitdir}/local-fs.target.wants/var-run.mount
@@ -2028,6 +2041,8 @@ fi
 %{systemdunitdir}/sysinit.target.wants/systemd-journal-flush.service
 %{systemdunitdir}/sysinit.target.wants/systemd-machine-id-commit.service
 %{systemdunitdir}/sysinit.target.wants/systemd-modules-load.service
+%{systemdunitdir}/sysinit.target.wants/systemd-pcrphase-sysinit.service
+%{systemdunitdir}/sysinit.target.wants/systemd-pcrphase.service
 %{systemdunitdir}/sysinit.target.wants/systemd-random-seed.service
 %{systemdunitdir}/sysinit.target.wants/systemd-sysctl.service
 %{systemdunitdir}/sysinit.target.wants/systemd-sysusers.service
@@ -2077,6 +2092,10 @@ fi
 %{_mandir}/man8/systemd-localed.service.8*
 %{_mandir}/man8/systemd-logind.service.8*
 %{_mandir}/man8/systemd-modules-load.service.8*
+%{_mandir}/man8/systemd-pcrphase-initrd.service.8*
+%{_mandir}/man8/systemd-pcrphase-sysinit.service.8*
+%{_mandir}/man8/systemd-pcrphase.8*
+%{_mandir}/man8/systemd-pcrphase.service.8*
 %{_mandir}/man8/systemd-poweroff.service.8*
 %{_mandir}/man8/systemd-quotacheck.service.8*
 %{_mandir}/man8/systemd-random-seed.service.8*
@@ -2176,7 +2195,7 @@ fi
 
 %files homed
 %defattr(644,root,root,755)
-%attr(755,root,root) /bin/homectl
+%attr(755,root,root) %{_bindir}/homectl
 %attr(755,root,root) /lib/systemd/systemd-homed
 %attr(755,root,root) /lib/systemd/systemd-homework
 %attr(755,root,root) /%{_lib}/security/pam_systemd_home.so
@@ -2345,8 +2364,8 @@ fi
 %attr(755,root,root) /%{_lib}/libnss_systemd.so.2
 %attr(755,root,root) /%{_lib}/libsystemd.so.*.*.*
 %attr(755,root,root) %ghost /%{_lib}/libsystemd.so.0
-%attr(755,root,root) /lib/systemd/libsystemd-core*.so
-%attr(755,root,root) /lib/systemd/libsystemd-shared*.so
+%attr(755,root,root) /%{_lib}/systemd/libsystemd-core*.so
+%attr(755,root,root) /%{_lib}/systemd/libsystemd-shared*.so
 %{_mandir}/man8/libnss_resolve.so.2.8*
 %{_mandir}/man8/libnss_systemd.so.2.8*
 %{_mandir}/man8/nss-resolve.8*
@@ -2382,6 +2401,7 @@ fi
 %{bash_compdir}/systemd-cat
 %{bash_compdir}/systemd-cgls
 %{bash_compdir}/systemd-cgtop
+%{bash_compdir}/systemd-cryptenroll
 %{bash_compdir}/systemd-delta
 %{bash_compdir}/systemd-detect-virt
 %{bash_compdir}/systemd-id128

diff --git a/target-pld.patch b/target-pld.patch
index 7afdbd62d986a9179ec43747580987e29fa03b78..22ec8c6f32d290eddd8acb16e255793ed9f06033 100644 (file)
--- a/target-pld.patch
+++ b/target-pld.patch
@@ -55,32 +55,34 @@
  
          f = fopen(path, "re");
          if (!f)
---- systemd-240/src/core/locale-setup.c.orig   2019-01-13 09:27:36.718995151 +0100
-+++ systemd-240/src/core/locale-setup.c        2019-01-13 09:29:37.548993771 +0100
+--- 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 @@
-         int r;
+                 locale_context_clear(c);
  
-         r = proc_cmdline_get_key_many(PROC_CMDLINE_STRIP_RD_PREFIX,
-+                                      "LANG",                     &variables[VARIABLE_LANG],
-                                       "locale.LANG",              &variables[VARIABLE_LANG],
-                                       "locale.LANGUAGE",          &variables[VARIABLE_LANGUAGE],
-                                       "locale.LC_CTYPE",          &variables[VARIABLE_LC_CTYPE],
-@@ -59,6 +60,15 @@
-                         log_warning_errno(r, "Failed to read /etc/locale.conf: %m");
-         }
+                 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 (r <= 0 &&
-+            (r = parse_env_file(NULL, "/etc/sysconfig/i18n",
-+                                "LANG", &variables[VARIABLE_LANG]
++        if (r < 0 && stat("/etc/sysconfig/i18n", &st) == 0) {
++                locale_context_clear(c);
++                if ((r = parse_env_file(NULL, "/etc/sysconfig/i18n",
++                                "LANG", &c->locale[VARIABLE_LANG]
 +                                )) < 0) {
 +
-+                if (r != -ENOENT)
-+                        log_warning_errno(r, "Failed to read /etc/sysconfig/i18n: %m");
++                        if (r != -ENOENT)
++                                log_warning_errno(r, "Failed to read /etc/sysconfig/i18n: %m");
++                }
 +        }
 +
-         for (LocaleVariable i = 0; i < _VARIABLE_LC_MAX; i++) {
-                 char *s;
- 
+                 if (r >= 0) {
+                         /* If mtime is not changed, then we do not need to re-read the file. */
+                         t = timespec_load(&st.st_mtim);
 --- 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 @@

diff --git a/tmpfiles-not-fatal.patch b/tmpfiles-not-fatal.patch
index 5ef8d5084f8da10ed596716cb74a729645a05e32..df599ace2890746ce2120faa36fbe1fea55cecdb 100644 (file)
--- a/tmpfiles-not-fatal.patch
+++ b/tmpfiles-not-fatal.patch
@@ -1,7 +1,7 @@
 diff -ur systemd-245/units.org/systemd-tmpfiles-clean.service systemd-245/units/systemd-tmpfiles-clean.service
 --- systemd-245/units.org/systemd-tmpfiles-clean.service       2020-03-06 13:38:52.000000000 +0100
 +++ systemd-245/units/systemd-tmpfiles-clean.service   2020-04-03 21:08:42.151365700 +0200
-@@ -17,6 +17,6 @@
+@@ -17,7 +17,7 @@
  
  [Service]
  Type=oneshot
@@ -9,26 +9,30 @@ diff -ur systemd-245/units.org/systemd-tmpfiles-clean.service systemd-245/units/
 +ExecStart=-systemd-tmpfiles --clean
  SuccessExitStatus=DATAERR
  IOSchedulingClass=idle
+ LoadCredential=tmpfiles.extra
 diff -ur systemd-245/units.org/systemd-tmpfiles-setup-dev.service systemd-245/units/systemd-tmpfiles-setup-dev.service
 --- systemd-245/units.org/systemd-tmpfiles-setup-dev.service   2020-03-06 13:38:52.000000000 +0100
 +++ systemd-245/units/systemd-tmpfiles-setup-dev.service       2020-04-03 21:08:42.151365700 +0200
-@@ -18,5 +18,5 @@
+@@ -18,6 +18,6 @@
  [Service]
  Type=oneshot
  RemainAfterExit=yes
 -ExecStart=systemd-tmpfiles --prefix=/dev --create --boot
 +ExecStart=-systemd-tmpfiles --prefix=/dev --create --boot
  SuccessExitStatus=DATAERR CANTCREAT
+ LoadCredential=tmpfiles.extra
 diff -ur systemd-245/units.org/systemd-tmpfiles-setup.service systemd-245/units/systemd-tmpfiles-setup.service
 --- systemd-245/units.org/systemd-tmpfiles-setup.service       2020-03-06 13:38:52.000000000 +0100
 +++ systemd-245/units/systemd-tmpfiles-setup.service   2020-04-03 21:08:42.151365700 +0200
-@@ -19,5 +19,5 @@
+@@ -19,7 +19,7 @@
  [Service]
  Type=oneshot
  RemainAfterExit=yes
 -ExecStart=systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
 +ExecStart=-systemd-tmpfiles --create --remove --boot --exclude-prefix=/dev
  SuccessExitStatus=DATAERR CANTCREAT
+ LoadCredential=tmpfiles.extra
+ LoadCredential=login.motd
 diff -ur systemd-245/units.org/user/systemd-tmpfiles-clean.service systemd-245/units/user/systemd-tmpfiles-clean.service
 --- systemd-245/units.org/user/systemd-tmpfiles-clean.service  2020-03-06 13:38:52.000000000 +0100
 +++ systemd-245/units/user/systemd-tmpfiles-clean.service      2020-04-03 21:08:42.151365700 +0200