Add patch to restore Fedora-specific systemd-user PAM config

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-01-11 12:16:22 -05:00
parent 04206f627a
commit b69d36e571
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,35 @@
From baed1fedba161d7db89636a417751891831c432a Mon Sep 17 00:00:00 2001
From: Felipe Sateler <fsateler@users.noreply.github.com>
Date: Mon, 10 Oct 2016 10:40:05 -0300
Subject: [PATCH] login: drop fedora-specific PAM config, add note to
DISTRO_PORTING (#4314)
It is impossible to ship a fully generic PAM configuration upstream.
Therefore, ship a minimal configuration with the systemd --user requirements,
and add a note to DISTRO_PORTING documenting this.
Fixes #4284
---
src/login/systemd-user.m4 | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git b/src/login/systemd-user.m4 a/src/login/systemd-user.m4
index fe38b24fef..f188a8e548 100644
--- b/src/login/systemd-user.m4
+++ a/src/login/systemd-user.m4
@@ -2,9 +2,11 @@
#
# Used by systemd --user instances.
+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_systemd.so
+session include system-auth
--
2.9.0

View File

@ -12,7 +12,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 232 Version: 232
Release: 6%{?gitcommit:.git%{gitcommitshort}}%{?dist} Release: 7%{?gitcommit:.git%{gitcommitshort}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: System and Service Manager Summary: System and Service Manager
@ -44,6 +44,9 @@ Patch0002: 0002-kernel-install-use-exit-instead-of-return-4565.patch
Patch0003: 0003-kernel-install-avoid-process-substitution.patch Patch0003: 0003-kernel-install-avoid-process-substitution.patch
Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch
# git format-patch-ab -R -1 baed1fedba161d7db89636a417751891831c432a src/login/systemd-user.m4
# https://bugzilla.redhat.com/show_bug.cgi?id=1391836
Patch0999: 0999-login-drop-fedora-specific-PAM-config-add-note-to-DI.patch
%global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);}
@ -956,6 +959,9 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_mandir}/man[1578]/systemd-journal-gateway* %{_mandir}/man[1578]/systemd-journal-gateway*
%changelog %changelog
* Wed Jan 11 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 232-7
- Add patch to restore Fedora-specific systemd-user PAM config (#1391836)
* Sat Jan 07 2017 Kevin Fenzi <kevin@scrye.com> - 232-6 * Sat Jan 07 2017 Kevin Fenzi <kevin@scrye.com> - 232-6
- Fix scriptlets to never fail in libs post. - Fix scriptlets to never fail in libs post.