From ca3c77beb25e56703273cac2d9456720a974bf60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 11 Jan 2017 20:19:41 -0500 Subject: [PATCH] Revert b69d36e571 This was already fixed in e134e692b6. --- ...a-specific-PAM-config-add-note-to-DI.patch | 35 ------------------- systemd.spec | 9 ++--- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 0999-login-drop-fedora-specific-PAM-config-add-note-to-DI.patch diff --git a/0999-login-drop-fedora-specific-PAM-config-add-note-to-DI.patch b/0999-login-drop-fedora-specific-PAM-config-add-note-to-DI.patch deleted file mode 100644 index 7addf55..0000000 --- a/0999-login-drop-fedora-specific-PAM-config-add-note-to-DI.patch +++ /dev/null @@ -1,35 +0,0 @@ -From baed1fedba161d7db89636a417751891831c432a Mon Sep 17 00:00:00 2001 -From: Felipe Sateler -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 - diff --git a/systemd.spec b/systemd.spec index 5d172f2..56228d8 100644 --- a/systemd.spec +++ b/systemd.spec @@ -44,9 +44,6 @@ Patch0002: 0002-kernel-install-use-exit-instead-of-return-4565.patch Patch0003: 0003-kernel-install-avoid-process-substitution.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);} @@ -960,13 +957,13 @@ getent passwd systemd-journal-upload &>/dev/null || useradd -r -l -g systemd-jou %changelog * Wed Jan 11 2017 Zbigniew Jędrzejewski-Szmek - 232-7 -- Add patch to restore Fedora-specific systemd-user PAM config (#1391836) +- Various small tweaks to scriplets * Sat Jan 07 2017 Kevin Fenzi - 232-6 -- Fix scriptlets to never fail in libs post. +- Fix scriptlets to never fail in libs post * Fri Jan 06 2017 Kevin Fenzi - 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 - 232-4 - Rebuild (#1392236)