From 4eb51fc8e1d7903f568a51f9f2698e5e3b650a7f Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 28 Jul 2020 23:56:26 +0200 Subject: [PATCH] up to 245.7 --- systemd-logind_restart.patch | 38 ------------------------------------ systemd.spec | 6 ++---- 2 files changed, 2 insertions(+), 42 deletions(-) delete mode 100644 systemd-logind_restart.patch diff --git a/systemd-logind_restart.patch b/systemd-logind_restart.patch deleted file mode 100644 index 376542d..0000000 --- a/systemd-logind_restart.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0664daffee63648ff93b5571421149383501d356 Mon Sep 17 00:00:00 2001 -From: Jan Palus -Date: Thu, 11 Jun 2020 18:23:28 +0200 -Subject: [PATCH] login: filenames in /run/systemd/users are uids - -Fixes: #16146 -Signed-off-by: Jan Palus ---- - src/login/logind.c | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/src/login/logind.c b/src/login/logind.c -index 5a556f9ea4..3239f7d18a 100644 ---- a/src/login/logind.c -+++ b/src/login/logind.c -@@ -328,11 +328,18 @@ static int manager_enumerate_users(Manager *m) { - - FOREACH_DIRENT(de, d, return -errno) { - User *u; -+ uid_t uid; - - if (!dirent_is_file(de)) - continue; - -- k = manager_add_user_by_name(m, de->d_name, &u); -+ k = safe_atou(de->d_name, &uid); -+ if (k < 0) { -+ r = log_warning_errno(k, "Failed to add user by file name %s, ignoring: %m", de->d_name); -+ continue; -+ } -+ -+ k = manager_add_user_by_uid(m, uid, &u); - if (k < 0) { - r = log_warning_errno(k, "Failed to add user by file name %s, ignoring: %m", de->d_name); - continue; --- -2.27.0 - diff --git a/systemd.spec b/systemd.spec index 1c25976..84ea220 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.6 +Version: 245.7 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: 1eb3ca8f77978cc52dea6293467211a8 +# Source0-md5: 4cae7b0a6ad980d5c1057bd028fb489b Source1: %{name}-sysv-convert Source2: %{name}_booted.c Source3: network.service @@ -77,7 +77,6 @@ Patch12: uids_gids.patch Patch13: sysctl.patch Patch14: pld-pam-%{name}-user.patch Patch15: %{name}-x32.patch -Patch16: %{name}-logind_restart.patch URL: https://www.freedesktop.org/wiki/Software/systemd/ BuildRequires: acl-devel %{?with_audit:BuildRequires: audit-libs-devel} @@ -674,7 +673,6 @@ Uzupełnianie parametrów w zsh dla poleceń udev. %patch13 -p1 %patch14 -p1 %patch15 -p1 -%patch16 -p1 cp -p %{SOURCE2} src/systemd_booted.c -- 2.43.0