rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Revert b69d36e571

Browse Source 
This was already fixed in e134e692b6.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2017-01-11 20:19:41 -05:00
parent b810fade77
commit ca3c77beb2
2 changed files with 3 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0999-login-drop-fedora-specific-PAM-config-add-note-to-DI.patch
View File

@ -1,35 +0,0 @@
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

9
systemd.spec
View File

@ -44,9 +44,6 @@ 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);}
@ -960,13 +957,13 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou
%changelog %changelog
* Wed Jan 11 2017 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 232-7 * 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) - Various small tweaks to scriplets
* 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
* Fri Jan 06 2017 Kevin Fenzi <kevin@scrye.com> - 232-5 * Fri Jan 06 2017 Kevin Fenzi <kevin@scrye.com> - 232-5
- Add patch from Michal Schmidt to avoid process substitution. (#1392236) - Add patch from Michal Schmidt to avoid process substitution (#1392236)
* Sun Nov 6 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 232-4 * Sun Nov 6 2016 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 232-4
- Rebuild (#1392236) - Rebuild (#1392236)