From 42a9c6e9e9933852f0c4751f644223e87d9a9566 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Thu, 11 Jun 2020 14:03:09 +0200 Subject: [PATCH] switched to systemd-stable and updated to 245.6 systemd-stable includes backports of important fixes keep fractional release due to known issue: https://github.com/systemd/systemd/issues/16146 --- pld-pam-systemd-user.patch | 20 ++++++++++++++------ systemd.spec | 10 +++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/pld-pam-systemd-user.patch b/pld-pam-systemd-user.patch index 3b37ebb..6e1c257 100644 --- a/pld-pam-systemd-user.patch +++ b/pld-pam-systemd-user.patch @@ -1,19 +1,27 @@ ---- systemd-233/src/login/systemd-user.m4~ 2017-03-01 22:43:06.000000000 +0100 -+++ systemd-233/src/login/systemd-user.m4 2017-06-28 14:12:06.729052169 +0200 -@@ -2,11 +2,10 @@ +--- systemd-stable-245.6/src/login/systemd-user.m4.orig 2020-06-11 13:54:19.219560705 +0200 ++++ systemd-stable-245.6/src/login/systemd-user.m4 2020-06-11 13:59:30.489083928 +0200 +@@ -2,19 +2,10 @@ # # Used by systemd --user instances. --account required pam_unix.so +-m4_ifdef(`ENABLE_HOMED', +--account sufficient pam_systemd_home.so +-)m4_dnl +-account sufficient pam_unix.so +-account required pam_permit.so +- +account include system-auth m4_ifdef(`HAVE_SELINUX', -session required pam_selinux.so close -session required pam_selinux.so nottys open +-)m4_dnl +-session required pam_loginuid.so +-session optional pam_keyinit.so force revoke +-m4_ifdef(`ENABLE_HOMED', +--session optional pam_systemd_home.so +session optional pam_selinux.so close +session optional pam_selinux.so nottys open )m4_dnl --session required pam_loginuid.so --session optional pam_keyinit.so force revoke -session optional pam_systemd.so +session required pam_loginuid.so +session include system-auth diff --git a/systemd.spec b/systemd.spec index 3f8dcc0..04298c8 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: 245.6 +Release: 0.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: 1eb3ca8f77978cc52dea6293467211a8 Source1: %{name}-sysv-convert Source2: %{name}_booted.c Source3: network.service @@ -655,7 +655,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 -- 2.43.0